This is an automated email from the ASF dual-hosted git repository.
sunnianjun 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 c795d83f6eb Support for building with OpenJDK 21 (#28326)
c795d83f6eb is described below
commit c795d83f6ebc99d172f69750e37ae68781d7cf44
Author: Ling Hengqian <[email protected]>
AuthorDate: Sat Sep 23 21:14:02 2023 +0800
Support for building with OpenJDK 21 (#28326)
---
.github/workflows/nightly-ci.yml | 2 +-
agent/core/pom.xml | 1 +
agent/pom.xml | 9 ---------
pom.xml | 42 +++++++++++++++++++++++++++++-----------
4 files changed, 33 insertions(+), 21 deletions(-)
diff --git a/.github/workflows/nightly-ci.yml b/.github/workflows/nightly-ci.yml
index 75a6b7a4e2f..3945b115811 100644
--- 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, 20 ]
+ java-version: [ 11, 17, 21-ea ]
steps:
- name: Support Long Paths in Windows
if: matrix.os == 'windows-latest'
diff --git a/agent/core/pom.xml b/agent/core/pom.xml
index 014a57a65ea..79babf7258f 100644
--- a/agent/core/pom.xml
+++ b/agent/core/pom.xml
@@ -52,6 +52,7 @@
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
diff --git a/agent/pom.xml b/agent/pom.xml
index 7c8129d7bc4..47cfdac6a0e 100644
--- a/agent/pom.xml
+++ b/agent/pom.xml
@@ -33,17 +33,8 @@
<module>plugins</module>
</modules>
- <properties>
- <bytebuddy.version>1.14.4</bytebuddy.version>
- </properties>
-
<dependencyManagement>
<dependencies>
- <dependency>
- <groupId>net.bytebuddy</groupId>
- <artifactId>byte-buddy</artifactId>
- <version>${bytebuddy.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-test-util</artifactId>
diff --git a/pom.xml b/pom.xml
index c1a8677d656..bc500f923ff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,6 +72,7 @@
<transmittable-thread-local.version>2.14.2</transmittable-thread-local.version>
<antlr4.version>4.10.1</antlr4.version>
+ <bytebuddy.version>1.14.8</bytebuddy.version>
<snakeyaml.version>1.33</snakeyaml.version>
<gson.version>2.9.1</gson.version>
<jackson.version>2.14.0</jackson.version>
@@ -101,7 +102,7 @@
<slf4j.version>1.7.36</slf4j.version>
<logback.version>1.2.11</logback.version>
- <lombok.version>1.18.20</lombok.version>
+ <lombok.version>1.18.30</lombok.version>
<postgresql.version>42.4.1</postgresql.version>
<opengauss.version>3.1.0-og</opengauss.version>
@@ -127,15 +128,15 @@
<dockerfile-maven.version>1.4.13</dockerfile-maven.version>
<docker-compose-maven-plugin.version>4.0.0</docker-compose-maven-plugin.version>
<os-maven-plugin.version>1.6.2</os-maven-plugin.version>
- <native-maven-plugin.version>0.9.24</native-maven-plugin.version>
+ <native-maven-plugin.version>0.9.27</native-maven-plugin.version>
<!-- Compile plugin versions -->
<maven-enforcer-plugin.version>3.2.1</maven-enforcer-plugin.version>
<maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
<maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
- <maven-surefire-plugin.version>3.0.0</maven-surefire-plugin.version>
+ <maven-surefire-plugin.version>3.1.2</maven-surefire-plugin.version>
<maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
- <jandex-maven-plugin.version>3.0.5</jandex-maven-plugin.version>
+ <jandex-maven-plugin.version>3.1.3</jandex-maven-plugin.version>
<build-helper-maven-plugin.version>3.3.0</build-helper-maven-plugin.version>
<maven-dependency-plugin.version>3.5.0</maven-dependency-plugin.version>
<exec-maven-plugin.version>3.1.0</exec-maven-plugin.version>
@@ -570,20 +571,37 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <version>${mockito.version}</version>
+ <groupId>net.bytebuddy</groupId>
+ <artifactId>byte-buddy</artifactId>
+ <version>${bytebuddy.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.bytebuddy</groupId>
+ <artifactId>byte-buddy-agent</artifactId>
+ <version>${bytebuddy.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-inline</artifactId>
+ <artifactId>mockito-bom</artifactId>
<version>${mockito.version}</version>
- <scope>test</scope>
+ <type>pom</type>
+ <scope>import</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>net.bytebuddy</groupId>
+ <artifactId>byte-buddy</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>net.bytebuddy</groupId>
+ <artifactId>byte-buddy-agent</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-junit-jupiter</artifactId>
+ <artifactId>mockito-inline</artifactId>
<version>${mockito.version}</version>
<scope>test</scope>
</dependency>
@@ -667,14 +685,17 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-inline</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
@@ -1227,7 +1248,6 @@
<excludes>
<exclude>org.apache.shardingsphere.agent.core.**</exclude>
</excludes>
- <argLine>--add-opens
java.base/java.lang=ALL-UNNAMED --add-opens
java.base/java.lang.reflect=ALL-UNNAMED</argLine>
</configuration>
</plugin>
<plugin>
