From b2542f928bfe90c55ded86ce8deacf4b58b43341 Mon Sep 17 00:00:00 2001 From: Julien Viet Date: Thu, 27 Sep 2018 09:35:29 +0200 Subject: [PATCH] Travis tweaking --- .travis.deploy.artifacts.sh | 2 +- .travis.maven.settings.xml | 28 ---------------------------- .travis.yml | 2 -- 3 files changed, 1 insertion(+), 31 deletions(-) diff --git a/.travis.deploy.artifacts.sh b/.travis.deploy.artifacts.sh index ad9495026..d6f9804c5 100644 --- a/.travis.deploy.artifacts.sh +++ b/.travis.deploy.artifacts.sh @@ -1,5 +1,5 @@ PROJECT_VERSION=$(mvn org.apache.maven.plugins:maven-help-plugin:evaluate -Dexpression=project.version -B | grep -v '\[') if [[ "$PROJECT_VERSION" =~ .*SNAPSHOT ]] && [[ "${TRAVIS_BRANCH}" =~ ^master$|^[0-9]+\.[0-9]+$ ]] && [[ "${TRAVIS_PULL_REQUEST}" = "false" ]]; then - mvn deploy -DskipTests -B; + mvn deploy -s .travis.maven.settings.xml -DskipTests -B; fi diff --git a/.travis.maven.settings.xml b/.travis.maven.settings.xml index 4e9ef5ea1..cd8c4445e 100644 --- a/.travis.maven.settings.xml +++ b/.travis.maven.settings.xml @@ -5,34 +5,6 @@ false - - - sonatype-repository - - - sonatype-nexus-releases - https://oss.sonatype.org/content/repositories/releases - default - - - sonatype-nexus-snapshots - https://oss.sonatype.org/content/repositories/snapshots - - true - - default - - false - - - - - - - - sonatype-repository - - sonatype-nexus-snapshots diff --git a/.travis.yml b/.travis.yml index 02134e554..11b8fd43a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,4 @@ language: java -before_install: -- cp .travis.maven.settings.xml $HOME/.m2/settings.xml branches: only: - master