This is an automated email from the ASF dual-hosted git repository.
alexpl 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 0c3a20a8 IGNITE-24453 Move sources to JDK11 (#313)
0c3a20a8 is described below
commit 0c3a20a8ae9e30414f00afa201b5c63294236909
Author: Aleksandr Chesnokov <[email protected]>
AuthorDate: Thu Jul 31 17:18:22 2025 +0300
IGNITE-24453 Move sources to JDK11 (#313)
---
.github/workflows/prepare-rc.yml | 2 +-
.github/workflows/release-checker.yml | 2 +-
DEVNOTES.md | 2 +-
docs/README.adoc | 2 +-
modules/geospatial-ext/examples/README.md | 4 ++--
.../examples/pom-standalone-lgpl.xml | 4 ++--
modules/geospatial-ext/examples/pom-standalone.xml | 4 ++--
modules/hibernate-ext/examples/README.md | 4 ++--
.../hibernate-ext/examples/pom-standalone-lgpl.xml | 4 ++--
modules/hibernate-ext/examples/pom-standalone.xml | 4 ++--
.../ignite/mesos/resource/ResourceHandler.java | 6 +++---
.../bin/include/jvmdefaults.sh | 25 ++++------------------
parent-internal/pom.xml | 2 +-
pom.xml | 10 +--------
14 files changed, 25 insertions(+), 50 deletions(-)
diff --git a/.github/workflows/prepare-rc.yml b/.github/workflows/prepare-rc.yml
index bd48aa01..10ef6341 100644
--- a/.github/workflows/prepare-rc.yml
+++ b/.github/workflows/prepare-rc.yml
@@ -82,7 +82,7 @@ jobs:
- name: Set up Java
uses: actions/setup-java@v2
with:
- java-version: 8
+ java-version: 11
distribution: 'adopt'
- name: Extract POM Version and Compare With Branch Version
diff --git a/.github/workflows/release-checker.yml
b/.github/workflows/release-checker.yml
index 202109c9..b9fbddf1 100644
--- a/.github/workflows/release-checker.yml
+++ b/.github/workflows/release-checker.yml
@@ -74,7 +74,7 @@ jobs:
- name: Set up Java
uses: actions/setup-java@v2
with:
- java-version: 8
+ java-version: 11
distribution: 'adopt'
- name: Extract Branch POM Version and Compare
diff --git a/DEVNOTES.md b/DEVNOTES.md
index a9a886fa..2bf1bca6 100644
--- a/DEVNOTES.md
+++ b/DEVNOTES.md
@@ -6,7 +6,7 @@
### Build Requirements
-- JDK 8
+- JDK 11
- Maven 3.6.3+
### Compile and install all Extensions
diff --git a/docs/README.adoc b/docs/README.adoc
index a3ce9480..a3113a66 100644
--- a/docs/README.adoc
+++ b/docs/README.adoc
@@ -153,7 +153,7 @@ When referencing an external resource, make the link to
open in a new window by
[source, adoc]
----
-link:https://docs.oracle.com/javase/8/docs/technotes/guides/security/SunProviders.html#SunJSSE_Protocols[Supported
protocols,window=_blank]
+link:https://docs.oracle.com/en/java/javase/11/security/java-security-overview1.html#GUID-FCF419A7-B856-46DD-A36F-C6F88F9AF37F[Supported
protocols,window=_blank]
----
diff --git a/modules/geospatial-ext/examples/README.md
b/modules/geospatial-ext/examples/README.md
index 8d8a26be..06bfe63e 100644
--- a/modules/geospatial-ext/examples/README.md
+++ b/modules/geospatial-ext/examples/README.md
@@ -4,9 +4,9 @@ This module contains examples of how to run [Apache
Ignite](ignite.apache.org) a
Instructions on how to start examples can be found in [README.txt](README.txt).
-## Running examples on JDK 9/10/11
+## Running examples
-Ignite uses proprietary SDK APIs that are not available by default. See also
[How to run Ignite on JDK 9,10 and
11](https://ignite.apache.org/docs/latest/setup#running-ignite-with-java-11-or-later)
+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)
To set up local IDE to easier access to examples, it is possible to add
following options as default for all applications
diff --git a/modules/geospatial-ext/examples/pom-standalone-lgpl.xml
b/modules/geospatial-ext/examples/pom-standalone-lgpl.xml
index c4ebb3d3..2dfdd9e3 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>1.8</maven.compiler.source>
- <maven.compiler.target>1.8</maven.compiler.target>
+ <maven.compiler.source>11</maven.compiler.source>
+ <maven.compiler.target>11</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 21cb10c2..80db8d98 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>1.8</maven.compiler.source>
- <maven.compiler.target>1.8</maven.compiler.target>
+ <maven.compiler.source>11</maven.compiler.source>
+ <maven.compiler.target>11</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 8d8a26be..06bfe63e 100644
--- a/modules/hibernate-ext/examples/README.md
+++ b/modules/hibernate-ext/examples/README.md
@@ -4,9 +4,9 @@ This module contains examples of how to run [Apache
Ignite](ignite.apache.org) a
Instructions on how to start examples can be found in [README.txt](README.txt).
-## Running examples on JDK 9/10/11
+## Running examples
-Ignite uses proprietary SDK APIs that are not available by default. See also
[How to run Ignite on JDK 9,10 and
11](https://ignite.apache.org/docs/latest/setup#running-ignite-with-java-11-or-later)
+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)
To set up local IDE to easier access to examples, it is possible to add
following options as default for all applications
diff --git a/modules/hibernate-ext/examples/pom-standalone-lgpl.xml
b/modules/hibernate-ext/examples/pom-standalone-lgpl.xml
index a66092a4..dca190c8 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>1.8</maven.compiler.source>
- <maven.compiler.target>1.8</maven.compiler.target>
+ <maven.compiler.source>11</maven.compiler.source>
+ <maven.compiler.target>11</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 a037daec..c5a82052 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>1.8</maven.compiler.source>
- <maven.compiler.target>1.8</maven.compiler.target>
+ <maven.compiler.source>11</maven.compiler.source>
+ <maven.compiler.target>11</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git
a/modules/mesos-ext/src/main/java/org/apache/ignite/mesos/resource/ResourceHandler.java
b/modules/mesos-ext/src/main/java/org/apache/ignite/mesos/resource/ResourceHandler.java
index 8dd31944..a3fed296 100644
---
a/modules/mesos-ext/src/main/java/org/apache/ignite/mesos/resource/ResourceHandler.java
+++
b/modules/mesos-ext/src/main/java/org/apache/ignite/mesos/resource/ResourceHandler.java
@@ -23,9 +23,9 @@ import java.nio.channels.FileChannel;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.nio.file.StandardOpenOption;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.eclipse.jetty.server.HttpOutput;
import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.server.handler.AbstractHandler;
diff --git a/modules/performance-statistics-ext/bin/include/jvmdefaults.sh
b/modules/performance-statistics-ext/bin/include/jvmdefaults.sh
index 94c0cadf..ce5af3a0 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 1.8 or
later."
+ echo "Please point JAVA_HOME variable to location of JDK 11 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 8 ]; then
+ if [ $version -lt 11 ]; 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 1.8 or
later."
+ echo "Please point JAVA_HOME variable to installation of JDK 11 or
later."
echo "You can also download latest JDK at http://java.com/download"
exit 1
fi
@@ -79,24 +79,7 @@ getJavaSpecificOpts() {
current_value=$2
value=""
- if [ $version -eq 8 ] ; then
- value="\
- -XX:+AggressiveOpts \
- ${current_value}"
-
- elif [ $version -gt 8 ] && [ $version -lt 11 ]; then
- value="\
- -XX:+AggressiveOpts \
- --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 \
- --illegal-access=permit \
- --add-modules=java.xml.bind \
- ${current_value}"
-
- elif [ "${version}" -ge 11 ] && [ "${version}" -lt 14 ]; then
+ 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 \
diff --git a/parent-internal/pom.xml b/parent-internal/pom.xml
index 3ce44d71..9d55fd78 100644
--- a/parent-internal/pom.xml
+++ b/parent-internal/pom.xml
@@ -210,7 +210,7 @@
<jdk>[11,)</jdk>
</activation>
<properties>
- <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
</properties>
<build>
diff --git a/pom.xml b/pom.xml
index 7c3b68d8..11fa26d8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,6 +58,7 @@
<module>modules/osgi-ext</module>
<module>modules/ssh-ext</module>
<module>modules/ml-ext</module>
+ <module>modules/gatling-ext</module>
</modules>
<profiles>
@@ -67,15 +68,6 @@
<module>../ignite</module>
</modules>
</profile>
- <profile>
- <id>java-11+</id>
- <activation>
- <jdk>[11,)</jdk>
- </activation>
- <modules>
- <module>modules/gatling-ext</module>
- </modules>
- </profile>
<profile>
<id>java-17+</id>
<activation>