This is an automated email from the ASF dual-hosted git repository. tkalkirill pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push: new 21d3698fb08 IGNITE-17758 Allow ConcurrentHashMap be marshalled on JDK 15+ (#10266) 21d3698fb08 is described below commit 21d3698fb0877a65fc8cd87635e71c761d0dcba2 Author: Roman Puchkovskiy <roman.puchkovs...@gmail.com> AuthorDate: Mon Sep 26 17:54:08 2022 +0400 IGNITE-17758 Allow ConcurrentHashMap be marshalled on JDK 15+ (#10266) --- bin/include/jvmdefaults.bat | 2 ++ bin/include/jvmdefaults.sh | 2 ++ docs/_docs/includes/java9.adoc | 2 ++ .../src/main/java/org/apache/ignite/internal/util/FeatureChecker.java | 2 ++ parent/pom.xml | 2 ++ 5 files changed, 10 insertions(+) diff --git a/bin/include/jvmdefaults.bat b/bin/include/jvmdefaults.bat index af9755f0ef7..e533e3be51c 100644 --- a/bin/include/jvmdefaults.bat +++ b/bin/include/jvmdefaults.bat @@ -66,6 +66,8 @@ if %java_version% GEQ 15 ( --add-opens=java.base/java.io=ALL-UNNAMED ^ --add-opens=java.base/java.nio=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.lang=ALL-UNNAMED ^ --add-opens=java.base/java.lang.invoke=ALL-UNNAMED ^ --add-opens=java.sql/java.sql=ALL-UNNAMED ^ diff --git a/bin/include/jvmdefaults.sh b/bin/include/jvmdefaults.sh index d984cc56f48..4f801a78297 100644 --- a/bin/include/jvmdefaults.sh +++ b/bin/include/jvmdefaults.sh @@ -63,6 +63,8 @@ getJavaSpecificOpts() { --add-opens=java.base/java.io=ALL-UNNAMED \ --add-opens=java.base/java.nio=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.lang=ALL-UNNAMED \ --add-opens=java.base/java.lang.invoke=ALL-UNNAMED \ --add-opens=java.sql/java.sql=ALL-UNNAMED \ diff --git a/docs/_docs/includes/java9.adoc b/docs/_docs/includes/java9.adoc index 8fc3ad9c01a..f636c6c3d57 100644 --- a/docs/_docs/includes/java9.adoc +++ b/docs/_docs/includes/java9.adoc @@ -50,6 +50,8 @@ tab:Java 17[] --add-opens=java.base/java.io=ALL-UNNAMED \ --add-opens=java.base/java.nio=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.lang=ALL-UNNAMED ---- -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/FeatureChecker.java b/modules/core/src/main/java/org/apache/ignite/internal/util/FeatureChecker.java index 27ed170b9cb..3a6775b6ec7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/FeatureChecker.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/FeatureChecker.java @@ -41,6 +41,8 @@ public class FeatureChecker { "--add-opens=java.base/java.io=ALL-UNNAMED\n" + "--add-opens=java.base/java.nio=ALL-UNNAMED\n" + "--add-opens=java.base/java.util=ALL-UNNAMED\n" + + "--add-opens=java.base/java.util.concurrent=ALL-UNNAMED\n" + + "--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED\n" + "--add-opens=java.base/java.lang=ALL-UNNAMED"; /** Java version specific warning to be added in case access failed */ diff --git a/parent/pom.xml b/parent/pom.xml index 468e5a91b16..5567ab60038 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1022,6 +1022,8 @@ --add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.base/java.nio=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.lang=ALL-UNNAMED --add-opens=java.base/java.lang.invoke=ALL-UNNAMED --add-opens=java.sql/java.sql=ALL-UNNAMED