From 2222a40cb3406738d92efa30e7ad0dd967394c7f Mon Sep 17 00:00:00 2001
From: Oliver Gierke <ogierke@gopivotal.com>
Date: Tue, 4 Aug 2015 10:48:07 +0200
Subject: [PATCH] #353 - Dependency upgrades.

Spring Framework 4.0.9 -> 4.1.7
Minidev JSON 2.1.1 -> 2.2
JSONPath 0.9.1 -> 2.0.0
Spring Data Build Resources 1.6.0 -> 1.6.2
Lombok 1.14.4 -> 1.16.4
JUnit 4.11 -> 4.12
Mockito 1.9.5 -> 1.10.19
JodaTime 2.3 -> 2.8.1
XMLUnit 1.5 -> 1.6

Asciidoctor Maven Plugin 1.5.2 -> 1.5.2.1
AsciidoctorJ PDF 1.5.0-alpha.6 -> 1.5.0-alpha.8
Maven Assembly Plugin 2.5.4 -> 2.5.5

Updated available build profiles. Update Javadoc reference to link to used Spring Framework version.
---
 .travis.yml |  5 ++---
 pom.xml     | 58 +++++++++++++++--------------------------------------
 2 files changed, 18 insertions(+), 45 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 853adf56..c005f243 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,12 +4,11 @@ jdk:
 env:
   matrix:
     - PROFILE=non-existant
-    - PROFILE=spring41
-    - PROFILE=spring41-next
+    - PROFILE=spring42
     - PROFILE=spring42-next
 cache:
   directories:
     - $HOME/.m2
 sudo: false
 install: true
-script: "mvn clean dependency:list test -P${PROFILE} -Dsort"
\ No newline at end of file
+script: "mvn clean dependency:list test -P${PROFILE} -Dsort"
diff --git a/pom.xml b/pom.xml
index 7780a3c5..1899e130 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,12 +58,12 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring.version>4.0.9.RELEASE</spring.version>
+		<spring.version>4.1.7.RELEASE</spring.version>
 		<logback.version>1.1.3</logback.version>
 		<jackson.version>2.5.4</jackson.version>
 		<jaxrs.version>1.0</jaxrs.version>
-		<minidevjson.version>2.1.1</minidevjson.version>
-		<jsonpath.version>0.9.1</jsonpath.version>
+		<minidevjson.version>2.2</minidevjson.version>
+		<jsonpath.version>2.0.0</jsonpath.version>
 		<slf4j.version>1.7.12</slf4j.version>
 		<evo.version>1.2.1</evo.version>
 		<bundlor.failOnWarnings>true</bundlor.failOnWarnings>
@@ -73,42 +73,16 @@
 	<profiles>
 
 		<profile>
-			<id>spring40-next</id>
+			<id>spring42</id>
 			<properties>
-				<spring.version>4.0.10.BUILD-SNAPSHOT</spring.version>
+				<spring.version>4.2.0.RELEASE</spring.version>
 			</properties>
-			<repositories>
-				<repository>
-					<id>spring-libs-snapshot</id>
-					<url>http://repo.spring.io/libs-snapshot</url>
-				</repository>
-			</repositories>
-		</profile>
-
-		<profile>
-			<id>spring41</id>
-			<properties>
-				<spring.version>4.1.6.RELEASE</spring.version>
-			</properties>
-		</profile>
-
-		<profile>
-			<id>spring41-next</id>
-			<properties>
-				<spring.version>4.1.6.BUILD-SNAPSHOT</spring.version>
-			</properties>
-			<repositories>
-				<repository>
-					<id>spring-libs-snapshot</id>
-					<url>http://repo.spring.io/libs-snapshot</url>
-				</repository>
-			</repositories>
 		</profile>
 
 		<profile>
 			<id>spring42-next</id>
 			<properties>
-				<spring.version>4.2.0.BUILD-SNAPSHOT</spring.version>
+				<spring.version>4.2.1.BUILD-SNAPSHOT</spring.version>
 			</properties>
 			<repositories>
 				<repository>
@@ -167,7 +141,7 @@
 				<dependency>
 					<groupId>org.springframework.data.build</groupId>
 					<artifactId>spring-data-build-resources</artifactId>
-					<version>1.6.0.RELEASE</version>
+					<version>1.6.2.RELEASE</version>
 					<scope>provided</scope>
 					<type>zip</type>
 				</dependency>
@@ -223,12 +197,12 @@
 					<plugin>
 						<groupId>org.asciidoctor</groupId>
 						<artifactId>asciidoctor-maven-plugin</artifactId>
-						<version>1.5.2</version>
+						<version>1.5.2.1</version>
 						<dependencies>
 							<dependency>
 								<groupId>org.asciidoctor</groupId>
 								<artifactId>asciidoctorj-pdf</artifactId>
-								<version>1.5.0-alpha.6</version>
+								<version>1.5.0-alpha.8</version>
 							</dependency>
 							<dependency>
 								<groupId>org.asciidoctor</groupId>
@@ -355,7 +329,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-assembly-plugin</artifactId>
-						<version>2.5.4</version>
+						<version>2.5.5</version>
 						<executions>
 							<execution>
 								<id>static</id>
@@ -495,7 +469,7 @@
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
-			<version>1.14.4</version>
+			<version>1.16.4</version>
 			<scope>provided</scope>
 		</dependency>
 
@@ -529,7 +503,7 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.11</version>
+			<version>4.12</version>
 			<scope>test</scope>
 		</dependency>
 
@@ -543,21 +517,21 @@
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-all</artifactId>
-			<version>1.9.5</version>
+			<version>1.10.19</version>
 			<scope>test</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>joda-time</groupId>
 			<artifactId>joda-time</artifactId>
-			<version>2.3</version>
+			<version>2.8.1</version>
 			<scope>test</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>xmlunit</groupId>
 			<artifactId>xmlunit</artifactId>
-			<version>1.5</version>
+			<version>1.6</version>
 			<scope>test</scope>
 		</dependency>
 
@@ -652,7 +626,7 @@
 					<additionalparam>-Xdoclint:none</additionalparam>
 					<stylesheetfile>${shared.resources}/javadoc/spring-javadoc.css</stylesheetfile>
 					<links>
-						<link>http://static.springframework.org/spring/docs/3.2.x/javadoc-api</link>
+						<link>http://static.springframework.org/spring/docs/4.1.x/javadoc-api</link>
 						<link>http://docs.oracle.com/javase/6/docs/api</link>
 					</links>
 				</configuration>