Migrate JAXB Runtime from com.sun.xml.bind:jaxb-impl to `org.glassf…

…ish.jaxb:jaxb-runtime` (#29013)
apache · Nov 12, 2023 · d696698 · d696698
1 parent f8a420f
commit d696698
Show file tree

Hide file tree

Showing 12 changed files with 29 additions and 62 deletions.
diff --git a/distribution/proxy-native/src/main/release-docs/LICENSE b/distribution/proxy-native/src/main/release-docs/LICENSE
@@ -345,9 +345,8 @@ The text of each license is also included at licenses/LICENSE-[project].txt.
 
     javax.activation-api 1.2.0: https://github.com/javaee/javax.annotation, CDDL
     jta 1.1: http://jta-spec.java.net, CDDL
-    jaxb-api 2.3.0: http://www.oracle.com, CDDL
-    jaxb-core 2.3.0: http://www.oracle.com, CDDL
-    jaxb-impl 2.3.0 http://www.oracle.com, CDDL
+    jaxb-api 2.3.1: http://www.oracle.com, CDDL
+    jaxb-runtime 2.3.1 https://javaee.github.io/jaxb-v2/, CDDL
 
 ========================================================================
 EPL licenses

diff --git a/distribution/proxy/src/main/release-docs/LICENSE b/distribution/proxy/src/main/release-docs/LICENSE
@@ -345,9 +345,8 @@ The text of each license is also included at licenses/LICENSE-[project].txt.
 
     javax.activation-api 1.2.0: https://github.com/javaee/javax.annotation, CDDL
     jta 1.1: http://jta-spec.java.net, CDDL
-    jaxb-api 2.3.0: http://www.oracle.com, CDDL
-    jaxb-core 2.3.0: http://www.oracle.com, CDDL
-    jaxb-impl 2.3.0 http://www.oracle.com, CDDL
+    jaxb-api 2.3.1: http://www.oracle.com, CDDL
+    jaxb-runtime 2.3.1 https://javaee.github.io/jaxb-v2/, CDDL
 
 ========================================================================
 EPL licenses

diff --git a/...ser-manual/shardingsphere-jdbc/yaml-config/jdbc-driver/spring-boot/_index.cn.md b/...ser-manual/shardingsphere-jdbc/yaml-config/jdbc-driver/spring-boot/_index.cn.md
@@ -56,7 +56,7 @@ Quarkus 3，Micronaut Framework 4 和 Helidon 3。
         <dependency>
             <groupId>org.glassfish.jaxb</groupId>
             <artifactId>jaxb-runtime</artifactId>
-            <version>2.3.8</version>
+            <version>2.3.1</version>
         </dependency>
     </dependencies>
 </project>

diff --git a/...ser-manual/shardingsphere-jdbc/yaml-config/jdbc-driver/spring-boot/_index.en.md b/...ser-manual/shardingsphere-jdbc/yaml-config/jdbc-driver/spring-boot/_index.en.md
@@ -57,7 +57,7 @@ also applies to other Jakarta EE-based Web Frameworks, such as Quarkus 3, Micron
         <dependency>
             <groupId>org.glassfish.jaxb</groupId>
             <artifactId>jaxb-runtime</artifactId>
-            <version>2.3.8</version>
+            <version>2.3.1</version>
         </dependency>
     </dependencies>
 </project>

diff --git a/kernel/sql-federation/core/pom.xml b/kernel/sql-federation/core/pom.xml
@@ -60,13 +60,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
+            <groupId>org.glassfish.jaxb</groupId>
+            <artifactId>jaxb-runtime</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/kernel/sql-federation/executor/pom.xml b/kernel/sql-federation/executor/pom.xml
@@ -80,13 +80,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
+            <groupId>org.glassfish.jaxb</groupId>
+            <artifactId>jaxb-runtime</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/kernel/sql-federation/optimizer/pom.xml b/kernel/sql-federation/optimizer/pom.xml
@@ -100,13 +100,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
+            <groupId>org.glassfish.jaxb</groupId>
+            <artifactId>jaxb-runtime</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/kernel/transaction/type/xa/provider/narayana/pom.xml b/kernel/transaction/type/xa/provider/narayana/pom.xml
@@ -63,12 +63,8 @@
             <artifactId>jaxb-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
+            <groupId>org.glassfish.jaxb</groupId>
+            <artifactId>jaxb-runtime</artifactId>
         </dependency>
         <dependency>
             <groupId>javax.activation</groupId>

diff --git a/mode/type/standalone/repository/provider/jdbc/pom.xml b/mode/type/standalone/repository/provider/jdbc/pom.xml
@@ -45,12 +45,8 @@
             <artifactId>jaxb-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
+            <groupId>org.glassfish.jaxb</groupId>
+            <artifactId>jaxb-runtime</artifactId>
         </dependency>
         <dependency>
             <groupId>javax.activation</groupId>

diff --git a/...rg/apache/shardingsphere/mode/repository/standalone/jdbc/sql/JDBCRepositorySQLLoader.java b/...rg/apache/shardingsphere/mode/repository/standalone/jdbc/sql/JDBCRepositorySQLLoader.java
@@ -82,7 +82,7 @@ public static JDBCRepositorySQL load(final String type) {
     }
 
     /**
-     * Under the GraalVM Native Image corresponding to GraalVM CE 21.0.1, although there is
+     * Under the GraalVM Native Image corresponding to GraalVM CE 23.0.2 For JDK 17.0.9, although there is
      * `com.oracle.svm.core.jdk.resources.NativeImageResourceFileSystemProvider`, the corresponding
      * `com.oracle.svm.core.jdk.resources.NativeImageResourceFileSystem` does not autoload. This is mainly to align the
      * behavior of `ZipFileSystemProvider`, so ShardingSphere need to manually open and close the FileSystem
@@ -101,12 +101,12 @@ public static JDBCRepositorySQL load(final String type) {
      * @see sun.nio.fs.UnixFileSystemProvider
      */
     private static JDBCRepositorySQL loadFromDirectory(final URL url, final String type) throws URISyntaxException, IOException {
-        if (null != System.getProperty("org.graalvm.nativeimage.imagecode")) {
-            try (FileSystem ignored = FileSystems.newFileSystem(URI.create("resource:/"), Collections.singletonMap("create", "true"))) {
+        if (null == System.getProperty("org.graalvm.nativeimage.imagecode") || !"runtime".equals(System.getProperty("org.graalvm.nativeimage.imagecode"))) {
+            return loadFromDirectoryLegacy(url, type);
+        } else {
+            try (FileSystem ignored = FileSystems.newFileSystem(URI.create("resource:/"), Collections.emptyMap())) {
                 return loadFromDirectoryLegacy(url, type);
             }
-        } else {
-            return loadFromDirectoryLegacy(url, type);
         }
     }
 

diff --git a/pom.xml b/pom.xml
@@ -87,7 +87,8 @@
         <freemarker.version>2.3.31</freemarker.version>
         <bytebuddy.version>1.14.8</bytebuddy.version>
 
-        <jaxb.version>2.3.0</jaxb.version>
+        <jaxb-api.version>2.3.1</jaxb-api.version>
+        <jaxb-runtime.version>2.3.1</jaxb-runtime.version>
         <annotation-api.version>1.3.2</annotation-api.version>
         <activation-api.version>1.2.0</activation-api.version>
 
@@ -298,17 +299,12 @@
             <dependency>
                 <groupId>javax.xml.bind</groupId>
                 <artifactId>jaxb-api</artifactId>
-                <version>${jaxb.version}</version>
+                <version>${jaxb-api.version}</version>
             </dependency>
             <dependency>
-                <groupId>com.sun.xml.bind</groupId>
-                <artifactId>jaxb-core</artifactId>
-                <version>${jaxb.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.sun.xml.bind</groupId>
-                <artifactId>jaxb-impl</artifactId>
-                <version>${jaxb.version}</version>
+                <groupId>org.glassfish.jaxb</groupId>
+                <artifactId>jaxb-runtime</artifactId>
+                <version>${jaxb-runtime.version}</version>
             </dependency>
             <dependency>
                 <groupId>javax.annotation</groupId>

diff --git a/test/pom.xml b/test/pom.xml
@@ -56,12 +56,8 @@
             <artifactId>jaxb-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
+            <groupId>org.glassfish.jaxb</groupId>
+            <artifactId>jaxb-runtime</artifactId>
         </dependency>
         <dependency>
             <groupId>javax.activation</groupId>