[AMQ-9311] Remove support for JDK less than 17 from startup scripts

assembly/src/release/bin/activemq

@@ -336,8 +336,7 @@ invokeJar(){
       if [ -z "$ACTIVEMQ_OUT" ]; then
          ACTIVEMQ_OUT="/dev/null"
       fi
-      if [ "${VERSION}" -gt "8" ]; then
-        $EXEC_OPTION $DOIT_PREFIX "\"$JAVACMD\" $ACTIVEMQ_OPTS $ACTIVEMQ_DEBUG_OPTS \
+      $EXEC_OPTION $DOIT_PREFIX "\"$JAVACMD\" $ACTIVEMQ_OPTS $ACTIVEMQ_DEBUG_OPTS \
               --add-reads=java.xml=java.logging \
               --add-opens java.base/java.security=ALL-UNNAMED \
               --add-opens java.base/java.net=ALL-UNNAMED \
@@ -364,67 +363,36 @@ invokeJar(){
               echo \$APID > "${PIDFILE}";
               echo \"INFO: pidfile created : '${PIDFILE}' (pid '\$APID')\";exit \$RET" $DOIT_POSTFIX
         RET="$?"
-      else
-        $EXEC_OPTION $DOIT_PREFIX "\"$JAVACMD\" $ACTIVEMQ_OPTS $ACTIVEMQ_DEBUG_OPTS \
-              -Dactivemq.classpath=\"${ACTIVEMQ_CLASSPATH}\" \
-              -Dactivemq.home=\"${ACTIVEMQ_HOME}\" \
-              -Dactivemq.base=\"${ACTIVEMQ_BASE}\" \
-              -Dactivemq.conf=\"${ACTIVEMQ_CONF}\" \
-              -Dactivemq.data=\"${ACTIVEMQ_DATA}\" \
-              -Djolokia.conf=\"${JOLOKIA_CONF}\" \
-              $ACTIVEMQ_CYGWIN \
-              -jar \"${ACTIVEMQ_HOME}/bin/activemq.jar\" $COMMANDLINE_ARGS >> $ACTIVEMQ_OUT 2>&1 &
-              RET=\"\$?\"; APID=\"\$!\";
-              echo \$APID > "${PIDFILE}";
-              echo \"INFO: pidfile created : '${PIDFILE}' (pid '\$APID')\";exit \$RET" $DOIT_POSTFIX
-        RET="$?"
-      fi
    elif [ -n "$TASK_TODO" ] && [ "$TASK_TODO" = "stop" ];then
-          SPID="`cat "${PIDFILE}"`"
-          if [ "${VERSION}" -gt "8" ]; then
-              $EXEC_OPTION $DOIT_PREFIX "\"$JAVACMD\" $ACTIVEMQ_OPTS $ACTIVEMQ_DEBUG_OPTS \
-                --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-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 \
-                --add-exports=jdk.xml.dom/org.w3c.dom.html=ALL-UNNAMED \
-                --add-exports=jdk.naming.rmi/com.sun.jndi.url.rmi=ALL-UNNAMED \
-                -Dactivemq.classpath=\"${ACTIVEMQ_CLASSPATH}\" \
-                -Dactivemq.home=\"${ACTIVEMQ_HOME}\" \
-                -Dactivemq.base=\"${ACTIVEMQ_BASE}\" \
-                -Dactivemq.conf=\"${ACTIVEMQ_CONF}\" \
-                -Dactivemq.data=\"${ACTIVEMQ_DATA}\" \
-                -Djolokia.conf=\"${JOLOKIA_CONF}\" \
-                $ACTIVEMQ_CYGWIN \
-                -jar \"${ACTIVEMQ_HOME}/bin/activemq.jar\" $COMMANDLINE_ARGS --pid $SPID &
-                RET=\"\$?\"; APID=\"\$!\";
-                echo \$APID > "${PIDFILE}.stop"; exit \$RET" $DOIT_POSTFIX
-              RET="$?"
-          else
-              $EXEC_OPTION $DOIT_PREFIX "\"$JAVACMD\" $ACTIVEMQ_OPTS $ACTIVEMQ_DEBUG_OPTS \
-                -Dactivemq.classpath=\"${ACTIVEMQ_CLASSPATH}\" \
-                -Dactivemq.home=\"${ACTIVEMQ_HOME}\" \
-                -Dactivemq.base=\"${ACTIVEMQ_BASE}\" \
-                -Dactivemq.conf=\"${ACTIVEMQ_CONF}\" \
-                -Dactivemq.data=\"${ACTIVEMQ_DATA}\" \
-                -Djolokia.conf=\"${JOLOKIA_CONF}\" \
-                $ACTIVEMQ_CYGWIN \
-                -jar \"${ACTIVEMQ_HOME}/bin/activemq.jar\" $COMMANDLINE_ARGS --pid $SPID &
-                RET=\"\$?\"; APID=\"\$!\";
-                echo \$APID > "${PIDFILE}.stop"; exit \$RET" $DOIT_POSTFIX
-              RET="$?"
-          fi
+      SPID="`cat "${PIDFILE}"`"
+      $EXEC_OPTION $DOIT_PREFIX "\"$JAVACMD\" $ACTIVEMQ_OPTS $ACTIVEMQ_DEBUG_OPTS \
+            --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-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 \
+            --add-exports=jdk.xml.dom/org.w3c.dom.html=ALL-UNNAMED \
+            --add-exports=jdk.naming.rmi/com.sun.jndi.url.rmi=ALL-UNNAMED \
+            -Dactivemq.classpath=\"${ACTIVEMQ_CLASSPATH}\" \
+            -Dactivemq.home=\"${ACTIVEMQ_HOME}\" \
+            -Dactivemq.base=\"${ACTIVEMQ_BASE}\" \
+            -Dactivemq.conf=\"${ACTIVEMQ_CONF}\" \
+            -Dactivemq.data=\"${ACTIVEMQ_DATA}\" \
+            -Djolokia.conf=\"${JOLOKIA_CONF}\" \
+            $ACTIVEMQ_CYGWIN \
+            -jar \"${ACTIVEMQ_HOME}/bin/activemq.jar\" $COMMANDLINE_ARGS --pid $SPID &
+            RET=\"\$?\"; APID=\"\$!\";
+            echo \$APID > "${PIDFILE}.stop"; exit \$RET" $DOIT_POSTFIX
+          RET="$?"
    else
-      if [ "${VERSION}" -gt "8" ]; then
-        $EXEC_OPTION $DOIT_PREFIX "\"$JAVACMD\" $ACTIVEMQ_OPTS $ACTIVEMQ_DEBUG_OPTS \
+      $EXEC_OPTION $DOIT_PREFIX "\"$JAVACMD\" $ACTIVEMQ_OPTS $ACTIVEMQ_DEBUG_OPTS \
           --add-reads=java.xml=java.logging \
           --add-opens java.base/java.security=ALL-UNNAMED \
           --add-opens java.base/java.net=ALL-UNNAMED \
@@ -447,19 +415,7 @@ invokeJar(){
           -Djolokia.conf=\"${JOLOKIA_CONF}\" \
           $ACTIVEMQ_CYGWIN \
           -jar \"${ACTIVEMQ_HOME}/bin/activemq.jar\" $COMMANDLINE_ARGS" $DOIT_POSTFIX
-        RET="$?"
-      else
-        $EXEC_OPTION $DOIT_PREFIX "\"$JAVACMD\" $ACTIVEMQ_OPTS $ACTIVEMQ_DEBUG_OPTS \
-          -Dactivemq.classpath=\"${ACTIVEMQ_CLASSPATH}\" \
-          -Dactivemq.home=\"${ACTIVEMQ_HOME}\" \
-          -Dactivemq.base=\"${ACTIVEMQ_BASE}\" \
-          -Dactivemq.conf=\"${ACTIVEMQ_CONF}\" \
-          -Dactivemq.data=\"${ACTIVEMQ_DATA}\" \
-          -Djolokia.conf=\"${JOLOKIA_CONF}\" \
-          $ACTIVEMQ_CYGWIN \
-          -jar \"${ACTIVEMQ_HOME}/bin/activemq.jar\" $COMMANDLINE_ARGS" $DOIT_POSTFIX
-        RET="$?"
-      fi
+      RET="$?"
    fi
    return $RET
 }

