Merge branch '1.5.x'

spring-boot-tools/spring-boot-loader/src/it/executable-dir/pom.xml

@@ -13,7 +13,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.1</version>
+				<version>@maven-compiler-plugin.version@</version>
 				<configuration>
 					<source>1.6</source>
 					<target>1.6</target>
@@ -22,7 +22,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-dependency-plugin</artifactId>
-				<version>2.10</version>
+				<version>@maven-dependency-plugin.version@</version>
 				<executions>
 					<execution>
 						<id>unpack</id>
@@ -73,17 +73,17 @@
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>
 			<artifactId>jetty-webapp</artifactId>
-			<version>8.1.14.v20131031</version>
+			<version>@jetty.version@</version>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>
 			<artifactId>jetty-annotations</artifactId>
-			<version>8.1.14.v20131031</version>
+			<version>@jetty.version@</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-webmvc</artifactId>
-			<version>4.0.5.RELEASE</version>
+			<version>@spring.version@</version>
 		</dependency>
 	</dependencies>
 </project>

spring-boot-tools/spring-boot-loader/src/it/executable-jar/pom.xml

@@ -13,7 +13,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.1</version>
+				<version>@maven-compiler-plugin.version@</version>
 				<configuration>
 					<source>1.6</source>
 					<target>1.6</target>
@@ -22,7 +22,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-dependency-plugin</artifactId>
-				<version>2.10</version>
+				<version>@maven-dependency-plugin.version@</version>
 				<executions>
 					<execution>
 						<id>unpack</id>
@@ -86,17 +86,17 @@
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>
 			<artifactId>jetty-webapp</artifactId>
-			<version>8.1.14.v20131031</version>
+			<version>@jetty.version@</version>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>
 			<artifactId>jetty-annotations</artifactId>
-			<version>8.1.14.v20131031</version>
+			<version>@jetty.version@</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-webmvc</artifactId>
-			<version>4.0.5.RELEASE</version>
+			<version>@spring.version@</version>
 		</dependency>
 	</dependencies>
 </project>

spring-boot-tools/spring-boot-loader/src/it/executable-props-lib/pom.xml

@@ -13,7 +13,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.1</version>
+				<version>@maven-compiler-plugin.version@</version>
 				<configuration>
 					<source>1.6</source>
 					<target>1.6</target>
@@ -22,7 +22,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-dependency-plugin</artifactId>
-				<version>2.10</version>
+				<version>@maven-dependency-plugin.version@</version>
 				<executions>
 					<execution>
 						<id>unpack</id>
@@ -98,7 +98,7 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-context</artifactId>
-			<version>4.1.4.RELEASE</version>
+			<version>@spring.version@</version>
 		</dependency>
 	</dependencies>
 </project>

spring-boot-tools/spring-boot-loader/src/it/executable-props/pom.xml

@@ -13,7 +13,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.1</version>
+				<version>@maven-compiler-plugin.version@</version>
 				<configuration>
 					<source>1.6</source>
 					<target>1.6</target>
@@ -22,7 +22,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-dependency-plugin</artifactId>
-				<version>2.10</version>
+				<version>@maven-dependency-plugin.version@</version>
 				<executions>
 					<execution>
 						<id>unpack</id>
@@ -86,7 +86,7 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-context</artifactId>
-			<version>4.1.4.RELEASE</version>
+			<version>@spring.version@</version>
 		</dependency>
 	</dependencies>
 </project>

spring-boot-tools/spring-boot-loader/src/it/executable-war/pom.xml

@@ -14,7 +14,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.1</version>
+				<version>@maven-compiler-plugin.version@</version>
 				<configuration>
 					<source>1.6</source>
 					<target>1.6</target>
@@ -23,7 +23,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-war-plugin</artifactId>
-				<version>2.3</version>
+				<version>@maven-war-plugin.version@</version>
 				<configuration>
 					<archive>
 						<manifest>
@@ -39,7 +39,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-dependency-plugin</artifactId>
-				<version>2.10</version>
+				<version>@maven-dependency-plugin.version@</version>
 				<executions>
 					<execution>
 						<id>unpack</id>
@@ -67,22 +67,22 @@
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>
 			<artifactId>jetty-webapp</artifactId>
-			<version>8.1.14.v20131031</version>
+			<version>@jetty.version@</version>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>
 			<artifactId>jetty-plus</artifactId>
-			<version>8.1.14.v20131031</version>
+			<version>@jetty.version@</version>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>
 			<artifactId>jetty-annotations</artifactId>
-			<version>8.1.14.v20131031</version>
+			<version>@jetty.version@</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-webmvc</artifactId>
-			<version>4.0.5.RELEASE</version>
+			<version>@spring.version@</version>
 		</dependency>
 	</dependencies>
 </project>

spring-boot-tools/spring-boot-maven-plugin/src/it/jar-attach-disabled/pom.xml

@@ -28,7 +28,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
-				<version>2.4</version>
+				<version>@maven-jar-plugin.version@</version>
 				<configuration>
 					<archive>
 						<manifest>

spring-boot-tools/spring-boot-maven-plugin/src/it/jar-create-dir/pom.xml

@@ -29,7 +29,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
-				<version>2.4</version>
+				<version>@maven-jar-plugin.version@</version>
 				<configuration>
 					<archive>
 						<manifest>

spring-boot-tools/spring-boot-maven-plugin/src/it/jar-custom-dir/pom.xml

@@ -28,7 +28,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
-				<version>2.4</version>
+				<version>@maven-jar-plugin.version@</version>
 				<configuration>
 					<archive>
 						<manifest>

spring-boot-tools/spring-boot-maven-plugin/src/it/jar-custom-launcher/pom.xml

