Author: pmouawad
Date: Sun Feb 4 20:28:03 2018
New Revision: 1823107
URL: http://svn.apache.org/viewvc?rev=1823107&view=rev
Log:
Bug 61529: Migration to Java 9
Open more packages to reflection as they are used by xstream
Bugzilla Id: 61529
Modified:
jmeter/trunk/bin/jmeter
jmeter/trunk/bin/jmeter.bat
Modified: jmeter/trunk/bin/jmeter
URL:
http://svn.apache.org/viewvc/jmeter/trunk/bin/jmeter?rev=1823107&r1=1823106&r2=1823107&view=diff
==============================================================================
--- jmeter/trunk/bin/jmeter (original)
+++ jmeter/trunk/bin/jmeter Sun Feb 4 20:28:03 2018
@@ -126,7 +126,7 @@ CURRENT_VERSION=`"${JAVA_HOME}/bin/java"
# Check if Java is present and the minimal version requirement
if [ "$CURRENT_VERSION" -gt "$MINIMAL_VERSION" ]; then
- JAVA9_OPTS="--add-modules java.activation --add-opens
java.desktop/sun.awt=ALL-UNNAMED --add-opens
java.desktop/javax.swing.text.html=ALL-UNNAMED --add-opens
java.desktop/sun.swing=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED
--add-opens=java.base/java.lang.invoke=ALL-UNNAMED"
+ JAVA9_OPTS="--add-modules java.activation --add-opens
java.desktop/sun.awt=ALL-UNNAMED --add-opens java.desktop/sun.swing=ALL-UNNAMED
--add-opens java.desktop/javax.swing.text.html=ALL-UNNAMED --add-opens
java.desktop/java.awt=ALL-UNNAMED --add-opens
java.desktop/java.awt.font=ALL-UNNAMED
--add-opens=java.base/java.lang=ALL-UNNAMED
--add-opens=java.base/java.lang.invoke=ALL-UNNAMED
--add-opens=java.base/java.lang.reflect=ALL-UNNAMED
--add-opens=java.base/java.util=ALL-UNNAMED
--add-opens=java.base/java.text=ALL-UNNAMED"
fi
: "${JMETER_OPTS:=""}"
Modified: jmeter/trunk/bin/jmeter.bat
URL:
http://svn.apache.org/viewvc/jmeter/trunk/bin/jmeter.bat?rev=1823107&r1=1823106&r2=1823107&view=diff
==============================================================================
--- jmeter/trunk/bin/jmeter.bat (original)
+++ jmeter/trunk/bin/jmeter.bat Sun Feb 4 20:28:03 2018
@@ -103,7 +103,7 @@ IF "%JAVAVER:~1,2%"=="1." (
) else (
rem Java 9 at least
set current_minor=9
- set JAVA9_OPTS=--add-modules java.activation --add-opens
java.desktop/sun.awt=ALL-UNNAMED --add-opens
java.desktop/javax.swing.text.html=ALL-UNNAMED --add-opens
java.desktop/sun.swing=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED
--add-opens=java.base/java.lang.invoke=ALL-UNNAMED
+ set JAVA9_OPTS=--add-modules java.activation --add-opens
java.desktop/sun.awt=ALL-UNNAMED --add-opens java.desktop/sun.swing=ALL-UNNAMED
--add-opens java.desktop/javax.swing.text.html=ALL-UNNAMED --add-opens
java.desktop/java.awt=ALL-UNNAMED --add-opens
java.desktop/java.awt.font=ALL-UNNAMED
--add-opens=java.base/java.lang=ALL-UNNAMED
--add-opens=java.base/java.lang.invoke=ALL-UNNAMED
--add-opens=java.base/java.lang.reflect=ALL-UNNAMED
--add-opens=java.base/java.util=ALL-UNNAMED
--add-opens=java.base/java.text=ALL-UNNAMED
)
