Merge branch '1.2.x'

spring-projects · Oct 8, 2015 · 4757635 · 4757635
2 parents 2919556 + ba7c1fd
commit 4757635
Show file tree

Hide file tree

Showing 30 changed files with 451 additions and 375 deletions.
diff --git a/spring-boot-integration-tests/pom.xml b/spring-boot-integration-tests/pom.xml
@@ -18,6 +18,7 @@
 	</organization>
 	<properties>
 		<main.basedir>${basedir}/..</main.basedir>
+		<java.version>1.8</java.version>
 	</properties>
 	<modules>
 		<module>spring-boot-gradle-tests</module>

diff --git a/spring-boot-parent/pom.xml b/spring-boot-parent/pom.xml
@@ -367,6 +367,7 @@
 										</versionRange>
 										<goals>
 											<goal>descriptor</goal>
+											<goal>helpmojo</goal>
 										</goals>
 									</pluginExecutionFilter>
 									<action>

diff --git a/spring-boot-samples/pom.xml b/spring-boot-samples/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.boot</groupId>
@@ -18,6 +19,7 @@
 	</organization>
 	<properties>
 		<main.basedir>${basedir}/..</main.basedir>
+		<java.version>1.8</java.version>
 	</properties>
 	<modules>
 		<module>spring-boot-sample-ant</module>

diff --git a/spring-boot-samples/spring-boot-sample-jersey/pom.xml b/spring-boot-samples/spring-boot-sample-jersey/pom.xml
@@ -18,7 +18,6 @@
 	</organization>
 	<properties>
 		<main.basedir>${basedir}/../..</main.basedir>
-		<java.version>1.7</java.version>
 	</properties>
 	<dependencies>
 		<dependency>

diff --git a/spring-boot-samples/spring-boot-sample-jta-jndi/pom.xml b/spring-boot-samples/spring-boot-sample-jta-jndi/pom.xml
@@ -17,7 +17,6 @@
 		<url>http://www.spring.io</url>
 	</organization>
 	<properties>
-		<java.version>1.7</java.version>
 		<main.basedir>${basedir}/../..</main.basedir>
 	</properties>
 	<dependencies>

diff --git a/spring-boot-samples/spring-boot-sample-servlet/pom.xml b/spring-boot-samples/spring-boot-sample-servlet/pom.xml
@@ -18,7 +18,6 @@
 	</organization>
 	<properties>
 		<main.basedir>${basedir}/../..</main.basedir>
-		<java.version>1.7</java.version>
 		<m2eclipse.wtp.contextRoot>/</m2eclipse.wtp.contextRoot>
 	</properties>
 	<dependencies>

diff --git a/spring-boot-samples/spring-boot-sample-tomcat-jsp/pom.xml b/spring-boot-samples/spring-boot-sample-tomcat-jsp/pom.xml
@@ -19,7 +19,6 @@
 	<properties>
 		<main.basedir>${basedir}/../..</main.basedir>
 		<m2eclipse.wtp.contextRoot>/</m2eclipse.wtp.contextRoot>
-		<java.version>1.7</java.version>
 	</properties>
 	<dependencies>
 		<dependency>

diff --git a/spring-boot-samples/spring-boot-sample-tomcat7-jsp/pom.xml b/spring-boot-samples/spring-boot-sample-tomcat7-jsp/pom.xml
@@ -20,7 +20,6 @@
 		<main.basedir>${basedir}/../..</main.basedir>
 		<m2eclipse.wtp.contextRoot>/</m2eclipse.wtp.contextRoot>
 		<tomcat.version>7.0.59</tomcat.version>
-		<java.version>1.7</java.version>
 	</properties>
 	<dependencies>
 		<dependency>

diff --git a/spring-boot-samples/spring-boot-sample-web-jsp/pom.xml b/spring-boot-samples/spring-boot-sample-web-jsp/pom.xml
@@ -18,7 +18,6 @@
 	</organization>
 	<properties>
 		<main.basedir>${basedir}/../..</main.basedir>
-		<java.version>1.7</java.version>
 		<m2eclipse.wtp.contextRoot>/</m2eclipse.wtp.contextRoot>
 	</properties>
 	<dependencies>

