This is an automated email from the ASF dual-hosted git repository.
NSAmelchev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite-extensions.git
The following commit(s) were added to refs/heads/master by this push:
new bce7aeb9 IGNITE-29133 Finalize the migration of Ignite Extensions to
Java 17 (#363)
bce7aeb9 is described below
commit bce7aeb915abfe6493bb4b066b9d334dcb312eee
Author: Nikita Amelchev <[email protected]>
AuthorDate: Tue Oct 13 18:06:11 2026 +0300
IGNITE-29133 Finalize the migration of Ignite Extensions to Java 17 (#363)
---
DEVNOTES.md | 10 +-
modules/aop-ext/pom.xml | 9 +-
modules/azure-ext/pom.xml | 14 ---
modules/gatling-ext/pom.xml | 55 ++++++++---
modules/geospatial-ext/examples/README.md | 12 +--
.../examples/pom-standalone-lgpl.xml | 4 +-
modules/geospatial-ext/examples/pom-standalone.xml | 4 +-
modules/hibernate-ext/examples/README.md | 12 +--
.../hibernate-ext/examples/pom-standalone-lgpl.xml | 4 +-
modules/hibernate-ext/examples/pom-standalone.xml | 4 +-
.../bin/include/jvmdefaults.sh | 32 +-----
modules/spring-session-ext/pom.xml | 22 ++++-
.../ignite/spring/sessions}/package-info.java | 0
modules/spring-tx-ext/pom.xml | 3 -
modules/yardstick/bin/benchmark-bootstrap.bat | 14 ++-
modules/yardstick/bin/benchmark-bootstrap.sh | 23 ++---
modules/yardstick/bin/jfreechart-graph-gen.bat | 8 +-
modules/yardstick/bin/jfreechart-graph-gen.sh | 8 +-
modules/yardstick/pom-standalone.xml | 4 +-
parent-internal/pom.xml | 110 +++++++++------------
pom.xml | 22 ++---
21 files changed, 163 insertions(+), 211 deletions(-)
diff --git a/DEVNOTES.md b/DEVNOTES.md
index b3d47b49..c6720481 100644
--- a/DEVNOTES.md
+++ b/DEVNOTES.md
@@ -6,8 +6,8 @@
### Build Requirements
-- JDK 11
-- Maven 3.6.3+
+- JDK 17 or later
+- Maven 3.9.6+
### Compile and install all Extensions
@@ -128,11 +128,11 @@ as an action step. Use the step below to install Maven
into container:
```yaml
- name: Download Maven
run: |
- curl -sL
https://www-eu.apache.org/dist/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.zip
-o maven.zip
+ curl -sL
https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip
-o maven.zip
apt-get update
apt-get -y install unzip
unzip -d /usr/share maven.zip
rm maven.zip
- ln -s /usr/share/apache-maven-3.6.3/bin/mvn /usr/bin/mvn
- echo "M2_HOME=/usr/share/apache-maven-3.6.3" | tee -a /etc/environment
+ ln -s /usr/share/apache-maven-3.9.6/bin/mvn /usr/bin/mvn
+ echo "M2_HOME=/usr/share/apache-maven-3.9.6" | tee -a /etc/environment
```
diff --git a/modules/aop-ext/pom.xml b/modules/aop-ext/pom.xml
index 4cd955ab..9cb08de1 100644
--- a/modules/aop-ext/pom.xml
+++ b/modules/aop-ext/pom.xml
@@ -137,14 +137,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<reuseForks>false</reuseForks>
- <argLine>
- --add-opens java.base/java.nio=ALL-UNNAMED
- --add-opens
jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED
- --add-opens java.base/java.util=ALL-UNNAMED
- --add-opens java.base/java.lang=ALL-UNNAMED
- --add-opens java.base/java.io=ALL-UNNAMED
-
-javaagent:${basedir}/target/libs/aspectjweaver-${aspectj.version}.jar
- </argLine>
+ <argLine>${surefire.argLine}
-javaagent:${basedir}/target/libs/aspectjweaver-${aspectj.version}.jar</argLine>
<workingDirectory>${basedir}/target</workingDirectory>
</configuration>
</plugin>
diff --git a/modules/azure-ext/pom.xml b/modules/azure-ext/pom.xml
index 20ef0a94..4eb54d15 100644
--- a/modules/azure-ext/pom.xml
+++ b/modules/azure-ext/pom.xml
@@ -149,13 +149,6 @@
<version>${log4j2.version}</version>
</dependency>
- <!--
https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core -->
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- <version>${log4j2.version}</version>
- </dependency>
-
<!--
https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-slf4j-impl -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
@@ -177,13 +170,6 @@
<version>${netty.version}</version>
</dependency>
- <!-- https://mvnrepository.com/artifact/io.netty/netty-codec -->
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-codec-dns</artifactId>
- <version>${netty.version}</version>
- </dependency>
-
<!-- https://mvnrepository.com/artifact/io.netty/netty-codec-http2 -->
<dependency>
<groupId>io.netty</groupId>
diff --git a/modules/gatling-ext/pom.xml b/modules/gatling-ext/pom.xml
index dbecf511..810aa96d 100644
--- a/modules/gatling-ext/pom.xml
+++ b/modules/gatling-ext/pom.xml
@@ -104,22 +104,55 @@
<skip>true</skip>
</configuration>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>flatten-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>flatten</id>
- <inherited>false</inherited>
- <phase/>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>io.gatling</groupId>
<artifactId>gatling-maven-plugin</artifactId>
<version>${gatling-maven-plugin.version}</version>
<configuration>
+ <!-- The surefire.argLine of ignite-parent-ext-internal,
split into list items as the plugin requires. -->
+ <jvmArgs>
+
<jvmArg>--add-opens=java.base/jdk.internal.access=ALL-UNNAMED</jvmArg>
+
<jvmArg>--add-opens=java.base/jdk.internal.loader=ALL-UNNAMED</jvmArg>
+
<jvmArg>--add-opens=java.base/jdk.internal.misc=ALL-UNNAMED</jvmArg>
+
<jvmArg>--add-opens=java.base/sun.net.util=ALL-UNNAMED</jvmArg>
+
<jvmArg>--add-opens=java.base/sun.nio.ch=ALL-UNNAMED</jvmArg>
+
<jvmArg>--add-opens=java.base/sun.nio.fs=ALL-UNNAMED</jvmArg>
+
<jvmArg>--add-opens=java.base/sun.util.calendar=ALL-UNNAMED</jvmArg>
+
<jvmArg>--add-opens=java.management/com.sun.jmx.mbeanserver=ALL-UNNAMED</jvmArg>
+
<jvmArg>--add-opens=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED</jvmArg>
+
<jvmArg>--add-opens=java.base/sun.reflect.generics.reflectiveObjects=ALL-UNNAMED</jvmArg>
+
<jvmArg>--add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED</jvmArg>
+
<jvmArg>--add-opens=java.base/java.io=ALL-UNNAMED</jvmArg>
+
<jvmArg>--add-opens=java.base/java.nio=ALL-UNNAMED</jvmArg>
+
<jvmArg>--add-opens=java.base/java.net=ALL-UNNAMED</jvmArg>
+
<jvmArg>--add-opens=java.base/java.util=ALL-UNNAMED</jvmArg>
+
<jvmArg>--add-opens=java.base/java.util.concurrent=ALL-UNNAMED</jvmArg>
+
<jvmArg>--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED</jvmArg>
+
<jvmArg>--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED</jvmArg>
+
<jvmArg>--add-opens=java.base/java.lang=ALL-UNNAMED</jvmArg>
+
<jvmArg>--add-opens=java.base/java.lang.invoke=ALL-UNNAMED</jvmArg>
+
<jvmArg>--add-opens=java.base/java.math=ALL-UNNAMED</jvmArg>
+
<jvmArg>--add-opens=java.sql/java.sql=ALL-UNNAMED</jvmArg>
+
<jvmArg>--add-opens=java.base/java.lang.reflect=ALL-UNNAMED</jvmArg>
+
<jvmArg>--add-opens=java.base/java.time=ALL-UNNAMED</jvmArg>
+
<jvmArg>--add-opens=java.base/java.text=ALL-UNNAMED</jvmArg>
+
<jvmArg>--add-opens=java.base/java.security=ALL-UNNAMED</jvmArg>
+
<jvmArg>--add-opens=java.logging/java.util.logging=ALL-UNNAMED</jvmArg>
+
<jvmArg>--add-opens=java.management/sun.management=ALL-UNNAMED</jvmArg>
+
<jvmArg>--add-opens=java.desktop/java.awt.font=ALL-UNNAMED</jvmArg>
+
<jvmArg>--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED</jvmArg>
+
<jvmArg>--add-opens=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED</jvmArg>
+
<jvmArg>--add-opens=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED</jvmArg>
+
<jvmArg>--add-opens=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED</jvmArg>
+
<jvmArg>--add-opens=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED</jvmArg>
+
<jvmArg>--add-opens=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED</jvmArg>
+
<jvmArg>--add-opens=java.base/java.util.regex=ALL-UNNAMED</jvmArg>
+ <jvmArg>-Djava.security.manager=allow</jvmArg>
+
<jvmArg>--add-opens=java.base/jdk.internal.ref=ALL-UNNAMED</jvmArg>
+
<jvmArg>--add-opens=java.base/java.security.cert=ALL-UNNAMED</jvmArg>
+
<jvmArg>--add-opens=java.base/sun.security.ssl=ALL-UNNAMED</jvmArg>
+
<jvmArg>--add-opens=java.base/sun.security.x509=ALL-UNNAMED</jvmArg>
+ </jvmArgs>
<skip>true</skip>
</configuration>
</plugin>
diff --git a/modules/geospatial-ext/examples/README.md
b/modules/geospatial-ext/examples/README.md
index 06bfe63e..bd68cbda 100644
--- a/modules/geospatial-ext/examples/README.md
+++ b/modules/geospatial-ext/examples/README.md
@@ -6,17 +6,9 @@ Instructions on how to start examples can be found in
[README.txt](README.txt).
## Running examples
-Ignite uses proprietary SDK APIs that are not available by default. See also
[How to run
Ignite](https://ignite.apache.org/docs/latest/setup#running-ignite-with-java-11-or-later)
+These examples require JDK 17 or later. Ignite accesses JDK internals; see the
required JVM options in [How to run
Ignite](https://ignite.apache.org/docs/latest/setup#running-ignite-with-java-17-or-later).
-To set up local IDE to easier access to examples, it is possible to add
following options as default for all applications
-
-``--add-exports=java.base/jdk.internal.misc=ALL-UNNAMED
- --add-exports=java.base/sun.nio.ch=ALL-UNNAMED
- --add-exports=java.management/com.sun.jmx.mbeanserver=ALL-UNNAMED
- --add-exports=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED
- --add-exports=java.base/sun.reflect.generics.reflectiveObjects=ALL-UNNAMED
- --add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED
- --illegal-access=permit``
+To run examples from an IDE, add the JVM options listed there to your run
configuration.
For example, for IntelliJ IDEA it is possible to use Application Templates.
diff --git a/modules/geospatial-ext/examples/pom-standalone-lgpl.xml
b/modules/geospatial-ext/examples/pom-standalone-lgpl.xml
index 2dfdd9e3..1cee58f5 100644
--- a/modules/geospatial-ext/examples/pom-standalone-lgpl.xml
+++ b/modules/geospatial-ext/examples/pom-standalone-lgpl.xml
@@ -27,8 +27,8 @@
<modelVersion>4.0.0</modelVersion>
<properties>
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
+ <maven.compiler.source>17</maven.compiler.source>
+ <maven.compiler.target>17</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/modules/geospatial-ext/examples/pom-standalone.xml
b/modules/geospatial-ext/examples/pom-standalone.xml
index 80db8d98..af20b62b 100644
--- a/modules/geospatial-ext/examples/pom-standalone.xml
+++ b/modules/geospatial-ext/examples/pom-standalone.xml
@@ -24,8 +24,8 @@
<modelVersion>4.0.0</modelVersion>
<properties>
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
+ <maven.compiler.source>17</maven.compiler.source>
+ <maven.compiler.target>17</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/modules/hibernate-ext/examples/README.md
b/modules/hibernate-ext/examples/README.md
index 06bfe63e..bd68cbda 100644
--- a/modules/hibernate-ext/examples/README.md
+++ b/modules/hibernate-ext/examples/README.md
@@ -6,17 +6,9 @@ Instructions on how to start examples can be found in
[README.txt](README.txt).
## Running examples
-Ignite uses proprietary SDK APIs that are not available by default. See also
[How to run
Ignite](https://ignite.apache.org/docs/latest/setup#running-ignite-with-java-11-or-later)
+These examples require JDK 17 or later. Ignite accesses JDK internals; see the
required JVM options in [How to run
Ignite](https://ignite.apache.org/docs/latest/setup#running-ignite-with-java-17-or-later).
-To set up local IDE to easier access to examples, it is possible to add
following options as default for all applications
-
-``--add-exports=java.base/jdk.internal.misc=ALL-UNNAMED
- --add-exports=java.base/sun.nio.ch=ALL-UNNAMED
- --add-exports=java.management/com.sun.jmx.mbeanserver=ALL-UNNAMED
- --add-exports=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED
- --add-exports=java.base/sun.reflect.generics.reflectiveObjects=ALL-UNNAMED
- --add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED
- --illegal-access=permit``
+To run examples from an IDE, add the JVM options listed there to your run
configuration.
For example, for IntelliJ IDEA it is possible to use Application Templates.
diff --git a/modules/hibernate-ext/examples/pom-standalone-lgpl.xml
b/modules/hibernate-ext/examples/pom-standalone-lgpl.xml
index dca190c8..536d5e15 100644
--- a/modules/hibernate-ext/examples/pom-standalone-lgpl.xml
+++ b/modules/hibernate-ext/examples/pom-standalone-lgpl.xml
@@ -27,8 +27,8 @@
<modelVersion>4.0.0</modelVersion>
<properties>
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
+ <maven.compiler.source>17</maven.compiler.source>
+ <maven.compiler.target>17</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/modules/hibernate-ext/examples/pom-standalone.xml
b/modules/hibernate-ext/examples/pom-standalone.xml
index c5a82052..dd699274 100644
--- a/modules/hibernate-ext/examples/pom-standalone.xml
+++ b/modules/hibernate-ext/examples/pom-standalone.xml
@@ -24,8 +24,8 @@
<modelVersion>4.0.0</modelVersion>
<properties>
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
+ <maven.compiler.source>17</maven.compiler.source>
+ <maven.compiler.target>17</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/modules/performance-statistics-ext/bin/include/jvmdefaults.sh
b/modules/performance-statistics-ext/bin/include/jvmdefaults.sh
index ce5af3a0..00ac1d5f 100644
--- a/modules/performance-statistics-ext/bin/include/jvmdefaults.sh
+++ b/modules/performance-statistics-ext/bin/include/jvmdefaults.sh
@@ -46,7 +46,7 @@ checkJava() {
if [ $RETCODE -ne 0 ]; then
echo $0", ERROR:"
echo "JAVA_HOME environment variable is not found."
- echo "Please point JAVA_HOME variable to location of JDK 11 or
later."
+ echo "Please point JAVA_HOME variable to location of JDK 17 or
later."
echo "You can also download latest JDK at http://java.com/download"
exit 1
@@ -62,10 +62,10 @@ checkJava() {
#
javaMajorVersion "$JAVA"
- if [ $version -lt 11 ]; then
+ if [ $version -lt 17 ]; then
echo "$0, ERROR:"
echo "The $version version of JAVA installed in JAVA_HOME=$JAVA_HOME
is incompatible."
- echo "Please point JAVA_HOME variable to installation of JDK 11 or
later."
+ echo "Please point JAVA_HOME variable to installation of JDK 17 or
later."
echo "You can also download latest JDK at http://java.com/download"
exit 1
fi
@@ -79,30 +79,7 @@ getJavaSpecificOpts() {
current_value=$2
value=""
- if [ "${version}" -ge 11 ] && [ "${version}" -lt 14 ]; then
- value="\
- --add-exports=java.base/jdk.internal.misc=ALL-UNNAMED \
- --add-exports=java.base/sun.nio.ch=ALL-UNNAMED \
- --add-exports=java.management/com.sun.jmx.mbeanserver=ALL-UNNAMED \
- --add-exports=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED \
-
--add-exports=java.base/sun.reflect.generics.reflectiveObjects=ALL-UNNAMED \
- --add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED \
- --illegal-access=permit \
- ${current_value}"
-
- elif [ "${version}" -ge 14 ] && [ "${version}" -lt 15 ]; then
- value="\
- --add-exports=java.base/jdk.internal.misc=ALL-UNNAMED \
- --add-exports=java.base/sun.nio.ch=ALL-UNNAMED \
- --add-exports=java.management/com.sun.jmx.mbeanserver=ALL-UNNAMED \
- --add-exports=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED
\
-
--add-exports=java.base/sun.reflect.generics.reflectiveObjects=ALL-UNNAMED \
- --add-opens=java.base/jdk.internal.access=ALL-UNNAMED \
- --add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED
\
- --illegal-access=permit \
- ${current_value}"
-
- elif [ "${version}" -ge 15 ] ; then
+ if [ "${version}" -ge 17 ] ; then
value="\
--add-opens=java.base/jdk.internal.access=ALL-UNNAMED \
--add-opens=java.base/jdk.internal.misc=ALL-UNNAMED \
@@ -126,6 +103,7 @@ getJavaSpecificOpts() {
--add-opens=java.base/java.lang.reflect=ALL-UNNAMED \
--add-opens=java.base/java.time=ALL-UNNAMED \
--add-opens=java.base/java.text=ALL-UNNAMED \
+ --add-opens=java.logging/java.util.logging=ALL-UNNAMED \
--add-opens=java.management/sun.management=ALL-UNNAMED \
--add-opens=java.desktop/java.awt.font=ALL-UNNAMED \
${current_value}"
diff --git a/modules/spring-session-ext/pom.xml
b/modules/spring-session-ext/pom.xml
index 31c26a4e..72648c87 100644
--- a/modules/spring-session-ext/pom.xml
+++ b/modules/spring-session-ext/pom.xml
@@ -34,9 +34,6 @@
<url>https://ignite.apache.org</url>
<properties>
- <maven.compiler.source>17</maven.compiler.source>
- <maven.compiler.target>17</maven.compiler.target>
-
<spring.session.version>3.5.4</spring.session.version>
<spring.security.version>6.5.7</spring.security.version>
<jakarta.annotation.version>3.0.0</jakarta.annotation.version>
@@ -172,6 +169,25 @@
<skip>false</skip>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>properties</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <!-- Self-attach of Mockito deadlocks if the first mock is
created under the Spring class loader lock. -->
+ <argLine>${surefire.argLine}
-javaagent:${org.mockito:mockito-core:jar}</argLine>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
diff --git a/modules/spring-session-ext/src/main/java/package-info.java
b/modules/spring-session-ext/src/main/java/org/apache/ignite/spring/sessions/package-info.java
similarity index 100%
rename from modules/spring-session-ext/src/main/java/package-info.java
rename to
modules/spring-session-ext/src/main/java/org/apache/ignite/spring/sessions/package-info.java
diff --git a/modules/spring-tx-ext/pom.xml b/modules/spring-tx-ext/pom.xml
index a68c8269..106718ed 100644
--- a/modules/spring-tx-ext/pom.xml
+++ b/modules/spring-tx-ext/pom.xml
@@ -36,9 +36,6 @@
<url>https://ignite.apache.org</url>
<properties>
- <maven.compiler.source>17</maven.compiler.source>
- <maven.compiler.target>17</maven.compiler.target>
-
<xstream.version>1.4.8</xstream.version>
</properties>
diff --git a/modules/yardstick/bin/benchmark-bootstrap.bat
b/modules/yardstick/bin/benchmark-bootstrap.bat
index b00d8176..3f33334c 100644
--- a/modules/yardstick/bin/benchmark-bootstrap.bat
+++ b/modules/yardstick/bin/benchmark-bootstrap.bat
@@ -29,14 +29,14 @@ if not defined MAIN_CLASS (
if not defined JAVA_HOME (
echo ERROR: JAVA_HOME environment variable is not found.
- echo Please point JAVA_HOME variable to location of JDK 11 or later.
+ echo Please point JAVA_HOME variable to location of JDK 17 or later.
echo You can also download latest JDK at https://jdk.java.net
exit /b
)
if not exist "%JAVA_HOME%\bin\java.exe" (
echo ERROR: JAVA is not found in JAVA_HOME=%JAVA_HOME%.
- echo Please point JAVA_HOME variable to installation of JDK 11 or later.
+ echo Please point JAVA_HOME variable to installation of JDK 17 or later.
echo You can also download latest JDK at https://jdk.java.net
exit /b
)
@@ -50,9 +50,9 @@ for /f "delims=.-_+ tokens=1-2" %%v in ("%JAVA_VER_STR%") do (
if not defined MAJOR_JAVA_VER set MAJOR_JAVA_VER=0
-if %MAJOR_JAVA_VER% LSS 11 (
+if %MAJOR_JAVA_VER% LSS 17 (
echo ERROR: The version of JAVA installed in JAVA_HOME=%JAVA_HOME% is
incorrect.
- echo Please point JAVA_HOME variable to installation of JDK 11 or later.
+ echo Please point JAVA_HOME variable to installation of JDK 17 or later.
echo You can also download latest JDK at https://jdk.java.net
exit /b
)
@@ -69,11 +69,9 @@ set CP=%CP%;%SCRIPT_DIR%\..\libs\*
set JVM_OPTS=-server -Djava.net.preferIPv4Stack=true %JVM_OPTS%
::
-:: JDK specific options, required by Ignite for JDK 11 and later (see Ignite
bin\include\jvmdefaults.bat).
+:: JDK specific options, required by Ignite for JDK 17 and later (see Ignite
bin\include\jvmdefaults.bat).
::
-if %MAJOR_JAVA_VER% GEQ 11 if %MAJOR_JAVA_VER% LSS 15 set
JVM_OPTS=--add-exports=java.base/jdk.internal.misc=ALL-UNNAMED
--add-exports=java.base/sun.nio.ch=ALL-UNNAMED
--add-exports=java.management/com.sun.jmx.mbeanserver=ALL-UNNAMED
--add-exports=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED
--add-exports=java.base/sun.reflect.generics.reflectiveObjects=ALL-UNNAMED
--add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED
--illegal-access=permit %JVM_OPTS%
-
-if %MAJOR_JAVA_VER% GEQ 15 set
JVM_OPTS=--add-opens=java.base/jdk.internal.access=ALL-UNNAMED
--add-opens=java.base/jdk.internal.misc=ALL-UNNAMED
--add-opens=java.base/sun.nio.ch=ALL-UNNAMED
--add-opens=java.base/sun.util.calendar=ALL-UNNAMED
--add-opens=java.management/com.sun.jmx.mbeanserver=ALL-UNNAMED
--add-opens=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED
--add-opens=java.base/sun.reflect.generics.reflectiveObjects=ALL-UNNAMED
--add-opens=jdk.management/com.sun.management.i [...]
+if %MAJOR_JAVA_VER% GEQ 17 set
JVM_OPTS=--add-opens=java.base/jdk.internal.access=ALL-UNNAMED
--add-opens=java.base/jdk.internal.misc=ALL-UNNAMED
--add-opens=java.base/sun.nio.ch=ALL-UNNAMED
--add-opens=java.base/sun.util.calendar=ALL-UNNAMED
--add-opens=java.management/com.sun.jmx.mbeanserver=ALL-UNNAMED
--add-opens=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED
--add-opens=java.base/sun.reflect.generics.reflectiveObjects=ALL-UNNAMED
--add-opens=jdk.management/com.sun.management.i [...]
::
:: Assertions are disabled by default.
diff --git a/modules/yardstick/bin/benchmark-bootstrap.sh
b/modules/yardstick/bin/benchmark-bootstrap.sh
index 3f3217de..85593ad8 100755
--- a/modules/yardstick/bin/benchmark-bootstrap.sh
+++ b/modules/yardstick/bin/benchmark-bootstrap.sh
@@ -39,7 +39,7 @@ checkJava() {
if [ $RETCODE -ne 0 ]; then
echo "ERROR: JAVA_HOME environment variable is not found."
- echo "Please point JAVA_HOME variable to location of JDK 11 or
later."
+ echo "Please point JAVA_HOME variable to location of JDK 17 or
later."
echo "You can also download latest JDK at https://jdk.java.net"
exit 1
@@ -52,7 +52,7 @@ checkJava() {
if [ ! -e "$JAVA" ]; then
echo "ERROR: JAVA is not found in JAVA_HOME=$JAVA_HOME."
- echo "Please point JAVA_HOME variable to installation of JDK 11 or
later."
+ echo "Please point JAVA_HOME variable to installation of JDK 17 or
later."
echo "You can also download latest JDK at https://jdk.java.net"
exit 1
@@ -61,9 +61,9 @@ checkJava() {
JAVA_VER=`"$JAVA" -version 2>&1 | grep -i "version" | head -1 | sed -E
's/.*version "([^"]*)".*/\1/'`
JAVA_MAJOR_VER=`echo "$JAVA_VER" | awk -F '[.+_-]' '{ if ($1 == "1") print
$2; else print $1 }'`
- if [ -z "$JAVA_MAJOR_VER" ] || [ "$JAVA_MAJOR_VER" -lt 11 ] 2>/dev/null;
then
+ if [ -z "$JAVA_MAJOR_VER" ] || [ "$JAVA_MAJOR_VER" -lt 17 ] 2>/dev/null;
then
echo "ERROR: The version of JAVA installed in JAVA_HOME=$JAVA_HOME is
incorrect."
- echo "Please point JAVA_HOME variable to installation of JDK 11 or
later."
+ echo "Please point JAVA_HOME variable to installation of JDK 17 or
later."
echo "You can also download latest JDK at https://jdk.java.net"
exit 1
@@ -87,19 +87,9 @@ CP=${CP}":${SCRIPT_DIR}/../libs/*"
JVM_OPTS="-Xms2g -Xmx2g -server -Djava.net.preferIPv4Stack=true "${JVM_OPTS}
#
-# JDK specific options, required by Ignite for JDK 11 and later (see Ignite
bin/include/jvmdefaults.sh).
+# JDK specific options, required by Ignite for JDK 17 and later (see Ignite
bin/include/jvmdefaults.sh).
#
-if [ "${JAVA_MAJOR_VER}" -ge 11 ] && [ "${JAVA_MAJOR_VER}" -lt 15 ]; then
- JVM_OPTS="\
- --add-exports=java.base/jdk.internal.misc=ALL-UNNAMED \
- --add-exports=java.base/sun.nio.ch=ALL-UNNAMED \
- --add-exports=java.management/com.sun.jmx.mbeanserver=ALL-UNNAMED \
- --add-exports=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED \
-
--add-exports=java.base/sun.reflect.generics.reflectiveObjects=ALL-UNNAMED \
- --add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED \
- --illegal-access=permit \
- ${JVM_OPTS}"
-elif [ "${JAVA_MAJOR_VER}" -ge 15 ]; then
+if [ "${JAVA_MAJOR_VER}" -ge 17 ]; then
JVM_OPTS="\
--add-opens=java.base/jdk.internal.access=ALL-UNNAMED \
--add-opens=java.base/jdk.internal.misc=ALL-UNNAMED \
@@ -123,6 +113,7 @@ elif [ "${JAVA_MAJOR_VER}" -ge 15 ]; then
--add-opens=java.base/java.lang.reflect=ALL-UNNAMED \
--add-opens=java.base/java.time=ALL-UNNAMED \
--add-opens=java.base/java.text=ALL-UNNAMED \
+ --add-opens=java.logging/java.util.logging=ALL-UNNAMED \
--add-opens=java.management/sun.management=ALL-UNNAMED \
--add-opens=java.desktop/java.awt.font=ALL-UNNAMED \
${JVM_OPTS}"
diff --git a/modules/yardstick/bin/jfreechart-graph-gen.bat
b/modules/yardstick/bin/jfreechart-graph-gen.bat
index 8d604722..9d9864f3 100644
--- a/modules/yardstick/bin/jfreechart-graph-gen.bat
+++ b/modules/yardstick/bin/jfreechart-graph-gen.bat
@@ -21,14 +21,14 @@ set SCRIPT_DIR=%SCRIPT_DIR:~0,-1%
if not defined JAVA_HOME (
echo ERROR: JAVA_HOME environment variable is not found.
- echo Please point JAVA_HOME variable to location of JDK 8 or later.
+ echo Please point JAVA_HOME variable to location of JDK 17 or later.
echo You can also download latest JDK at https://jdk.java.net
exit /b
)
if not exist "%JAVA_HOME%\bin\java.exe" (
echo ERROR: JAVA is not found in JAVA_HOME=%JAVA_HOME%.
- echo Please point JAVA_HOME variable to installation of JDK 8 or later.
+ echo Please point JAVA_HOME variable to installation of JDK 17 or later.
echo You can also download latest JDK at https://jdk.java.net
exit /b
)
@@ -42,9 +42,9 @@ for /f "delims=.-_+ tokens=1-2" %%v in ("%JAVA_VER_STR%") do (
if not defined MAJOR_JAVA_VER set MAJOR_JAVA_VER=0
-if %MAJOR_JAVA_VER% LSS 8 (
+if %MAJOR_JAVA_VER% LSS 17 (
echo ERROR: The version of JAVA installed in JAVA_HOME=%JAVA_HOME% is
incorrect.
- echo Please point JAVA_HOME variable to installation of JDK 8 or later.
+ echo Please point JAVA_HOME variable to installation of JDK 17 or later.
echo You can also download latest JDK at https://jdk.java.net
exit /b
)
diff --git a/modules/yardstick/bin/jfreechart-graph-gen.sh
b/modules/yardstick/bin/jfreechart-graph-gen.sh
index fe2b7a5a..9599eec8 100755
--- a/modules/yardstick/bin/jfreechart-graph-gen.sh
+++ b/modules/yardstick/bin/jfreechart-graph-gen.sh
@@ -29,7 +29,7 @@ checkJava() {
if [ $RETCODE -ne 0 ]; then
echo "ERROR: JAVA_HOME environment variable is not found."
- echo "Please point JAVA_HOME variable to location of JDK 8 or
later."
+ echo "Please point JAVA_HOME variable to location of JDK 17 or
later."
echo "You can also download latest JDK at https://jdk.java.net"
exit 1
@@ -42,7 +42,7 @@ checkJava() {
if [ ! -e "$JAVA" ]; then
echo "ERROR: JAVA is not found in JAVA_HOME=$JAVA_HOME."
- echo "Please point JAVA_HOME variable to installation of JDK 8 or
later."
+ echo "Please point JAVA_HOME variable to installation of JDK 17 or
later."
echo "You can also download latest JDK at https://jdk.java.net"
exit 1
@@ -51,9 +51,9 @@ checkJava() {
JAVA_VER=`"$JAVA" -version 2>&1 | grep -i "version" | head -1 | sed -E
's/.*version "([^"]*)".*/\1/'`
JAVA_MAJOR_VER=`echo "$JAVA_VER" | awk -F '[.+_-]' '{ if ($1 == "1") print
$2; else print $1 }'`
- if [ -z "$JAVA_MAJOR_VER" ] || [ "$JAVA_MAJOR_VER" -lt 8 ] 2>/dev/null;
then
+ if [ -z "$JAVA_MAJOR_VER" ] || [ "$JAVA_MAJOR_VER" -lt 17 ] 2>/dev/null;
then
echo "ERROR: The version of JAVA installed in JAVA_HOME=$JAVA_HOME is
incorrect."
- echo "Please point JAVA_HOME variable to installation of JDK 8 or
later."
+ echo "Please point JAVA_HOME variable to installation of JDK 17 or
later."
echo "You can also download latest JDK at https://jdk.java.net"
exit 1
diff --git a/modules/yardstick/pom-standalone.xml
b/modules/yardstick/pom-standalone.xml
index 828444e9..724ade4d 100644
--- a/modules/yardstick/pom-standalone.xml
+++ b/modules/yardstick/pom-standalone.xml
@@ -122,8 +122,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
- <source>1.7</source>
- <target>1.7</target>
+ <source>17</source>
+ <target>17</target>
</configuration>
</plugin>
diff --git a/parent-internal/pom.xml b/parent-internal/pom.xml
index 80931b65..c89ffa0e 100644
--- a/parent-internal/pom.xml
+++ b/parent-internal/pom.xml
@@ -44,6 +44,51 @@
<commons.lang3.version>3.20.0</commons.lang3.version>
<jakarta.transaction-api.version>2.0.1</jakarta.transaction-api.version>
+ <!-- The surefire argLine of ignite-parent plus the opens required by
extension tests. -->
+ <surefire.argLine>
+ --add-opens=java.base/jdk.internal.access=ALL-UNNAMED
+ --add-opens=java.base/jdk.internal.loader=ALL-UNNAMED
+ --add-opens=java.base/jdk.internal.misc=ALL-UNNAMED
+ --add-opens=java.base/sun.net.util=ALL-UNNAMED
+ --add-opens=java.base/sun.nio.ch=ALL-UNNAMED
+ --add-opens=java.base/sun.nio.fs=ALL-UNNAMED
+ --add-opens=java.base/sun.util.calendar=ALL-UNNAMED
+ --add-opens=java.management/com.sun.jmx.mbeanserver=ALL-UNNAMED
+ --add-opens=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED
+
--add-opens=java.base/sun.reflect.generics.reflectiveObjects=ALL-UNNAMED
+ --add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED
+ --add-opens=java.base/java.io=ALL-UNNAMED
+ --add-opens=java.base/java.nio=ALL-UNNAMED
+ --add-opens=java.base/java.net=ALL-UNNAMED
+ --add-opens=java.base/java.util=ALL-UNNAMED
+ --add-opens=java.base/java.util.concurrent=ALL-UNNAMED
+ --add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED
+ --add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED
+ --add-opens=java.base/java.lang=ALL-UNNAMED
+ --add-opens=java.base/java.lang.invoke=ALL-UNNAMED
+ --add-opens=java.base/java.math=ALL-UNNAMED
+ --add-opens=java.sql/java.sql=ALL-UNNAMED
+ --add-opens=java.base/java.lang.reflect=ALL-UNNAMED
+ --add-opens=java.base/java.time=ALL-UNNAMED
+ --add-opens=java.base/java.text=ALL-UNNAMED
+ --add-opens=java.base/java.security=ALL-UNNAMED
+ --add-opens=java.logging/java.util.logging=ALL-UNNAMED
+ --add-opens=java.management/sun.management=ALL-UNNAMED
+ --add-opens=java.desktop/java.awt.font=ALL-UNNAMED
+ --add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED
+ --add-opens=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED
+ --add-opens=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
+ --add-opens=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED
+ --add-opens=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED
+ --add-opens=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED
+ --add-opens=java.base/java.util.regex=ALL-UNNAMED
+ -Djava.security.manager=allow
+ --add-opens=java.base/jdk.internal.ref=ALL-UNNAMED
+ --add-opens=java.base/java.security.cert=ALL-UNNAMED
+ --add-opens=java.base/sun.security.ssl=ALL-UNNAMED
+ --add-opens=java.base/sun.security.x509=ALL-UNNAMED
+ </surefire.argLine>
+
<!--
NOTE: The dependency versions below must be changed in the release
branch up to
the latest released version prior to an extension release.
@@ -152,70 +197,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<forkCount>1</forkCount>
- <argLine>
- --add-opens=java.base/jdk.internal.access=ALL-UNNAMED
- --add-opens=java.base/jdk.internal.misc=ALL-UNNAMED
- --add-opens=java.base/jdk.internal.ref=ALL-UNNAMED
- --add-opens=java.base/jdk.internal.loader=ALL-UNNAMED
- --add-opens=java.base/sun.nio.ch=ALL-UNNAMED
-
--add-opens=java.management/com.sun.jmx.mbeanserver=ALL-UNNAMED
-
--add-opens=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED
-
--add-opens=java.base/sun.reflect.generics.reflectiveObjects=ALL-UNNAMED
-
--add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED
- --add-opens=java.base/java.io=ALL-UNNAMED
- --add-opens=java.base/java.net=ALL-UNNAMED
- --add-opens=java.base/java.nio=ALL-UNNAMED
- --add-opens=java.base/java.security.cert=ALL-UNNAMED
- --add-opens=java.base/java.util=ALL-UNNAMED
- --add-opens=java.base/java.util.concurrent=ALL-UNNAMED
-
--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED
-
--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED
- --add-opens=java.base/java.lang=ALL-UNNAMED
- --add-opens=java.base/java.lang.invoke=ALL-UNNAMED
- --add-opens=java.base/java.time=ALL-UNNAMED
- --add-opens=java.base/sun.security.ssl=ALL-UNNAMED
- --add-opens=java.base/sun.security.x509=ALL-UNNAMED
- --add-opens=java.base/sun.net.util=ALL-UNNAMED
- --add-opens=java.sql/java.sql=ALL-UNNAMED
- --add-opens=java.base/java.lang.reflect=ALL-UNNAMED
- --add-opens=java.base/java.text=ALL-UNNAMED
- --add-opens=java.desktop/java.awt.font=ALL-UNNAMED
- </argLine>
- </configuration>
- </plugin>
- <plugin>
- <groupId>io.gatling</groupId>
- <artifactId>gatling-maven-plugin</artifactId>
- <configuration>
- <jvmArgs>
-
<jvmArg>--add-opens=java.base/jdk.internal.access=ALL-UNNAMED</jvmArg>
-
<jvmArg>--add-opens=java.base/jdk.internal.misc=ALL-UNNAMED</jvmArg>
-
<jvmArg>--add-opens=java.base/jdk.internal.ref=ALL-UNNAMED</jvmArg>
-
<jvmArg>--add-opens=java.base/jdk.internal.loader=ALL-UNNAMED</jvmArg>
-
<jvmArg>--add-opens=java.base/sun.nio.ch=ALL-UNNAMED</jvmArg>
-
<jvmArg>--add-opens=java.management/com.sun.jmx.mbeanserver=ALL-UNNAMED</jvmArg>
-
<jvmArg>--add-opens=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED</jvmArg>
-
<jvmArg>--add-opens=java.base/sun.reflect.generics.reflectiveObjects=ALL-UNNAMED</jvmArg>
-
<jvmArg>--add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED</jvmArg>
-
<jvmArg>--add-opens=java.base/java.io=ALL-UNNAMED</jvmArg>
-
<jvmArg>--add-opens=java.base/java.net=ALL-UNNAMED</jvmArg>
-
<jvmArg>--add-opens=java.base/java.nio=ALL-UNNAMED</jvmArg>
-
<jvmArg>--add-opens=java.base/java.security.cert=ALL-UNNAMED</jvmArg>
-
<jvmArg>--add-opens=java.base/java.util=ALL-UNNAMED</jvmArg>
-
<jvmArg>--add-opens=java.base/java.util.concurrent=ALL-UNNAMED</jvmArg>
-
<jvmArg>--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED</jvmArg>
-
<jvmArg>--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED</jvmArg>
-
<jvmArg>--add-opens=java.base/java.lang=ALL-UNNAMED</jvmArg>
-
<jvmArg>--add-opens=java.base/java.lang.invoke=ALL-UNNAMED</jvmArg>
-
<jvmArg>--add-opens=java.base/java.time=ALL-UNNAMED</jvmArg>
-
<jvmArg>--add-opens=java.base/sun.security.ssl=ALL-UNNAMED</jvmArg>
-
<jvmArg>--add-opens=java.base/sun.security.x509=ALL-UNNAMED</jvmArg>
-
<jvmArg>--add-opens=java.base/sun.net.util=ALL-UNNAMED</jvmArg>
-
<jvmArg>--add-opens=java.sql/java.sql=ALL-UNNAMED</jvmArg>
-
<jvmArg>--add-opens=java.base/java.lang.reflect=ALL-UNNAMED</jvmArg>
-
<jvmArg>--add-opens=java.base/java.text=ALL-UNNAMED</jvmArg>
-
<jvmArg>--add-opens=java.desktop/java.awt.font=ALL-UNNAMED</jvmArg>
- </jvmArgs>
+ <argLine>${surefire.argLine}</argLine>
</configuration>
</plugin>
</plugins>
diff --git a/pom.xml b/pom.xml
index 4b1be708..5bb32479 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,6 +60,12 @@
<module>modules/ml-ext</module>
<module>modules/gatling-ext</module>
<module>modules/yardstick</module>
+ <module>modules/spring-boot-autoconfigure-ext</module>
+ <module>modules/spring-boot-thin-client-autoconfigure-ext</module>
+ <module>modules/spring-session-ext</module>
+ <module>modules/spring-cache-ext</module>
+ <module>modules/spring-data-ext</module>
+ <module>modules/spring-tx-ext</module>
</modules>
<profiles>
@@ -69,20 +75,6 @@
<module>../ignite</module>
</modules>
</profile>
- <profile>
- <id>java-17+</id>
- <activation>
- <jdk>[17,)</jdk>
- </activation>
- <modules>
- <module>modules/spring-boot-autoconfigure-ext</module>
-
<module>modules/spring-boot-thin-client-autoconfigure-ext</module>
- <module>modules/spring-session-ext</module>
- <module>modules/spring-cache-ext</module>
- <module>modules/spring-data-ext</module>
- <module>modules/spring-tx-ext</module>
- </modules>
- </profile>
</profiles>
<build>
@@ -90,6 +82,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
+ <version>3.5.0</version>
<executions>
<execution>
<phase>clean</phase>
@@ -109,6 +102,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
+ <version>3.1.4</version>
<configuration>
<skip>true</skip>
</configuration>