From 355f63892dec8abe182b15b97a0ae8df4f022501 Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@gopivotal.com>
Date: Wed, 28 May 2014 14:19:17 +0100
Subject: [PATCH] Unify versions in POMs started by the invoker

Unify the versions used in integration tests launched by the
maven-invoker-plugin. Allows for already cached local copies to be
used, hopefully speeding up the build.
---
 spring-boot-dependencies/pom.xml                       |  6 ++++++
 spring-boot-tools/spring-boot-loader-tools/pom.xml     |  5 +++++
 .../spring-boot-loader/src/it/executable-dir/pom.xml   |  8 ++++----
 .../spring-boot-loader/src/it/executable-jar/pom.xml   |  8 ++++----
 .../spring-boot-loader/src/it/executable-war/pom.xml   | 10 +++++-----
 .../spring-boot-maven-plugin/src/it/jar/pom.xml        |  2 +-
 .../spring-boot-maven-plugin/src/it/prop/pom.xml       |  2 +-
 .../spring-boot-maven-plugin/src/it/war/pom.xml        |  2 +-
 8 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index 86e9974c7d..bbab0a7acd 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -88,6 +88,7 @@
 		<spring-data-redis.version>1.1.1.RELEASE</spring-data-redis.version>
 		<spring-data-rest.version>2.0.2.RELEASE</spring-data-rest.version>
 		<spring-hateoas.version>0.9.0.RELEASE</spring-hateoas.version>
+		<spring-loaded.version>1.2.0.RELEASE</spring-loaded.version>
 		<spring-rabbit.version>1.2.2.RELEASE</spring-rabbit.version>
 		<spring-mobile.version>1.1.1.RELEASE</spring-mobile.version>
 		<spring-security.version>3.2.4.RELEASE</spring-security.version>
@@ -512,6 +513,11 @@
 					</exclusion>
 				</exclusions>
 			</dependency>
