diff --git a/.gitignore b/.gitignore index 904bad4da60..3499a17dc2a 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,6 @@ target/ .idea/ *.iml *.iws + +# gnupg keyring +/.gnupg diff --git a/.gnupg.tar.enc b/.gnupg.tar.enc new file mode 100644 index 00000000000..71882b2aac7 Binary files /dev/null and b/.gnupg.tar.enc differ diff --git a/.travis.yml b/.travis.yml index 825c4c0f3c7..c89bc17a055 100755 --- a/.travis.yml +++ b/.travis.yml @@ -2,11 +2,14 @@ language: java sudo: false before_install: + - openssl aes-256-cbc -d -pass "env:DECRYPT_KEYPHRASE" -in .gnupg.tar.enc | tar xv - "export DISPLAY=:99.0" - "sh -e /etc/init.d/xvfb start" + - "[[ ${TRAVIS_TAG} != '' ]] && mvn versions:set -DnewVersion='${TRAVIS_TAG}'" script: mvn clean verify after_success: - mvn jacoco:report coveralls:report - "[[ ${TRAVIS_PULL_REQUEST} == 'false' ]] && [[ ${TRAVIS_TAG} == '' ]] && mvn deploy -DreposityId=sonatype-nexus-snapshots -DskipTests --settings deploy-settings.xml" + - "[[ ${TRAVIS_PULL_REQUEST} == 'false' ]] && [[ ${TRAVIS_TAG} != '' ]] && mvn deploy -DreposityId=sonatype-nexus-staging -DskipTests --settings deploy-settings.xml" diff --git a/README.md b/README.md index 283a077036e..c727827e72d 100644 --- a/README.md +++ b/README.md @@ -177,23 +177,13 @@ You can access snapshot builds from the sonatype repository: #### Build -In order to build spring-boot-admin you need to have node.js and npm on your PATH. +In order to build spring-boot-admin you need to have node.js and npm on your `PATH`. ```shell mvn clean package ``` -#### Release - -```shell -mvn build-helper:parse-version versions:set -DnewVersion=${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion} -mvn -Psign-artifacts clean deploy -``` - -#### Increment version for next release - -Example: - +#### Set version for next release ```shell mvn build-helper:parse-version versions:set versions:commit -DnewVersion=1.0.0-SNAPSHOT ``` diff --git a/pom.xml b/pom.xml index eaed14209ae..1f65318f70f 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,6 @@ 1.7 ${basedir} - ${gpg.passphrase} 1.3.0.RC1 Brixton.M2 0.7.5.201505241946 @@ -102,7 +101,9 @@ sign-artifacts - false + + env.GPG_PASSPHRASE + @@ -110,7 +111,8 @@ org.apache.maven.plugins maven-gpg-plugin - ${passphrase} + ${env.GPG_PASSPHRASE} + ${user.dir}/.gnupg