diff --git a/Jenkinsfile b/Jenkinsfile index b39d30eab..098a130e6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -23,7 +23,7 @@ pipeline { branch "1.3.x" } steps { - sh "mvn versions:set -DnewVersion=1.3.3.GRESHAM-${env.BUILD_NUMBER}" + sh "mvn versions:set -DnewVersion=1.3.3.GRESHAM-18" sh "mvn -N versions:update-child-modules" timeout(time: 10, unit: 'MINUTES') { diff --git a/README.md b/README.md index 7b9646814..2c513b0a0 100644 --- a/README.md +++ b/README.md @@ -29,3 +29,7 @@ The authors and key contributors of the project include: Copyright ©2017, [MIT Internet Trust Consortium](http://www.trust.mit.edu/). Licensed under the Apache 2.0 license, for details see `LICENSE.txt`. + +## Note for releasing + +Releases are made off of branch 1.3.x - the version released used to depend on the Jenkins build number but this is ineffective as the Jenkins history can vanish leaving you back at build number 1. Therefore, in the Jenkinsfile, the version to be released needs altering on line 26 and incrementing by 1. diff --git a/pom.xml b/pom.xml index b0c04413d..1347b72e2 100644 --- a/pom.xml +++ b/pom.xml @@ -374,19 +374,19 @@ com.fasterxml.jackson.core jackson-databind - 2.9.0.pr2 + 2.10.0 com.fasterxml.jackson.core jackson-annotations - 2.9.0.pr2 + 2.10.0 org.springframework.security spring-security-bom - 4.2.6.RELEASE + 4.2.13.RELEASE pom import @@ -585,7 +585,7 @@ com.nimbusds nimbus-jose-jwt - 5.4 + 7.9 org.bouncycastle