From d1ac774af20a489c6be4bc8ff5572255021b6f08 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Thu, 9 Aug 2018 14:35:03 +0200
Subject: [PATCH] Configure build to be compatible with Java 11

See gh-14028
---
 .../spring-boot-autoconfigure/pom.xml         | 28 ++++++++++++++++
 spring-boot-project/spring-boot-cli/pom.xml   | 26 +++++++++++++++
 .../spring-boot-dependencies/pom.xml          |  6 ++++
 .../spring-boot-parent/pom.xml                | 17 ----------
 .../spring-boot-sample-data-cassandra/pom.xml |  2 +-
 .../spring-boot-sample-data-jpa/pom.xml       |  2 +-
 .../spring-boot-sample-data-rest/pom.xml      |  2 +-
 .../spring-boot-sample-flyway/pom.xml         |  2 +-
 .../spring-boot-sample-jersey/pom.xml         |  2 +-
 .../spring-boot-sample-jetty-jsp/pom.xml      |  2 +-
 .../spring-boot-sample-jpa/pom.xml            |  2 +-
 .../spring-boot-sample-jta-atomikos/pom.xml   |  2 +-
 .../spring-boot-sample-jta-bitronix/pom.xml   |  2 +-
 .../spring-boot-sample-test/pom.xml           |  2 +-
 .../pom.xml                                   |  2 +-
 .../spring-boot-sample-webservices/pom.xml    | 33 +++++++++++--------
 16 files changed, 91 insertions(+), 41 deletions(-)

diff --git a/spring-boot-project/spring-boot-autoconfigure/pom.xml b/spring-boot-project/spring-boot-autoconfigure/pom.xml
index 89e77a59a3..083c1e726b 100755
--- a/spring-boot-project/spring-boot-autoconfigure/pom.xml
+++ b/spring-boot-project/spring-boot-autoconfigure/pom.xml
@@ -796,4 +796,32 @@
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
+	<profiles>
+		<profile>
+			<id>java9-10</id>
+			<activation>
+				<jdk>[9,10]</jdk>
+			</activation>
+			<dependencies>
+				<dependency>
+					<groupId>javax.xml.bind</groupId>
+					<artifactId>jaxb-api</artifactId>
+					<optional>true</optional>
+				</dependency>
+			</dependencies>
+		</profile>
+		<profile>
+			<id>java11+</id>
+			<activation>
+				<jdk>[11,)</jdk>
+			</activation>
+			<dependencies>
+				<dependency>
+					<groupId>org.glassfish.jaxb</groupId>
+					<artifactId>jaxb-runtime</artifactId>
+					<optional>true</optional>
+				</dependency>
+			</dependencies>
+		</profile>
+	</profiles>
 </project>
diff --git a/spring-boot-project/spring-boot-cli/pom.xml b/spring-boot-project/spring-boot-cli/pom.xml
index 7fc84062f6..54d34cacdf 100644
--- a/spring-boot-project/spring-boot-cli/pom.xml
+++ b/spring-boot-project/spring-boot-cli/pom.xml
@@ -454,5 +454,31 @@
 				<spring.profiles.active>integration</spring.profiles.active>
 			</properties>
 		</profile>
+		<profile>
+			<id>java9-10</id>
+			<activation>
+				<jdk>[9,10]</jdk>
+			</activation>
+			<dependencies>
+				<dependency>
+					<groupId>javax.xml.bind</groupId>
+					<artifactId>jaxb-api</artifactId>
+					<optional>true</optional>
+				</dependency>
+			</dependencies>
+		</profile>
+		<profile>
+			<id>java11+</id>
+			<activation>
+				<jdk>[11,)</jdk>
+			</activation>
+			<dependencies>
+				<dependency>
+					<groupId>org.glassfish.jaxb</groupId>
+					<artifactId>jaxb-runtime</artifactId>
+					<optional>true</optional>
+				</dependency>
+			</dependencies>
+		</profile>
 	</profiles>
 </project>
diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml
index 2c9502dfd7..72eebf2519 100644
--- a/spring-boot-project/spring-boot-dependencies/pom.xml
+++ b/spring-boot-project/spring-boot-dependencies/pom.xml
@@ -62,6 +62,7 @@
 		<freemarker.version>2.3.28</freemarker.version>
 		<elasticsearch.version>6.3.2</elasticsearch.version>
 		<glassfish-el.version>3.0.0</glassfish-el.version>
+		<glassfixh-jaxb.version>2.4.0-b180725.0644</glassfixh-jaxb.version>
 		<groovy.version>2.5.2</groovy.version>
 		<gson.version>2.8.5</gson.version>
 		<h2.version>1.4.197</h2.version>