diff --git a/spring-boot-samples/spring-boot-sample-web-static/pom.xml b/spring-boot-samples/spring-boot-sample-web-static/pom.xml
@@ -17,7 +17,6 @@
 		<url>http://www.spring.io</url>
 	</organization>
 	<properties>
-		<java.version>1.7</java.version>
 		<main.basedir>${basedir}/../..</main.basedir>
 	</properties>
 	<dependencies>

diff --git a/spring-boot-samples/spring-boot-sample-websocket-jetty/pom.xml b/spring-boot-samples/spring-boot-sample-websocket-jetty/pom.xml
@@ -17,7 +17,6 @@
 	</organization>
 	<properties>
 		<main.basedir>${basedir}/../..</main.basedir>
-		<java.version>1.7</java.version>
 	</properties>
 	<dependencies>
 		<dependency>

diff --git a/spring-boot-samples/spring-boot-sample-websocket-tomcat/pom.xml b/spring-boot-samples/spring-boot-sample-websocket-tomcat/pom.xml
@@ -17,7 +17,6 @@
 	</organization>
 	<properties>
 		<main.basedir>${basedir}/../..</main.basedir>
-		<java.version>1.7</java.version>
 	</properties>
 	<dependencies>
 		<dependency>

diff --git a/spring-boot-samples/spring-boot-sample-websocket-undertow/pom.xml b/spring-boot-samples/spring-boot-sample-websocket-undertow/pom.xml
@@ -17,7 +17,6 @@
 	</organization>
 	<properties>
 		<main.basedir>${basedir}/../..</main.basedir>
-		<java.version>1.7</java.version>
 	</properties>
 	<dependencies>
 		<dependency>

diff --git a/spring-boot-tools/spring-boot-gradle-plugin/pom.xml b/spring-boot-tools/spring-boot-gradle-plugin/pom.xml
@@ -50,64 +50,6 @@
 			<scope>provided</scope>
 		</dependency>
 	</dependencies>
-	<build>
-		<sourceDirectory>src/main/groovy</sourceDirectory>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<compilerId>groovy-eclipse-compiler</compilerId>
-				</configuration>
-				<dependencies>
-					<dependency>
-						<groupId>org.codehaus.groovy</groupId>
-						<artifactId>groovy-eclipse-compiler</artifactId>
-						<version>2.8.0-01</version>
-					</dependency>
-					<dependency>
-						<groupId>org.codehaus.groovy</groupId>
-						<artifactId>groovy-eclipse-batch</artifactId>
-						<version>2.1.8-01</version>
-					</dependency>
-				</dependencies>
-			</plugin>
-		</plugins>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.eclipse.m2e</groupId>
-					<artifactId>lifecycle-mapping</artifactId>
-					<version>1.0.0</version>
-					<configuration>
-						<lifecycleMappingMetadata>
-							<pluginExecutions>
-								<pluginExecution>
-									<pluginExecutionFilter>
-										<groupId>org.apache.maven.plugins</groupId>
-										<artifactId>maven-compiler-plugin</artifactId>
-										<versionRange>[2.10,)</versionRange>
-										<goals>
-											<goal>compile</goal>
-											<goal>testCompile</goal>
-										</goals>
-										<parameters>
-											<compilerId>groovy-eclipse-compiler</compilerId>
-										</parameters>
-									</pluginExecutionFilter>
-									<action>
-										<configurator>
-											<id>org.codehaus.groovy.m2eclipse.configurator</id>
-										</configurator>
-									</action>
-								</pluginExecution>
-							</pluginExecutions>
-						</lifecycleMappingMetadata>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-	</build>
 	<repositories>
 		<repository>
 			<id>gradle</id>

diff --git a/...oot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/SpringBootPlugin.groovy b/...oot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/SpringBootPlugin.groovy
diff --git a/...e-plugin/src/main/groovy/org/springframework/boot/gradle/SpringBootPluginExtension.groovy b/...e-plugin/src/main/groovy/org/springframework/boot/gradle/SpringBootPluginExtension.groovy