Support building ShardingSphere and its corresponding GraalVM Native …

…Image through JDK 22
apache · Apr 4, 2024 · 1b68bc0 · 1b68bc0
1 parent 78b89b6
commit 1b68bc0
Show file tree

Hide file tree

Showing 9 changed files with 660 additions and 77 deletions.
diff --git a/.github/workflows/nightly-ci.yml b/.github/workflows/nightly-ci.yml
@@ -41,7 +41,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ ubuntu-latest, macos-latest, windows-latest ]
-        java-version: [ 11, 17, 21 ]
+        java-version: [ 11, 17, 21, 22 ]
     steps:
       - name: Support Long Paths in Windows
         if: matrix.os == 'windows-latest'

diff --git a/...ument/content/user-manual/shardingsphere-jdbc/graalvm-native-image/_index.cn.md b/...ument/content/user-manual/shardingsphere-jdbc/graalvm-native-image/_index.cn.md
@@ -16,6 +16,7 @@ ShardingSphere JDBC 要求在如下或更高版本的 `GraalVM CE` 完成构建
 适用于 `Oracle GraalVM`， `Liberica Native Image Kit` 和 `Mandrel` 等 `GraalVM CE` 的下游发行版。
 
 - GraalVM CE 23.1.2 For JDK 21.0.2，对应于 SDKMAN! 的 `21.0.2-graalce`
+- GraalVM CE 24.0.0 For JDK 22，对应于 SDKMAN! 的 `22-graalce`
 
 ### Maven 生态
 

