[shardingsphere] branch master updated: Supports compilation through OpenJDK 20 and its downstream distributions (#25181)

[zh...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

zhangliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git


The following commit(s) were added to refs/heads/master by this push:
     new 1e07882ce8b Supports compilation through OpenJDK 20 and its downstream distributions (#25181)
1e07882ce8b is described below

commit 1e07882ce8b7f92f73d07471657170d13e06fb53
Author: Ling Hengqian <li...@outlook.com>
AuthorDate: Sun Apr 16 22:26:21 2023 +0800

    Supports compilation through OpenJDK 20 and its downstream distributions (#25181)
---
 .github/workflows/ci.yml                                               | 2 +-
 .github/workflows/nightly-ci.yml                                       | 2 +-
 .../org/apache/shardingsphere/agent/core/builder/AgentTransformer.java | 3 ++-
 agent/pom.xml                                                          | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f9b17cd559c..3fc296c953c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -87,7 +87,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java-version: [ 11, 19 ]
+        java-version: [ 11, 20 ]
     steps:
       - uses: actions/checkout@v3
       - name: Cache Maven Repos
diff --git a/.github/workflows/nightly-ci.yml b/.github/workflows/nightly-ci.yml
index 2cb0b6a6e08..165f208802b 100644
--- a/.github/workflows/nightly-ci.yml
+++ b/.github/workflows/nightly-ci.yml
@@ -37,7 +37,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ ubuntu-latest, macos-latest, windows-latest ]
-        java-version: [ 11, 17, 19 ]
+        java-version: [ 11, 17, 20 ]
     steps:
       - name: Support long paths in Windows
         if: matrix.os == 'windows-latest'
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/builder/AgentTransformer.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/builder/AgentTransformer.java
index c9932e2c4e4..04490481a10 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/builder/AgentTransformer.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/builder/AgentTransformer.java
@@ -37,6 +37,7 @@ import org.apache.shardingsphere.agent.core.plugin.PluginLifecycleServiceManager
 import org.apache.shardingsphere.agent.core.plugin.classloader.AgentPluginClassLoader;
 import org.apache.shardingsphere.agent.core.plugin.classloader.ClassLoaderContext;
 
+import java.security.ProtectionDomain;
 import java.util.Collection;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
@@ -62,7 +63,7 @@ public final class AgentTransformer implements Transformer {
     
     @SuppressWarnings("NullableProblems")
     @Override
-    public Builder<?> transform(final Builder<?> builder, final TypeDescription typeDescription, final ClassLoader classLoader, final JavaModule module) {
+    public Builder<?> transform(final Builder<?> builder, final TypeDescription typeDescription, final ClassLoader classLoader, final JavaModule module, final ProtectionDomain protectionDomain) {
         if (!advisorConfigs.containsKey(typeDescription.getTypeName())) {
             return builder;
         }
diff --git a/agent/pom.xml b/agent/pom.xml
index a8d8f946ebf..7d8dc4a4c2c 100644
--- a/agent/pom.xml
+++ b/agent/pom.xml
@@ -35,7 +35,7 @@
     </modules>
     
     <properties>
-        <bytebuddy.version>1.12.12</bytebuddy.version>
+        <bytebuddy.version>1.14.4</bytebuddy.version>
     </properties>
     
     <dependencyManagement>