Skip to content

Commit 10007da

Browse files
committed
Support building Example module with OpenJDK 23
1 parent 26c0cad commit 10007da

File tree

8 files changed

+26
-30
lines changed

8 files changed

+26
-30
lines changed

RELEASE-NOTES.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
1. Infra: Enable Safe Composition of Metadata for ShardingSphere Proxy Native - [#33179](https://github.com/apache/shardingsphere/pull/33179)
4545
1. Infra: Support compiling and using ShardingSphere under OpenJDK 23 - [#33025](https://github.com/apache/shardingsphere/pull/33025)
4646
1. Hive: Support Hive integration module to connect to HiveServer2 4.0.1 - [#33212](https://github.com/apache/shardingsphere/pull/33212)
47+
1. Infra: Support building Example module with OpenJDK 23
4748

4849
### Bug Fix
4950

docs/community/content/involved/contribute/dev-env.cn.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,15 @@ git config --global core.longpaths true
2323

2424
## 安装 JDK
2525

26-
使用 JDK 11 或以上版本。
26+
使用 JDK 11 或更晚发布的 JDK LTS 版本。对于非 LTS 版本的 JDK,仅支持 JDK 21 或更晚发布的 JDK 版本。
27+
28+
为了支持解析 `-proc:full` 的 JVM 参数,
29+
若贡献者使用 JDK 11,则应使用 JDK 11.0.23 或更晚发布的版本;
30+
若贡献者使用 JDK 17,则应使用 JDK 17.0.11 或更晚发布的版本。
2731

2832
可以从 [OpenJDK 下载页面]( https://adoptium.net/temurin/releases ) 下载。
2933

30-
可以根据自己的系统自行搜索 JDK 安装指南。
34+
可以根据自己的系统自行搜索 JDK 安装指南。贡献者可通过 `SDKMAN!` 管理本地的多个 JDK 实例。
3135

3236
## 安装 Maven
3337

docs/community/content/involved/contribute/dev-env.en.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,17 @@ git config --global core.longpaths true
2323

2424
## JDK Installation
2525

26-
Use JDK 11 or higher.
26+
Use JDK 11 or later JDK LTS releases.
27+
For non-LTS JDK releases, only JDK 21 or later JDK releases are supported.
28+
29+
To support parsing of the JVM argument to `-proc:full`,
30+
contributors using JDK 11 should use JDK 11.0.23 or later;
31+
Contributors using JDK 17 should use JDK 17.0.11 or later.
2732

2833
You could download JDK from [OpenJDK Downloads]( https://adoptium.net/temurin/releases ).
2934

3035
You could search JDK installation guide for your platform on Google.
36+
Contributors can manage multiple local JDK instances through `SDKMAN!`.
3137

3238
## Maven
3339

docs/document/content/user-manual/common-config/builtin-algorithm/expr.cn.md

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -90,19 +90,14 @@ Truffle 与 JDK 的向后兼容性矩阵位于 https://medium.com/graalvm/40027a
9090
<dependency>
9191
<groupId>org.graalvm.polyglot</groupId>
9292
<artifactId>polyglot</artifactId>
93-
<version>24.0.2</version>
93+
<version>24.1.0</version>
9494
</dependency>
9595
<dependency>
9696
<groupId>org.graalvm.polyglot</groupId>
97-
<artifactId>java-community</artifactId>
98-
<version>24.0.2</version>
97+
<artifactId>java</artifactId>
98+
<version>24.1.0</version>
9999
<type>pom</type>
100100
</dependency>
101-
<dependency>
102-
<groupId>org.graalvm.espresso</groupId>
103-
<artifactId>espresso-runtime-resources-linux-amd64</artifactId>
104-
<version>24.0.2</version>
105-
</dependency>
106101
</dependencies>
107102
```
108103

docs/document/content/user-manual/common-config/builtin-algorithm/expr.en.md

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -100,19 +100,14 @@ Truffle's backward compatibility matrix with the JDK is located at https://mediu
100100
<dependency>
101101
<groupId>org.graalvm.polyglot</groupId>
102102
<artifactId>polyglot</artifactId>
103-
<version>24.0.2</version>
103+
<version>24.1.0</version>
104104
</dependency>
105105
<dependency>
106106
<groupId>org.graalvm.polyglot</groupId>
107-
<artifactId>java-community</artifactId>
108-
<version>24.0.2</version>
107+
<artifactId>java</artifactId>
108+
<version>24.1.0</version>
109109
<type>pom</type>
110110
</dependency>
111-
<dependency>
112-
<groupId>org.graalvm.espresso</groupId>
113-
<artifactId>espresso-runtime-resources-linux-amd64</artifactId>
114-
<version>24.0.2</version>
115-
</dependency>
116111
</dependencies>
117112
```
118113

examples/pom.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
<maven.version.range>[3.0.4,)</maven.version.range>
3838
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3939
<project.build.locale>zh_CN</project.build.locale>
40+
<maven.compiler.proc>full</maven.compiler.proc>
4041
<aspectjweaver.version>1.8.9</aspectjweaver.version>
4142
<spring-framework.version>5.2.22.RELEASE</spring-framework.version>
4243
<spring-boot.version>2.3.12.RELEASE</spring-boot.version>
@@ -46,7 +47,7 @@
4647
<h2.version>2.2.224</h2.version>
4748
<slf4j.version>1.7.7</slf4j.version>
4849
<logback.version>1.2.13</logback.version>
49-
<lombok.version>1.18.30</lombok.version>
50+
<lombok.version>1.18.34</lombok.version>
5051
<mybatis.version>3.5.9</mybatis.version>
5152
<mybatis-spring.version>2.0.5</mybatis-spring.version>
5253
<mybatis-spring-boot.version>2.1.3</mybatis-spring-boot.version>
@@ -60,7 +61,7 @@
6061
<seata.version>1.6.1</seata.version>
6162

6263
<apache-rat-plugin.version>0.12</apache-rat-plugin.version>
63-
<maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
64+
<maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
6465
<maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
6566
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
6667
<freemarker.version>2.3.31</freemarker.version>

infra/expr/type/espresso/pom.xml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,17 +51,11 @@
5151
</dependency>
5252
<dependency>
5353
<groupId>org.graalvm.polyglot</groupId>
54-
<artifactId>java-community</artifactId>
54+
<artifactId>java</artifactId>
5555
<version>${graal-sdk.version}</version>
5656
<type>pom</type>
5757
<scope>test</scope>
5858
</dependency>
59-
<dependency>
60-
<groupId>org.graalvm.espresso</groupId>
61-
<artifactId>espresso-runtime-resources-linux-amd64</artifactId>
62-
<version>${graal-sdk.version}</version>
63-
<scope>test</scope>
64-
</dependency>
6559
</dependencies>
6660

6761
<build>

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
<maven.deploy.skip>false</maven.deploy.skip>
5757
<maven.javadoc.skip>true</maven.javadoc.skip>
5858
<maven.enforcer.fail>true</maven.enforcer.fail>
59+
<maven.compiler.proc>full</maven.compiler.proc>
5960
<shade.package>org.apache.shardingsphere.shade</shade.package>
6061
<antlr.output.directory>${basedir}/target/generated-sources/antlr4</antlr.output.directory>
6162

@@ -144,7 +145,7 @@
144145
<testcontainers.version>1.20.1</testcontainers.version>
145146
<commons-csv.version>1.9.0</commons-csv.version>
146147

147-
<graal-sdk.version>24.0.2</graal-sdk.version>
148+
<graal-sdk.version>24.1.0</graal-sdk.version>
148149
<jedis.version>4.4.6</jedis.version>
149150

150151
<!-- 3rd party library plugin versions -->
@@ -994,7 +995,6 @@
994995
</activation>
995996
<properties>
996997
<maven.compiler.release>8</maven.compiler.release>
997-
<maven.compiler.proc>full</maven.compiler.proc>
998998
</properties>
999999
<build>
10001000
<pluginManagement>

0 commit comments

Comments
 (0)