+			<dependency>
+				<groupId>org.springframework</groupId>
+				<artifactId>springloaded</artifactId>
+				<version>${spring-loaded.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>org.springframework.batch</groupId>
 				<artifactId>spring-batch-core</artifactId>
diff --git a/spring-boot-tools/spring-boot-loader-tools/pom.xml b/spring-boot-tools/spring-boot-loader-tools/pom.xml
index d60ace0213..d58ed4f0ca 100644
--- a/spring-boot-tools/spring-boot-loader-tools/pom.xml
+++ b/spring-boot-tools/spring-boot-loader-tools/pom.xml
@@ -36,6 +36,11 @@
 			<artifactId>zt-zip</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>springloaded</artifactId>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 	<build>
 		<plugins>
diff --git a/spring-boot-tools/spring-boot-loader/src/it/executable-dir/pom.xml b/spring-boot-tools/spring-boot-loader/src/it/executable-dir/pom.xml
index 3fc16df78d..53849e2108 100644
--- a/spring-boot-tools/spring-boot-loader/src/it/executable-dir/pom.xml
+++ b/spring-boot-tools/spring-boot-loader/src/it/executable-dir/pom.xml
@@ -22,7 +22,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-dependency-plugin</artifactId>
-				<version>2.6</version>
+				<version>2.8</version>
 				<executions>
 					<execution>
 						<id>unpack</id>
@@ -73,17 +73,17 @@
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>
 			<artifactId>jetty-webapp</artifactId>
-			<version>8.1.8.v20121106</version>
+			<version>8.1.14.v20131031</version>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>
 			<artifactId>jetty-annotations</artifactId>
-			<version>8.1.8.v20121106</version>
+			<version>8.1.14.v20131031</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-webmvc</artifactId>
-			<version>3.2.0.RELEASE</version>
+			<version>4.0.5.RELEASE</version>
 		</dependency>
 	</dependencies>
 </project>
diff --git a/spring-boot-tools/spring-boot-loader/src/it/executable-jar/pom.xml b/spring-boot-tools/spring-boot-loader/src/it/executable-jar/pom.xml
index 2fffa60044..a80b5fc692 100644
--- a/spring-boot-tools/spring-boot-loader/src/it/executable-jar/pom.xml
+++ b/spring-boot-tools/spring-boot-loader/src/it/executable-jar/pom.xml
@@ -22,7 +22,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-dependency-plugin</artifactId>
-				<version>2.6</version>
+				<version>2.8</version>
 				<executions>
 					<execution>
 						<id>unpack</id>
@@ -86,17 +86,17 @@
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>
 			<artifactId>jetty-webapp</artifactId>
-			<version>8.1.8.v20121106</version>
+			<version>8.1.14.v20131031</version>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>
 			<artifactId>jetty-annotations</artifactId>
-			<version>8.1.8.v20121106</version>
+			<version>8.1.14.v20131031</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-webmvc</artifactId>
-			<version>3.2.0.RELEASE</version>
+			<version>4.0.5.RELEASE</version>
 		</dependency>
 	</dependencies>
 </project>
diff --git a/spring-boot-tools/spring-boot-loader/src/it/executable-war/pom.xml b/spring-boot-tools/spring-boot-loader/src/it/executable-war/pom.xml
index 193173d667..305c85e517 100644
--- a/spring-boot-tools/spring-boot-loader/src/it/executable-war/pom.xml
+++ b/spring-boot-tools/spring-boot-loader/src/it/executable-war/pom.xml
@@ -39,7 +39,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-dependency-plugin</artifactId>
-				<version>2.6</version>
+				<version>2.8</version>
 				<executions>
 					<execution>
 						<id>unpack</id>
@@ -67,22 +67,22 @@
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>
 			<artifactId>jetty-webapp</artifactId>
-			<version>8.1.8.v20121106</version>
+			<version>8.1.14.v20131031</version>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>
 			<artifactId>jetty-plus</artifactId>
-			<version>8.1.8.v20121106</version>
+			<version>8.1.14.v20131031</version>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>
 			<artifactId>jetty-annotations</artifactId>
-			<version>8.1.8.v20121106</version>
+			<version>8.1.14.v20131031</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-webmvc</artifactId>
-			<version>3.2.0.RELEASE</version>
+			<version>4.0.5.RELEASE</version>
 		</dependency>
 	</dependencies>
 </project>
diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/it/jar/pom.xml b/spring-boot-tools/spring-boot-maven-plugin/src/it/jar/pom.xml
index c851abd8c5..e9208df9d7 100644
--- a/spring-boot-tools/spring-boot-maven-plugin/src/it/jar/pom.xml
+++ b/spring-boot-tools/spring-boot-maven-plugin/src/it/jar/pom.xml
@@ -43,7 +43,7 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-context</artifactId>
-			<version>3.2.3.RELEASE</version>
+			<version>4.0.5.RELEASE</version>
 		</dependency>
 		<dependency>
 			<groupId>javax.servlet</groupId>
diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/it/prop/pom.xml b/spring-boot-tools/spring-boot-maven-plugin/src/it/prop/pom.xml
index 2bdf801298..b170f2e04e 100644
--- a/spring-boot-tools/spring-boot-maven-plugin/src/it/prop/pom.xml
+++ b/spring-boot-tools/spring-boot-maven-plugin/src/it/prop/pom.xml
@@ -43,7 +43,7 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-context</artifactId>
-			<version>3.2.3.RELEASE</version>
+			<version>4.0.5.RELEASE</version>
 		</dependency>
 		<dependency>
 			<groupId>javax.servlet</groupId>
diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/it/war/pom.xml b/spring-boot-tools/spring-boot-maven-plugin/src/it/war/pom.xml
index b947e7b472..de38c51db7 100644
--- a/spring-boot-tools/spring-boot-maven-plugin/src/it/war/pom.xml
+++ b/spring-boot-tools/spring-boot-maven-plugin/src/it/war/pom.xml
@@ -42,7 +42,7 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-context</artifactId>
-			<version>3.2.3.RELEASE</version>
+			<version>4.0.5.RELEASE</version>
 		</dependency>
 		<dependency>
 			<groupId>javax.servlet</groupId>