From ba2f2a3727ce6c3bd229d52a35b8dddf9a31ade4 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Fri, 17 Aug 2018 16:17:00 +0200
Subject: [PATCH] Polish jaxb setup for JDK 9 and further

---
 .../spring-boot-autoconfigure/pom.xml           | 17 ++---------------
 spring-boot-project/spring-boot-cli/pom.xml     | 17 ++---------------
 2 files changed, 4 insertions(+), 30 deletions(-)

diff --git a/spring-boot-project/spring-boot-autoconfigure/pom.xml b/spring-boot-project/spring-boot-autoconfigure/pom.xml
index 083c1e726b..f9e08b16b7 100755
--- a/spring-boot-project/spring-boot-autoconfigure/pom.xml
+++ b/spring-boot-project/spring-boot-autoconfigure/pom.xml
@@ -798,22 +798,9 @@
 	</dependencies>
 	<profiles>
 		<profile>
-			<id>java9-10</id>
+			<id>java9+</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>
+				<jdk>[9,)</jdk>
 			</activation>
 			<dependencies>
 				<dependency>
diff --git a/spring-boot-project/spring-boot-cli/pom.xml b/spring-boot-project/spring-boot-cli/pom.xml
index 54d34cacdf..d5c63cd14f 100644
--- a/spring-boot-project/spring-boot-cli/pom.xml
+++ b/spring-boot-project/spring-boot-cli/pom.xml
@@ -455,22 +455,9 @@
 			</properties>
 		</profile>
 		<profile>
-			<id>java9-10</id>
+			<id>java9+</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>
+				<jdk>[9,)</jdk>
 			</activation>
 			<dependencies>
 				<dependency>