You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2018/01/30 22:19:28 UTC
svn commit: r1822712 - in /jmeter/trunk/bin: jmeter jmeter.bat
Author: pmouawad
Date: Tue Jan 30 22:19:28 2018
New Revision: 1822712
URL: http://svn.apache.org/viewvc?rev=1822712&view=rev
Log:
Bug 61529 - Migration to Java 9
Add Java 9 options to avoid the warnings that will disturb our users.
Warnings are due to:
- https://github.com/bulenkov/Darcula/issues/41
- https://issues.apache.org/jira/browse/GROOVY-8339
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=1822712&r1=1822711&r2=1822712&view=diff
==============================================================================
--- jmeter/trunk/bin/jmeter (original)
+++ jmeter/trunk/bin/jmeter Tue Jan 30 22:19:28 2018
@@ -116,7 +116,7 @@ if [ -z "$JAVA_HOME" ]; then
fi
#--add-modules java.activation if JAVA 9
-ADD_MODS=
+JAVA9_OPTS=
# Minimal version to run JMeter
MINIMAL_VERSION=8
@@ -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
- ADD_MODS="--add-modules java.activation"
+ 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"
fi
: "${JMETER_OPTS:=""}"
@@ -184,7 +184,7 @@ SYSTEM_PROPS="-Djava.security.egd=file:/
SERVER="-server"
if [ -z "${JMETER_COMPLETE_ARGS}" ]; then
- ARGS="$ADD_MODS $SERVER $DUMP $JMETER_HEAP $VERBOSE_GC $JMETER_GC_ALGO $SYSTEM_PROPS $JMETER_LANGUAGE $RUN_IN_DOCKER"
+ ARGS="$JAVA9_OPTS $SERVER $DUMP $JMETER_HEAP $VERBOSE_GC $JMETER_GC_ALGO $SYSTEM_PROPS $JMETER_LANGUAGE $RUN_IN_DOCKER"
else
ARGS=""
fi
Modified: jmeter/trunk/bin/jmeter.bat
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/jmeter.bat?rev=1822712&r1=1822711&r2=1822712&view=diff
==============================================================================
--- jmeter/trunk/bin/jmeter.bat (original)
+++ jmeter/trunk/bin/jmeter.bat Tue Jan 30 22:19:28 2018
@@ -76,7 +76,7 @@ set MINIMAL_VERSION=1.8.0
rem --add-modules java.activation if JAVA 9
-set ADD_MODS=
+set JAVA9_OPTS=
for /f "tokens=3" %%g in ('java -version 2^>^&1 ^| findstr /i "version"') do (
@@ -103,7 +103,7 @@ IF "%JAVAVER:~1,2%"=="1." (
) else (
rem Java 9 at least
set current_minor=9
- set ADD_MODS=--add-modules java.activation
+ 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
)
@@ -179,7 +179,7 @@ if not defined DDRAW (
rem Collect the settings defined above
set ARGS=%DUMP% %HEAP% %VERBOSE_GC% %GC_ALGO% %DDRAW% %SYSTEM_PROPS% %RUN_IN_DOCKER%
-%JM_START% %JM_LAUNCH% %ADD_MODS% %ARGS% %JVM_ARGS% -jar "%JMETER_BIN%ApacheJMeter.jar" %JMETER_CMD_LINE_ARGS%
+%JM_START% %JM_LAUNCH% %JAVA9_OPTS% %ARGS% %JVM_ARGS% -jar "%JMETER_BIN%ApacheJMeter.jar" %JMETER_CMD_LINE_ARGS%
rem If the errorlevel is not zero, then display it and pause