diff --git a/...ument/content/user-manual/shardingsphere-jdbc/graalvm-native-image/_index.en.md b/...ument/content/user-manual/shardingsphere-jdbc/graalvm-native-image/_index.en.md
@@ -17,6 +17,7 @@ JDK through `SDKMAN!`. Same reason applicable to downstream distributions of `Gr
 and `Mandrel`.
 
 - GraalVM CE 23.1.2 For JDK 21.0.2, corresponding to `21.0.2-graalce` of SDKMAN!
+- GraalVM CE 24.0.0 For JDK 22, corresponding to `22-graalce` of SDKMAN!
 
 ### Maven Ecology
 

diff --git a/...in/java/org/apache/shardingsphere/infra/expr/espresso/EspressoInlineExpressionParser.java b/...in/java/org/apache/shardingsphere/infra/expr/espresso/EspressoInlineExpressionParser.java
@@ -43,7 +43,7 @@ public final class EspressoInlineExpressionParser implements InlineExpressionPar
     private String inlineExpression;
 
     static {
-        URL groovyJarUrl = ClassLoader.getSystemResource("build/libs/groovy.jar");
+        URL groovyJarUrl = EspressoInlineExpressionParser.class.getClassLoader().getResource("build/libs/groovy.jar");
         ShardingSpherePreconditions.checkNotNull(groovyJarUrl, NullPointerException::new);
         JAVA_CLASSPATH = groovyJarUrl.getPath();
     }

diff --git a/.../espresso/src/main/java/org/apache/shardingsphere/infra/expr/espresso/ReflectContext.java b/.../espresso/src/main/java/org/apache/shardingsphere/infra/expr/espresso/ReflectContext.java
@@ -33,8 +33,9 @@ public final class ReflectContext implements AutoCloseable {
      * This method is a simulation of the following operation.
      * // CHECKSTYLE:OFF
      * <pre class="code">
-     * private final Context context = Context.newBuilder()
+     * private final Context context = Context.newBuilder("java")
      *             .allowAllAccess(true)
+     *             .allowValueSharing(false)
      *             .option("java.Classpath", JAVA_CLASSPATH)
      *             .build();
      * </pre>
@@ -48,10 +49,13 @@ public final class ReflectContext implements AutoCloseable {
     public ReflectContext(final String javaClassPath) {
         Object builderInstance = Class.forName(CONTEXT_CLASS_NAME)
                 .getMethod("newBuilder", String[].class)
-                .invoke(null, (Object) new String[0]);
+                .invoke(null, (Object) new String[]{"java"});
         builderInstance = builderInstance.getClass()
                 .getMethod("allowAllAccess", boolean.class)
                 .invoke(builderInstance, true);
+        builderInstance = builderInstance.getClass()
+                .getMethod("allowValueSharing", boolean.class)
+                .invoke(builderInstance, false);
         builderInstance = builderInstance.getClass()
                 .getMethod("option", String.class, String.class)
                 .invoke(builderInstance, "java.Classpath", javaClassPath);

diff --git a/...ava/org/apache/shardingsphere/infra/expr/espresso/EspressoInlineExpressionParserTest.java b/...ava/org/apache/shardingsphere/infra/expr/espresso/EspressoInlineExpressionParserTest.java
@@ -21,7 +21,6 @@
 import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.EnabledForJreRange;
-import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
 import org.junit.jupiter.api.condition.EnabledOnOs;
 import org.junit.jupiter.api.condition.JRE;
 import org.junit.jupiter.api.condition.OS;
@@ -35,10 +34,8 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
-@EnabledForJreRange(min = JRE.JAVA_21)
+@EnabledForJreRange(min = JRE.JAVA_22)
 @EnabledOnOs(value = OS.LINUX, disabledReason = "Refer to https://www.graalvm.org/jdk21/reference-manual/java-on-truffle/faq/#does-java-running-on-truffle-run-on-hotspot-too .")
-@EnabledIfSystemProperty(named = "java.vm.vendor", matches = "GraalVM",
-        disabledReason = "Executing unit tests of this type in batches will result in a timeout, while executing unit tests individually works fine.")
 class EspressoInlineExpressionParserTest {
 
     @Test

diff --git a/.../org.apache.shardingsphere/shardingsphere-infra-reachability-metadata/reflect-config.json b/.../org.apache.shardingsphere/shardingsphere-infra-reachability-metadata/reflect-config.json
diff --git a/pom.xml b/pom.xml
@@ -86,7 +86,7 @@
         <asm.version>9.3</asm.version>
         <groovy.version>4.0.19</groovy.version>
         <freemarker.version>2.3.31</freemarker.version>
-        <bytebuddy.version>1.14.8</bytebuddy.version>
+        <bytebuddy.version>1.14.13</bytebuddy.version>
 
         <jakarta.jakartaee-bom.version>8.0.0</jakarta.jakartaee-bom.version>
         <glassfish-jaxb.version>2.3.9</glassfish-jaxb.version>
@@ -133,14 +133,14 @@
         <opentelemetry.version>1.31.0</opentelemetry.version>
         <kotlin-stdlib.version>1.9.10</kotlin-stdlib.version>
 
-        <junit.version>5.10.0</junit.version>
+        <junit.version>5.10.2</junit.version>
         <hamcrest.version>2.2</hamcrest.version>
         <mockito.version>4.11.0</mockito.version>
         <awaitility.version>4.2.0</awaitility.version>
         <testcontainers.version>1.19.3</testcontainers.version>
         <commons-csv.version>1.9.0</commons-csv.version>
 
-        <graal-sdk.version>23.1.2</graal-sdk.version>
+        <graal-sdk.version>24.0.0</graal-sdk.version>
 
         <!-- 3rd party library plugin versions -->
         <protobuf-maven-plugin.version>0.6.1</protobuf-maven-plugin.version>

diff --git a/test/native/native-image-filter/extra-filter.json b/test/native/native-image-filter/extra-filter.json
@@ -5,7 +5,6 @@
     {"excludeClasses": "com.sun.crypto.provider.**"},
     {"excludeClasses": "com.sun.org.apache.xerces.internal.jaxp.**"},
     {"excludeClasses": "java.**"},
-    {"includeClasses": "java.lang.Boolean"},
     {"includeClasses": "java.util.Properties"},
     {"excludeClasses": "javax.security.auth.x500.**"},
     {"excludeClasses": "javax.smartcardio.**"},
@@ -17,8 +16,9 @@
 
     {"excludeClasses": "android.app.**"},
     {"excludeClasses": "com.arjuna.**"},
-    {"excludeClasses": "com.atomikos.logging.**"},
+    {"excludeClasses": "com.atomikos.**"},
     {"excludeClasses": "com.alibaba.druid.**"},
+    {"excludeClasses": "com.ctc.wstx.stax.**"},
     {"excludeClasses": "com.fasterxml.jackson.databind.**"},
     {"excludeClasses": "com.github.benmanes.caffeine.cache.**"},
     {"excludeClasses": "com.github.dockerjava.api.**"},
@@ -28,6 +28,7 @@
     {"excludeClasses": "com.mysql.cj.**"},
     {"excludeClasses": "com.zaxxer.hikari.**"},
     {"excludeClasses": "ch.qos.logback.classic.**"},
+    {"excludeClasses": "io.etcd.**"},
     {"excludeClasses": "io.grpc.**"},
     {"excludeClasses": "io.netty.**"},
     {"excludeClasses": "io.seata.**"},