This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang 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 820dc6fac0c Avoid using `-proc:full` when compiling ShardingSphere
with OpenJDK23 (#33681)
820dc6fac0c is described below
commit 820dc6fac0cfca05a8236897a1a5f850f2566bea
Author: Ling Hengqian <[email protected]>
AuthorDate: Sat Nov 16 09:38:41 2024 +0800
Avoid using `-proc:full` when compiling ShardingSphere with OpenJDK23
(#33681)
---
RELEASE-NOTES.md | 1 +
examples/pom.xml | 28 +++++++-------------
kernel/sql-federation/optimizer/pom.xml | 1 -
pom.xml | 45 +++++++++++----------------------
4 files changed, 25 insertions(+), 50 deletions(-)
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 91810c11ebb..6fb9cb8bc9c 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -17,6 +17,7 @@
1. SQL Parser: Support parsing Doris STRRIGHT -
[#33393](https://github.com/apache/shardingsphere/pull/33393)
1. JDBC: Add show database name for JDBC when execute SHOW COMPUTE NODES -
[#33437](https://github.com/apache/shardingsphere/pull/33437)
1. Kernel: Add binding to owner table -
[#33533](https://github.com/apache/shardingsphere/pull/33533)
+1. Build: Avoid using `-proc:full` when compiling ShardingSphere with
OpenJDK23 - [#33681](https://github.com/apache/shardingsphere/pull/33681)
### Bug Fixes
diff --git a/examples/pom.xml b/examples/pom.xml
index 64762c0dbd1..85e522eeb64 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -46,7 +46,7 @@
<h2.version>2.2.224</h2.version>
<slf4j.version>1.7.7</slf4j.version>
<logback.version>1.2.13</logback.version>
- <lombok.version>1.18.34</lombok.version>
+ <lombok.version>1.18.36</lombok.version>
<mybatis.version>3.5.9</mybatis.version>
<mybatis-spring.version>2.0.5</mybatis-spring.version>
<mybatis-spring-boot.version>2.1.3</mybatis-spring-boot.version>
@@ -340,7 +340,7 @@
<profile>
<id>jdk11-22</id>
<activation>
- <jdk>[11,23)</jdk>
+ <jdk>[11,)</jdk>
</activation>
<properties>
<annotation-api.version>1.3.2</annotation-api.version>
@@ -353,23 +353,6 @@
</dependency>
</dependencies>
</profile>
- <profile>
- <id>jdk23+</id>
- <activation>
- <jdk>[23,)</jdk>
- </activation>
- <properties>
- <annotation-api.version>1.3.2</annotation-api.version>
- <maven.compiler.proc>full</maven.compiler.proc>
- </properties>
- <dependencies>
- <dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
- <version>${annotation-api.version}</version>
- </dependency>
- </dependencies>
- </profile>
</profiles>
<build>
@@ -381,6 +364,13 @@
<target>${java.version}</target>
<testSource>${java.version}</testSource>
<testTarget>${java.version}</testTarget>
+ <annotationProcessorPaths>
+ <path>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <version>${lombok.version}</version>
+ </path>
+ </annotationProcessorPaths>
</configuration>
<version>${maven-compiler-plugin.version}</version>
</plugin>
diff --git a/kernel/sql-federation/optimizer/pom.xml
b/kernel/sql-federation/optimizer/pom.xml
index 54b80054883..d73cbdc1236 100644
--- a/kernel/sql-federation/optimizer/pom.xml
+++ b/kernel/sql-federation/optimizer/pom.xml
@@ -28,7 +28,6 @@
<properties>
<calcite.version>1.38.0</calcite.version>
- <immutables.version>2.9.3</immutables.version>
</properties>
<dependencies>
diff --git a/pom.xml b/pom.xml
index f79fb30a17a..6fc13b629b5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -116,7 +116,8 @@
<logback.version>1.2.13</logback.version>
<commons-logging.version>1.2</commons-logging.version>
- <lombok.version>1.18.34</lombok.version>
+ <lombok.version>1.18.36</lombok.version>
+ <immutables.version>2.9.3</immutables.version>
<postgresql.version>42.7.2</postgresql.version>
<mysql-connector-java.version>8.3.0</mysql-connector-java.version>
@@ -692,6 +693,18 @@
<target>${java.version}</target>
<testSource>${java.version}</testSource>
<testTarget>${java.version}</testTarget>
+ <annotationProcessorPaths>
+ <path>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <version>${lombok.version}</version>
+ </path>
+ <path>
+ <groupId>org.immutables</groupId>
+ <artifactId>value</artifactId>
+ <version>${immutables.version}</version>
+ </path>
+ </annotationProcessorPaths>
</configuration>
</plugin>
<!-- TODO nianjun should remove after test container is used
in agent e2e -->
@@ -990,7 +1003,7 @@
<profile>
<id>jdk11-22</id>
<activation>
- <jdk>[11,23)</jdk>
+ <jdk>[11,)</jdk>
</activation>
<properties>
<maven.compiler.release>8</maven.compiler.release>
@@ -1014,34 +1027,6 @@
</pluginManagement>
</build>
</profile>
- <profile>
- <id>jdk23+</id>
- <activation>
- <jdk>[23,)</jdk>
- </activation>
- <properties>
- <maven.compiler.release>8</maven.compiler.release>
- <maven.compiler.proc>full</maven.compiler.proc>
- </properties>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>--add-opens
java.base/java.lang=ALL-UNNAMED --add-opens
java.base/java.lang.reflect=ALL-UNNAMED --add-opens
java.base/sun.net=ALL-UNNAMED --add-opens
java.base/java.net=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-failsafe-plugin</artifactId>
- <configuration>
- <argLine>--add-opens
java.base/java.lang=ALL-UNNAMED --add-opens
java.base/java.lang.reflect=ALL-UNNAMED --add-opens
java.base/sun.net=ALL-UNNAMED --add-opens
java.base/java.net=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- </profile>
<profile>
<id>generateMetadata</id>
<build>
