Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Avoid using -proc:full when compiling ShardingSphere with OpenJDK23 #33681

Merged
merged 1 commit into from
Nov 16, 2024
Merged

Avoid using -proc:full when compiling ShardingSphere with OpenJDK23 #33681

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions RELEASE-NOTES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
28 changes: 9 additions & 19 deletions examples/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down
1 change: 0 additions & 1 deletion kernel/sql-federation/optimizer/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@

<properties>
<calcite.version>1.38.0</calcite.version>
<immutables.version>2.9.3</immutables.version>
</properties>

<dependencies>
Expand Down
45 changes: 15 additions & 30 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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 -->
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand Down