From 4c26b0c194807ee401324a19bc252c1541229b5d Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@pivotal.io>
Date: Thu, 15 Oct 2015 23:36:18 -0700
Subject: [PATCH 1/3] Increase PermGen for CLI integration tests

---
 spring-boot-cli/pom.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/spring-boot-cli/pom.xml b/spring-boot-cli/pom.xml
index 9ac21cfe244..03603f83973 100644
--- a/spring-boot-cli/pom.xml
+++ b/spring-boot-cli/pom.xml
@@ -136,6 +136,9 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-failsafe-plugin</artifactId>
+				<configuration>
+					<argLine>-Xmx1024m -XX:MaxPermSize=512m</argLine>
+				</configuration>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>

From d84889b03cea49c55868f53f57571218afb7d4f0 Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@pivotal.io>
Date: Fri, 16 Oct 2015 00:01:52 -0700
Subject: [PATCH 2/3] Revert "Compile samples and integration tests with Java
 8"

This reverts commit 09395f956ad223e7c0d32a8c08f670bcb5e90209.
---
 spring-boot-integration-tests/pom.xml                         | 1 -
 spring-boot-samples/pom.xml                                   | 4 +---
 spring-boot-samples/spring-boot-sample-jersey/pom.xml         | 1 +
 spring-boot-samples/spring-boot-sample-jta-jndi/pom.xml       | 1 +
 spring-boot-samples/spring-boot-sample-servlet/pom.xml        | 1 +
 spring-boot-samples/spring-boot-sample-tomcat-jsp/pom.xml     | 1 +
 spring-boot-samples/spring-boot-sample-tomcat7-jsp/pom.xml    | 1 +
 spring-boot-samples/spring-boot-sample-web-jsp/pom.xml        | 1 +
 spring-boot-samples/spring-boot-sample-web-static/pom.xml     | 1 +
 .../spring-boot-sample-websocket-jetty/pom.xml                | 1 +
 .../spring-boot-sample-websocket-tomcat/pom.xml               | 1 +
 .../spring-boot-sample-websocket-undertow/pom.xml             | 1 +
 12 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/spring-boot-integration-tests/pom.xml b/spring-boot-integration-tests/pom.xml
index 9c61788a593..8e50df99383 100644
--- a/spring-boot-integration-tests/pom.xml
+++ b/spring-boot-integration-tests/pom.xml
@@ -18,7 +18,6 @@
 	</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-samples/pom.xml b/spring-boot-samples/pom.xml
index 7c8b54d1118..e29c2873981 100644
--- a/spring-boot-samples/pom.xml
+++ b/spring-boot-samples/pom.xml
@@ -1,6 +1,5 @@
 <?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>
@@ -19,7 +18,6 @@
 	</organization>
 	<properties>
 		<main.basedir>${basedir}/..</main.basedir>
-		<java.version>1.8</java.version>
 	</properties>
 	<modules>
 		<module>spring-boot-sample-actuator</module>
diff --git a/spring-boot-samples/spring-boot-sample-jersey/pom.xml b/spring-boot-samples/spring-boot-sample-jersey/pom.xml
index 320b94f9cce..e219f6ebf08 100644
--- a/spring-boot-samples/spring-boot-sample-jersey/pom.xml
+++ b/spring-boot-samples/spring-boot-sample-jersey/pom.xml
@@ -18,6 +18,7 @@
 	</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
index e4edda40014..4aba3c8b5e4 100644
--- a/spring-boot-samples/spring-boot-sample-jta-jndi/pom.xml
+++ b/spring-boot-samples/spring-boot-sample-jta-jndi/pom.xml
@@ -17,6 +17,7 @@
 		<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
index 1d92d532d28..e96dc1f047f 100644
--- a/spring-boot-samples/spring-boot-sample-servlet/pom.xml
+++ b/spring-boot-samples/spring-boot-sample-servlet/pom.xml
@@ -18,6 +18,7 @@
 	</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
index 849629fbb8a..655be0ae5a4 100644
--- a/spring-boot-samples/spring-boot-sample-tomcat-jsp/pom.xml
+++ b/spring-boot-samples/spring-boot-sample-tomcat-jsp/pom.xml
@@ -19,6 +19,7 @@
 	<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
index c394d83dc16..b3a608326b8 100644
--- a/spring-boot-samples/spring-boot-sample-tomcat7-jsp/pom.xml
+++ b/spring-boot-samples/spring-boot-sample-tomcat7-jsp/pom.xml
@@ -20,6 +20,7 @@
 		<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
index a6dc9b3c72f..6ff960f4307 100644
--- a/spring-boot-samples/spring-boot-sample-web-jsp/pom.xml
+++ b/spring-boot-samples/spring-boot-sample-web-jsp/pom.xml
@@ -18,6 +18,7 @@
 	</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
index 3dade1d797d..47d8d140230 100644
--- a/spring-boot-samples/spring-boot-sample-web-static/pom.xml
+++ b/spring-boot-samples/spring-boot-sample-web-static/pom.xml
@@ -17,6 +17,7 @@
 		<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
index 53d5285f966..17ff9a49637 100755
--- a/spring-boot-samples/spring-boot-sample-websocket-jetty/pom.xml
+++ b/spring-boot-samples/spring-boot-sample-websocket-jetty/pom.xml
@@ -17,6 +17,7 @@
 	</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
index fa69d90100a..01a47ca2ee7 100755
--- a/spring-boot-samples/spring-boot-sample-websocket-tomcat/pom.xml
+++ b/spring-boot-samples/spring-boot-sample-websocket-tomcat/pom.xml
@@ -17,6 +17,7 @@
 	</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
index bbdacfa25ab..85c8cf8f143 100755
--- a/spring-boot-samples/spring-boot-sample-websocket-undertow/pom.xml
+++ b/spring-boot-samples/spring-boot-sample-websocket-undertow/pom.xml
@@ -17,6 +17,7 @@
 	</organization>
 	<properties>
 		<main.basedir>${basedir}/../..</main.basedir>
+		<java.version>1.7</java.version>
 	</properties>
 	<dependencies>
 		<dependency>

From b0d287356cd2e103b883f6f9d9a013c057294ade Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@pivotal.io>
Date: Fri, 16 Oct 2015 00:28:05 -0700
Subject: [PATCH 3/3] Revert "Increase PermGen for CLI integration tests"

This reverts commit 4c26b0c194807ee401324a19bc252c1541229b5d.
---
 spring-boot-cli/pom.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/spring-boot-cli/pom.xml b/spring-boot-cli/pom.xml
index 03603f83973..9ac21cfe244 100644
--- a/spring-boot-cli/pom.xml
+++ b/spring-boot-cli/pom.xml
@@ -136,9 +136,6 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-failsafe-plugin</artifactId>
-				<configuration>
-					<argLine>-Xmx1024m -XX:MaxPermSize=512m</argLine>
-				</configuration>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>