You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jb...@apache.org on 2021/04/21 05:10:57 UTC

[activemq] branch activemq-5.16.x updated: AMQ-8220 add add-opens options for Java 16

This is an automated email from the ASF dual-hosted git repository.

jbonofre pushed a commit to branch activemq-5.16.x
in repository https://gitbox.apache.org/repos/asf/activemq.git


The following commit(s) were added to refs/heads/activemq-5.16.x by this push:
     new c6838aa  AMQ-8220 add add-opens options for Java 16
c6838aa is described below

commit c6838aa45191a2bf18789ca31aeb2247e94e2148
Author: Jonathan Gallimore <jo...@jrg.me.uk>
AuthorDate: Tue Apr 20 19:52:24 2021 +0100

    AMQ-8220 add add-opens options for Java 16
    
    (cherry picked from commit d1c48abaca86a896e6064c1f2fcd468b20afab73)
---
 assembly/src/release/bin/activemq           | 6 ++++++
 assembly/src/release/bin/win32/wrapper.conf | 2 +-
 assembly/src/release/bin/win64/wrapper.conf | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/assembly/src/release/bin/activemq b/assembly/src/release/bin/activemq
index 07af279..145844c 100755
--- a/assembly/src/release/bin/activemq
+++ b/assembly/src/release/bin/activemq
@@ -349,6 +349,8 @@ invokeJar(){
               --add-opens java.base/java.util=ALL-UNNAMED \
               --add-opens java.naming/javax.naming.spi=ALL-UNNAMED \
               --add-opens java.rmi/sun.rmi.transport.tcp=ALL-UNNAMED \
+              --add-opens java.base/java.util.concurrent=ALL-UNNAMED \
+              --add-opens java.base/java.util.concurrent.atomic=ALL-UNNAMED \
               --add-exports=java.base/sun.net.www.protocol.http=ALL-UNNAMED \
               --add-exports=java.base/sun.net.www.protocol.https=ALL-UNNAMED \
               --add-exports=java.base/sun.net.www.protocol.jar=ALL-UNNAMED \
@@ -390,6 +392,8 @@ invokeJar(){
                 --add-opens java.base/java.util=ALL-UNNAMED \
                 --add-opens java.naming/javax.naming.spi=ALL-UNNAMED \
                 --add-opens java.rmi/sun.rmi.transport.tcp=ALL-UNNAMED \
+                --add-opens java.base/java.util.concurrent=ALL-UNNAMED \
+                --add-opens java.base/java.util.concurrent.atomic=ALL-UNNAMED \
                 --add-exports=java.base/sun.net.www.protocol.http=ALL-UNNAMED \
                 --add-exports=java.base/sun.net.www.protocol.https=ALL-UNNAMED \
                 --add-exports=java.base/sun.net.www.protocol.jar=ALL-UNNAMED \
@@ -428,6 +432,8 @@ invokeJar(){
           --add-opens java.base/java.util=ALL-UNNAMED \
           --add-opens java.naming/javax.naming.spi=ALL-UNNAMED \
           --add-opens java.rmi/sun.rmi.transport.tcp=ALL-UNNAMED \
+          --add-opens java.base/java.util.concurrent=ALL-UNNAMED \
+          --add-opens java.base/java.util.concurrent.atomic=ALL-UNNAMED \
           --add-exports=java.base/sun.net.www.protocol.http=ALL-UNNAMED \
           --add-exports=java.base/sun.net.www.protocol.https=ALL-UNNAMED \
           --add-exports=java.base/sun.net.www.protocol.jar=ALL-UNNAMED \
diff --git a/assembly/src/release/bin/win32/wrapper.conf b/assembly/src/release/bin/win32/wrapper.conf
index 9bcd353..9a2ba9d 100644
--- a/assembly/src/release/bin/win32/wrapper.conf
+++ b/assembly/src/release/bin/win32/wrapper.conf
@@ -26,7 +26,7 @@ set.default.ACTIVEMQ_CONF=%ACTIVEMQ_BASE%/conf
 set.default.ACTIVEMQ_DATA=%ACTIVEMQ_BASE%/data
 
 # if you use JDK 9+, uncomment the following
-#set.JDK_JAVA_OPTIONS=--add-reads=java.xml=java.logging --add-opens java.base/java.security=ALL-UNNAMED --add-opens java.base/java.net=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.naming/javax.naming.spi=ALL-UNNAMED --add-opens java.rmi/sun.rmi.transport.tcp=ALL-UNNAMED --add-exports=java.base/sun.net.www.protocol.http=ALL-UNNAMED --add-exports=java.base/sun.net.www.protocol.https=ALL-UNNAMED --add-exports=java.base/ [...]
+#set.JDK_JAVA_OPTIONS=--add-reads=java.xml=java.logging --add-opens java.base/java.security=ALL-UNNAMED --add-opens java.base/java.net=ALL-UNNAMED --add-opens java.base/java.lang=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.atomic=ALL-UNNAMED --add-opens java.naming/javax.naming.spi=ALL-UNNAMED --add-opens java.rmi/sun.rmi.transport.tcp=ALL-UNNAMED --add-exports=java.base/sun.net. [...]
 
 wrapper.working.dir=.
 
diff --git a/assembly/src/release/bin/win64/wrapper.conf b/assembly/src/release/bin/win64/wrapper.conf
index 4862a05..46ed518 100644
--- a/assembly/src/release/bin/win64/wrapper.conf
+++ b/assembly/src/release/bin/win64/wrapper.conf
@@ -26,7 +26,7 @@ set.default.ACTIVEMQ_CONF=%ACTIVEMQ_BASE%/conf
 set.default.ACTIVEMQ_DATA=%ACTIVEMQ_BASE%/data
 
 # if you use JDK 9+, uncomment the following
-#set.JDK_JAVA_OPTIONS=--add-reads=java.xml=java.logging --add-opens java.base/java.security=ALL-UNNAMED --add-opens java.base/java.net=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.naming/javax.naming.spi=ALL-UNNAMED --add-opens java.rmi/sun.rmi.transport.tcp=ALL-UNNAMED --add-exports=java.base/sun.net.www.protocol.http=ALL-UNNAMED --add-exports=java.base/sun.net.www.protocol.https=ALL-UNNAMED --add-exports=java.base/ [...]
+#set.JDK_JAVA_OPTIONS=--add-reads=java.xml=java.logging --add-opens java.base/java.security=ALL-UNNAMED --add-opens java.base/java.net=ALL-UNNAMED --add-opens java.base/java.lang=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.atomic=ALL-UNNAMED --add-opens java.naming/javax.naming.spi=ALL-UNNAMED --add-opens java.rmi/sun.rmi.transport.tcp=ALL-UNNAMED --add-exports=java.base/sun.net. [...]
 
 wrapper.working.dir=.