diff --git a/spring-boot-project/spring-boot-autoconfigure/pom.xml b/spring-boot-project/spring-boot-autoconfigure/pom.xml
index 89e77a59a30..083c1e726ba 100755
--- a/spring-boot-project/spring-boot-autoconfigure/pom.xml
+++ b/spring-boot-project/spring-boot-autoconfigure/pom.xml
@@ -796,4 +796,32 @@
test
+
+
+ java9-10
+
+ [9,10]
+
+
+
+ javax.xml.bind
+ jaxb-api
+ true
+
+
+
+
+ java11+
+
+ [11,)
+
+
+
+ org.glassfish.jaxb
+ jaxb-runtime
+ true
+
+
+
+
diff --git a/spring-boot-project/spring-boot-cli/pom.xml b/spring-boot-project/spring-boot-cli/pom.xml
index 7fc84062f61..54d34cacdff 100644
--- a/spring-boot-project/spring-boot-cli/pom.xml
+++ b/spring-boot-project/spring-boot-cli/pom.xml
@@ -454,5 +454,31 @@
integration
+
+ java9-10
+
+ [9,10]
+
+
+
+ javax.xml.bind
+ jaxb-api
+ true
+
+
+
+
+ java11+
+
+ [11,)
+
+
+
+ org.glassfish.jaxb
+ jaxb-runtime
+ true
+
+
+
diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml
index 2c9502dfd7f..72eebf25199 100644
--- a/spring-boot-project/spring-boot-dependencies/pom.xml
+++ b/spring-boot-project/spring-boot-dependencies/pom.xml
@@ -62,6 +62,7 @@
2.3.28
6.3.2
3.0.0
+ 2.4.0-b180725.0644
2.5.2
2.8.5
1.4.197
@@ -1832,6 +1833,11 @@
javax.el
${glassfish-el.version}
+
+ org.glassfish.jaxb
+ jaxb-runtime
+ ${glassfixh-jaxb.version}
+
org.glassfish.jersey
jersey-bom
diff --git a/spring-boot-project/spring-boot-parent/pom.xml b/spring-boot-project/spring-boot-parent/pom.xml
index 73adde12113..e7d801c6cf5 100644
--- a/spring-boot-project/spring-boot-parent/pom.xml
+++ b/spring-boot-project/spring-boot-parent/pom.xml
@@ -720,22 +720,5 @@
false
-
- java9
-
- [9,)
-
-
-
-
- org.apache.maven.plugins
- maven-surefire-plugin
-
- --add-modules java.base,java.xml.bind
-
-
-
-
-
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 fef2563b04c..431fd79c407 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 @@
- java9
+ java9+
[9,)
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 762601567c7..3d33c7cbb6b 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 @@
- java9
+ java9+
[9,)
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 010e571d6a6..4a5043123a3 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 @@
- java9
+ java9+
[9,)
diff --git a/spring-boot-samples/spring-boot-sample-flyway/pom.xml b/spring-boot-samples/spring-boot-sample-flyway/pom.xml
index cd19bce8fdb..af85a4e84c1 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 @@
- java9
+ java9+
[9,)
diff --git a/spring-boot-samples/spring-boot-sample-jersey/pom.xml b/spring-boot-samples/spring-boot-sample-jersey/pom.xml
index 2a63b6e336a..568e4de04fb 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 @@
- java9
+ java9+
[9,)
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 a2ddaa620d6..bcea810c92d 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 @@
- java9
+ java9+
[9,)
diff --git a/spring-boot-samples/spring-boot-sample-jpa/pom.xml b/spring-boot-samples/spring-boot-sample-jpa/pom.xml
index cc03b62548d..e0257afe18c 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 @@
- java9
+ java9+
[9,)
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 fe88c18245f..f2e39803b60 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 @@
- java9
+ java9+
[9,)
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 78ac055e63d..fe5e57e9b48 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 @@
- java9
+ java9+
[9,)
diff --git a/spring-boot-samples/spring-boot-sample-test/pom.xml b/spring-boot-samples/spring-boot-sample-test/pom.xml
index 1bc14adf0d4..99158d3a57c 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 @@
- java9
+ java9+
[9,)
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 bf36407c209..73fdeee38aa 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 @@
- java9
+ java9+
[9,)
diff --git a/spring-boot-samples/spring-boot-sample-webservices/pom.xml b/spring-boot-samples/spring-boot-sample-webservices/pom.xml
index 397d8601727..3d7b088b5c9 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 @@
- java9
+ java9-10
- [9,)
+ [9,10]
-
-
-
- org.apache.maven.plugins
- maven-surefire-plugin
-
- --add-modules java.base,java.xml.ws
-
-
-
-
+
+
+ javax.xml.bind
+ jaxb-api
+
+
+
+
+ java11+
+
+ [11,)
+
+
+
+ org.glassfish.jaxb
+ jaxb-runtime
+
+