@@ -1832,6 +1833,11 @@
 				<artifactId>javax.el</artifactId>
 				<version>${glassfish-el.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.glassfish.jaxb</groupId>
+				<artifactId>jaxb-runtime</artifactId>
+				<version>${glassfixh-jaxb.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>org.glassfish.jersey</groupId>
 				<artifactId>jersey-bom</artifactId>
diff --git a/spring-boot-project/spring-boot-parent/pom.xml b/spring-boot-project/spring-boot-parent/pom.xml
index 73adde1211..e7d801c6cf 100644
--- a/spring-boot-project/spring-boot-parent/pom.xml
+++ b/spring-boot-project/spring-boot-parent/pom.xml
@@ -720,22 +720,5 @@
 				<m2e.cdi.activation>false</m2e.cdi.activation>
 			</properties>
 		</profile>
-		<profile>
-			<id>java9</id>
-			<activation>
-				<jdk>[9,)</jdk>
-			</activation>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-surefire-plugin</artifactId>
-						<configuration>
-							<argLine>--add-modules java.base,java.xml.bind</argLine>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
 	</profiles>
 </project>
diff --git a/spring-boot-samples/spring-boot-sample-data-cassandra/pom.xml b/spring-boot-samples/spring-boot-sample-data-cassandra/pom.xml
index fef2563b04..431fd79c40 100644
--- a/spring-boot-samples/spring-boot-sample-data-cassandra/pom.xml
+++ b/spring-boot-samples/spring-boot-sample-data-cassandra/pom.xml
@@ -105,7 +105,7 @@
 	</build>
 	<profiles>
 		<profile>
-			<id>java9</id>
+			<id>java9+</id>
 			<activation>
 				<jdk>[9,)</jdk>
 			</activation>
diff --git a/spring-boot-samples/spring-boot-sample-data-jpa/pom.xml b/spring-boot-samples/spring-boot-sample-data-jpa/pom.xml
index 762601567c..3d33c7cbb6 100755
--- a/spring-boot-samples/spring-boot-sample-data-jpa/pom.xml
+++ b/spring-boot-samples/spring-boot-sample-data-jpa/pom.xml
@@ -47,7 +47,7 @@
 	</build>
 	<profiles>
 		<profile>
-			<id>java9</id>
+			<id>java9+</id>
 			<activation>
 				<jdk>[9,)</jdk>
 			</activation>
diff --git a/spring-boot-samples/spring-boot-sample-data-rest/pom.xml b/spring-boot-samples/spring-boot-sample-data-rest/pom.xml
index 010e571d6a..4a5043123a 100644
--- a/spring-boot-samples/spring-boot-sample-data-rest/pom.xml
+++ b/spring-boot-samples/spring-boot-sample-data-rest/pom.xml
@@ -66,7 +66,7 @@
 	</build>
 	<profiles>
 		<profile>
-			<id>java9</id>
+			<id>java9+</id>
 			<activation>
 				<jdk>[9,)</jdk>
 			</activation>
diff --git a/spring-boot-samples/spring-boot-sample-flyway/pom.xml b/spring-boot-samples/spring-boot-sample-flyway/pom.xml
index cd19bce8fd..af85a4e84c 100644
--- a/spring-boot-samples/spring-boot-sample-flyway/pom.xml
+++ b/spring-boot-samples/spring-boot-sample-flyway/pom.xml
@@ -55,7 +55,7 @@
 	</build>
 	<profiles>
 		<profile>
-			<id>java9</id>
+			<id>java9+</id>
 			<activation>
 				<jdk>[9,)</jdk>
 			</activation>
diff --git a/spring-boot-samples/spring-boot-sample-jersey/pom.xml b/spring-boot-samples/spring-boot-sample-jersey/pom.xml
index 2a63b6e336..568e4de04f 100644
--- a/spring-boot-samples/spring-boot-sample-jersey/pom.xml
+++ b/spring-boot-samples/spring-boot-sample-jersey/pom.xml
@@ -56,7 +56,7 @@
 	</build>
 	<profiles>
 		<profile>
-			<id>java9</id>
+			<id>java9+</id>
 			<activation>
 				<jdk>[9,)</jdk>
 			</activation>
diff --git a/spring-boot-samples/spring-boot-sample-jetty-jsp/pom.xml b/spring-boot-samples/spring-boot-sample-jetty-jsp/pom.xml
index a2ddaa620d..bcea810c92 100644
--- a/spring-boot-samples/spring-boot-sample-jetty-jsp/pom.xml
+++ b/spring-boot-samples/spring-boot-sample-jetty-jsp/pom.xml
@@ -71,7 +71,7 @@
 	</build>
 	<profiles>
 		<profile>
-			<id>java9</id>
+			<id>java9+</id>
 			<activation>
 				<jdk>[9,)</jdk>
 			</activation>
diff --git a/spring-boot-samples/spring-boot-sample-jpa/pom.xml b/spring-boot-samples/spring-boot-sample-jpa/pom.xml
index cc03b62548..e0257afe18 100644
--- a/spring-boot-samples/spring-boot-sample-jpa/pom.xml
+++ b/spring-boot-samples/spring-boot-sample-jpa/pom.xml
@@ -55,7 +55,7 @@
 	</build>
 	<profiles>
 		<profile>
-			<id>java9</id>
+			<id>java9+</id>
 			<activation>
 				<jdk>[9,)</jdk>
 			</activation>
diff --git a/spring-boot-samples/spring-boot-sample-jta-atomikos/pom.xml b/spring-boot-samples/spring-boot-sample-jta-atomikos/pom.xml
index fe88c18245..f2e39803b6 100644
--- a/spring-boot-samples/spring-boot-sample-jta-atomikos/pom.xml
+++ b/spring-boot-samples/spring-boot-sample-jta-atomikos/pom.xml
@@ -63,7 +63,7 @@
 	</build>
 	<profiles>
 		<profile>
-			<id>java9</id>
+			<id>java9+</id>
 			<activation>
 				<jdk>[9,)</jdk>
 			</activation>
diff --git a/spring-boot-samples/spring-boot-sample-jta-bitronix/pom.xml b/spring-boot-samples/spring-boot-sample-jta-bitronix/pom.xml
index 78ac055e63..fe5e57e9b4 100644
--- a/spring-boot-samples/spring-boot-sample-jta-bitronix/pom.xml
+++ b/spring-boot-samples/spring-boot-sample-jta-bitronix/pom.xml
@@ -63,7 +63,7 @@
 	</build>
 	<profiles>
 		<profile>
-			<id>java9</id>
+			<id>java9+</id>
 			<activation>
 				<jdk>[9,)</jdk>
 			</activation>
diff --git a/spring-boot-samples/spring-boot-sample-test/pom.xml b/spring-boot-samples/spring-boot-sample-test/pom.xml
index 1bc14adf0d..99158d3a57 100644
--- a/spring-boot-samples/spring-boot-sample-test/pom.xml
+++ b/spring-boot-samples/spring-boot-sample-test/pom.xml
@@ -63,7 +63,7 @@
 	</build>
 	<profiles>
 		<profile>
-			<id>java9</id>
+			<id>java9+</id>
 			<activation>
 				<jdk>[9,)</jdk>
 			</activation>
diff --git a/spring-boot-samples/spring-boot-sample-web-groovy-templates/pom.xml b/spring-boot-samples/spring-boot-sample-web-groovy-templates/pom.xml
index bf36407c20..73fdeee38a 100755
--- a/spring-boot-samples/spring-boot-sample-web-groovy-templates/pom.xml
+++ b/spring-boot-samples/spring-boot-sample-web-groovy-templates/pom.xml
@@ -37,7 +37,7 @@
 	</build>
 	<profiles>
 		<profile>
-			<id>java9</id>
+			<id>java9+</id>
 			<activation>
 				<jdk>[9,)</jdk>
 			</activation>
diff --git a/spring-boot-samples/spring-boot-sample-webservices/pom.xml b/spring-boot-samples/spring-boot-sample-webservices/pom.xml
index 397d860172..3d7b088b5c 100644
--- a/spring-boot-samples/spring-boot-sample-webservices/pom.xml
+++ b/spring-boot-samples/spring-boot-sample-webservices/pom.xml
@@ -49,21 +49,28 @@
 	</build>
 	<profiles>
 		<profile>
-			<id>java9</id>
+			<id>java9-10</id>
 			<activation>
-				<jdk>[9,)</jdk>
+				<jdk>[9,10]</jdk>
 			</activation>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-surefire-plugin</artifactId>
-						<configuration>
-							<argLine>--add-modules java.base,java.xml.ws</argLine>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
+			<dependencies>
+				<dependency>
+					<groupId>javax.xml.bind</groupId>
+					<artifactId>jaxb-api</artifactId>
+				</dependency>
+			</dependencies>
+		</profile>
+		<profile>
+			<id>java11+</id>
+			<activation>
+				<jdk>[11,)</jdk>
+			</activation>
+			<dependencies>
+				<dependency>
+					<groupId>org.glassfish.jaxb</groupId>
+					<artifactId>jaxb-runtime</artifactId>
+				</dependency>
+			</dependencies>
 		</profile>
 	</profiles>
 </project>