From 18c7993e75eb1864bd24313a2f5210d8183d00f9 Mon Sep 17 00:00:00 2001 From: Harry Smith Date: Fri, 25 Oct 2019 10:53:19 +0100 Subject: [PATCH 1/4] DWN-30296 : upgrade jackson to 2.10.0 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index b0c04413d..62762c24a 100644 --- a/pom.xml +++ b/pom.xml @@ -374,12 +374,12 @@ 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 From e91a153f494f09c4b0a1aff7eb22bea3921120f0 Mon Sep 17 00:00:00 2001 From: Harry Smith Date: Fri, 25 Oct 2019 10:53:52 +0100 Subject: [PATCH 2/4] DWN-30463 : update spring security bom --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 62762c24a..6a55655a7 100644 --- a/pom.xml +++ b/pom.xml @@ -386,7 +386,7 @@ org.springframework.security spring-security-bom - 4.2.6.RELEASE + 4.2.13.RELEASE pom import From df84942311a85ada97d8ea0dc49d03853859058e Mon Sep 17 00:00:00 2001 From: Harry Smith Date: Tue, 29 Oct 2019 07:52:48 +0000 Subject: [PATCH 3/4] DWN-30574 : upgrade nimbus-jose-jwt to 7.9 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6a55655a7..1347b72e2 100644 --- a/pom.xml +++ b/pom.xml @@ -585,7 +585,7 @@ com.nimbusds nimbus-jose-jwt - 5.4 + 7.9 org.bouncycastle From a30b999ea796273b94b1d7b8157ae4fa13a9efbc Mon Sep 17 00:00:00 2001 From: Harry Smith Date: Wed, 4 Dec 2019 08:57:08 +0000 Subject: [PATCH 4/4] No Jira : alter building mechanism to be independent on Jenkins build numbers --- Jenkinsfile | 2 +- README.md | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) 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.