assembly/src/release/bin/linux-x86-64/wrapper.conf

@@ -25,8 +25,8 @@ set.default.ACTIVEMQ_BASE=../..
 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/sun.net.www.protocol.jar=ALL-UNNAMED --add-exports=jdk.xml.dom/org.w3c.dom.html=ALL-UNNAMED --add-exports=jdk.naming.rmi/com.sun.jndi.url.rmi=ALL-UNNAMED
+# JDK 9+ modules
+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/sun.net.www.protocol.jar=ALL-UNNAMED --add-exports=jdk.xml.dom/org.w3c.dom.html=ALL-UNNAMED --add-exports=jdk.naming.rmi/com.sun.jndi.url.rmi=ALL-UNNAMED
 
 wrapper.working.dir=.
 

assembly/src/release/bin/macosx/wrapper.conf

@@ -25,8 +25,8 @@ set.default.ACTIVEMQ_BASE=../..
 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/sun.net.www.protocol.jar=ALL-UNNAMED --add-exports=jdk.xml.dom/org.w3c.dom.html=ALL-UNNAMED --add-exports=jdk.naming.rmi/com.sun.jndi.url.rmi=ALL-UNNAMED
+# JDK 9+ modules
+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/sun.net.www.protocol.jar=ALL-UNNAMED --add-exports=jdk.xml.dom/org.w3c.dom.html=ALL-UNNAMED --add-exports=jdk.naming.rmi/com.sun.jndi.url.rmi=ALL-UNNAMED
 
 wrapper.working.dir=.
 

assembly/src/release/bin/win64/wrapper.conf

@@ -25,8 +25,8 @@ set.default.ACTIVEMQ_BASE=../..
 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.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.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 --add-exports=jdk.xml.dom/org.w3c.dom.html=ALL-UNNAMED --add-exports=jdk.naming.rmi/com.sun.jndi.url.rmi=ALL-UNNAMED
+# JDK 9+ modules
+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.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 --add-exports=jdk.xml.dom/org.w3c.dom.html=ALL-UNNAMED --add-exports=jdk.naming.rmi/com.sun.jndi.url.rmi=ALL-UNNAMED
 
 wrapper.working.dir=.