@@ -31,7 +31,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
-				<version>2.4</version>
+				<version>@maven-jar-plugin.version@</version>
 				<configuration>
 					<archive>
 						<manifest>

spring-boot-tools/spring-boot-maven-plugin/src/it/jar-exclude-artifact/pom.xml

@@ -28,7 +28,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
-				<version>2.4</version>
+				<version>@maven-jar-plugin.version@</version>
 				<configuration>
 					<archive>
 						<manifestEntries>

spring-boot-tools/spring-boot-maven-plugin/src/it/jar-exclude-entry/pom.xml

@@ -33,7 +33,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
-				<version>2.4</version>
+				<version>@maven-jar-plugin.version@</version>
 				<configuration>
 					<archive>
 						<manifestEntries>

spring-boot-tools/spring-boot-maven-plugin/src/it/jar-exclude-group/pom.xml

@@ -28,7 +28,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
-				<version>2.4</version>
+				<version>@maven-jar-plugin.version@</version>
 				<configuration>
 					<archive>
 						<manifestEntries>
@@ -54,7 +54,7 @@
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
 			<artifactId>log4j-api</artifactId>
-			<version>2.4.1</version>
+			<version>@log4j2.version@</version>
 		</dependency>
 	</dependencies>
 </project>

spring-boot-tools/spring-boot-maven-plugin/src/it/jar-executable/pom.xml

@@ -30,7 +30,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
-				<version>2.4</version>
+				<version>@maven-jar-plugin.version@</version>
 				<configuration>
 					<archive>
 						<manifest>

spring-boot-tools/spring-boot-maven-plugin/src/it/jar-lib-name-conflict/test-project/pom.xml

@@ -25,7 +25,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
-				<version>2.4</version>
+				<version>@maven-jar-plugin.version@</version>
 				<configuration>
 					<archive>
 						<manifestEntries>

spring-boot-tools/spring-boot-maven-plugin/src/it/jar-non-executable/pom.xml

@@ -28,7 +28,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
-				<version>2.4</version>
+				<version>@maven-jar-plugin.version@</version>
 				<configuration>
 					<archive>
 						<manifest>

spring-boot-tools/spring-boot-maven-plugin/src/it/jar-system-scope-default/pom.xml

@@ -25,7 +25,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
-				<version>2.4</version>
+				<version>@maven-jar-plugin.version@</version>
 				<configuration>
 					<archive>
 						<manifestEntries>

spring-boot-tools/spring-boot-maven-plugin/src/it/jar-system-scope/pom.xml

@@ -28,7 +28,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
-				<version>2.4</version>
+				<version>@maven-jar-plugin.version@</version>
 				<configuration>
 					<archive>
 						<manifestEntries>

spring-boot-tools/spring-boot-maven-plugin/src/it/jar-test-scope/pom.xml

@@ -28,7 +28,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
-				<version>2.4</version>
+				<version>@maven-jar-plugin.version@</version>
 				<configuration>
 					<archive>
 						<manifestEntries>
@@ -54,7 +54,7 @@
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
 			<artifactId>log4j-api</artifactId>
-			<version>2.4.1</version>
+			<version>@log4j2.version@</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>

spring-boot-tools/spring-boot-maven-plugin/src/it/jar-with-unpack/pom.xml

@@ -33,7 +33,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
-				<version>2.4</version>
+				<version>@maven-jar-plugin.version@</version>
 				<configuration>
 					<archive>
 						<manifestEntries>

spring-boot-tools/spring-boot-maven-plugin/src/it/jar/pom.xml

@@ -25,7 +25,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
-				<version>2.4</version>
+				<version>@maven-jar-plugin.version@</version>
 				<configuration>
 					<archive>
 						<manifest>

spring-boot-tools/spring-boot-maven-plugin/src/it/prop/pom.xml

@@ -28,7 +28,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
-				<version>2.4</version>
+				<version>@maven-jar-plugin.version@</version>
 				<configuration>
 					<archive>
 						<manifestEntries>

spring-boot-tools/spring-boot-maven-plugin/src/it/start-stop-automatic-fork/pom.xml

@@ -13,6 +13,7 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>build-helper-maven-plugin</artifactId>
+				<version>@build-helper-maven-plugin.version@</version>
 				<executions>
 					<execution>
 						<id>reserve-jmx-port</id>

spring-boot-tools/spring-boot-maven-plugin/src/it/start-stop-fork/pom.xml

@@ -13,6 +13,7 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>build-helper-maven-plugin</artifactId>
+				<version>@build-helper-maven-plugin.version@</version>
 				<executions>
 					<execution>
 						<id>reserve-jmx-port</id>

spring-boot-tools/spring-boot-maven-plugin/src/it/war-reactor/war/pom.xml

@@ -27,7 +27,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-war-plugin</artifactId>
-				<version>2.3</version>
+				<version>@maven-war-plugin.version@</version>
 				<configuration>
 					<failOnMissingWebXml>false</failOnMissingWebXml>
 					<archive>

spring-boot-tools/spring-boot-maven-plugin/src/it/war-with-unpack/pom.xml

@@ -34,7 +34,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-war-plugin</artifactId>
-				<version>2.3</version>
+				<version>@maven-war-plugin.version@</version>
 				<configuration>
 					<failOnMissingWebXml>false</failOnMissingWebXml>
 					<archive>

spring-boot-tools/spring-boot-maven-plugin/src/it/war/pom.xml

@@ -26,7 +26,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-war-plugin</artifactId>
-				<version>2.3</version>
+				<version>@maven-war-plugin.version@</version>
 				<configuration>
 					<failOnMissingWebXml>false</failOnMissingWebXml>
 					<archive>