Merge pull request #4 from gresham-computing/nexusIqUpgrades

Nexus iq upgrades

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') {

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.

pom.xml

@@ -374,19 +374,19 @@
 			<dependency>
 				<groupId>com.fasterxml.jackson.core</groupId>
 				<artifactId>jackson-databind</artifactId>
-				<version>2.9.0.pr2</version>
+				<version>2.10.0</version>
 			</dependency>
 			<dependency>
 				<groupId>com.fasterxml.jackson.core</groupId>
 				<artifactId>jackson-annotations</artifactId>
-				<version>2.9.0.pr2</version>
+				<version>2.10.0</version>
 			</dependency>
 
 			<!-- Spring Security -->
 			<dependency>
 				<groupId>org.springframework.security</groupId>
 				<artifactId>spring-security-bom</artifactId>
-				<version>4.2.6.RELEASE</version>
+				<version>4.2.13.RELEASE</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -585,7 +585,7 @@
 			<dependency>
 				<groupId>com.nimbusds</groupId>
 				<artifactId>nimbus-jose-jwt</artifactId>
-				<version>5.4</version>
+				<version>7.9</version>
 			</dependency>
 			<dependency>
 				<groupId>org.bouncycastle</groupId>