From 4e705bf77dde1323b9c45f626dd176e55386d634 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Richard=20Op=C3=A1lka?= <opalka.richard@gmail.com>
Date: Wed, 9 Feb 2022 19:32:23 +0100
Subject: [PATCH 1/4] [WFCORE-4296] Add required --add-opens for
 java.base/com.sun.net.ssl.internal.ssl when HTTPS is configured

---
 .../common/src/main/resources/content/bin/common.bat            | 2 ++
 .../common/src/main/resources/content/bin/common.ps1            | 2 ++
 .../common/src/main/resources/content/bin/common.sh             | 2 ++
 .../src/main/java/org/jboss/as/host/controller/jvm/JvmType.java | 1 +
 .../as/host/controller/ManagedServerBootCmdFactoryTestCase.java | 2 +-
 .../java/org/wildfly/core/launcher/AbstractCommandBuilder.java  | 1 +
 .../test/java/org/wildfly/core/launcher/CommandBuilderTest.java | 1 +
 pom.xml                                                         | 2 +-
 8 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/core-feature-pack/common/src/main/resources/content/bin/common.bat b/core-feature-pack/common/src/main/resources/content/bin/common.bat
index f0bf773b940..42be18ce5f5 100644
--- a/core-feature-pack/common/src/main/resources/content/bin/common.bat
+++ b/core-feature-pack/common/src/main/resources/content/bin/common.bat
@@ -48,6 +48,8 @@ goto :eof
       set "DEFAULT_MODULAR_JVM_OPTIONS=!DEFAULT_MODULAR_JVM_OPTIONS! --add-exports=java.naming/com.sun.jndi.url.ldaps=ALL-UNNAMED"
       rem Needed by Netty
       set "DEFAULT_MODULAR_JVM_OPTIONS=!DEFAULT_MODULAR_JVM_OPTIONS! --add-exports=jdk.naming.dns/com.sun.jndi.dns=ALL-UNNAMED"
+      rem Needed by WildFly Elytron Extension
+      set "DEFAULT_MODULAR_JVM_OPTIONS=!DEFAULT_MODULAR_JVM_OPTIONS! --add-opens=java.base/com.sun.net.ssl.internal.ssl=ALL-UNNAMED"
       rem Needed if Hibernate applications use Javassist
       set "DEFAULT_MODULAR_JVM_OPTIONS=!DEFAULT_MODULAR_JVM_OPTIONS! --add-opens=java.base/java.lang=ALL-UNNAMED"
       rem Needed by the MicroProfile REST Client subsystem
diff --git a/core-feature-pack/common/src/main/resources/content/bin/common.ps1 b/core-feature-pack/common/src/main/resources/content/bin/common.ps1
index d4e4c792bc2..01c212f3575 100644
--- a/core-feature-pack/common/src/main/resources/content/bin/common.ps1
+++ b/core-feature-pack/common/src/main/resources/content/bin/common.ps1
@@ -174,6 +174,8 @@ Param(
         $DEFAULT_MODULAR_JVM_OPTIONS += "--add-exports=java.naming/com.sun.jndi.url.ldaps=ALL-UNNAMED"
         # Needed by Netty
         $DEFAULT_MODULAR_JVM_OPTIONS += "--add-exports=jdk.naming.dns/com.sun.jndi.dns=ALL-UNNAMED"
+        # Needed by WildFly Elytron Extension
+        $DEFAULT_MODULAR_JVM_OPTIONS += "--add-opens=java.base/com.sun.net.ssl.internal.ssl=ALL-UNNAMED"
         # Needed if Hibernate applications use Javassist
         $DEFAULT_MODULAR_JVM_OPTIONS += "--add-opens=java.base/java.lang=ALL-UNNAMED"
         # Needed by the MicroProfile REST Client subsystem
diff --git a/core-feature-pack/common/src/main/resources/content/bin/common.sh b/core-feature-pack/common/src/main/resources/content/bin/common.sh
index 1ae22524378..083e16a2a4e 100755
--- a/core-feature-pack/common/src/main/resources/content/bin/common.sh
+++ b/core-feature-pack/common/src/main/resources/content/bin/common.sh
@@ -44,6 +44,8 @@ setDefaultModularJvmOptions() {
       DEFAULT_MODULAR_JVM_OPTIONS="$DEFAULT_MODULAR_JVM_OPTIONS --add-exports=java.naming/com.sun.jndi.url.ldaps=ALL-UNNAMED"
       # Needed by Netty
       DEFAULT_MODULAR_JVM_OPTIONS="$DEFAULT_MODULAR_JVM_OPTIONS --add-exports=jdk.naming.dns/com.sun.jndi.dns=ALL-UNNAMED"
+      # Needed by WildFly Elytron Extension
+      DEFAULT_MODULAR_JVM_OPTIONS="$DEFAULT_MODULAR_JVM_OPTIONS --add-opens=java.base/com.sun.net.ssl.internal.ssl=ALL-UNNAMED"
       # Needed if Hibernate applications use Javassist
       DEFAULT_MODULAR_JVM_OPTIONS="$DEFAULT_MODULAR_JVM_OPTIONS --add-opens=java.base/java.lang=ALL-UNNAMED"
       # Needed by the MicroProfile REST Client subsystem
diff --git a/host-controller/src/main/java/org/jboss/as/host/controller/jvm/JvmType.java b/host-controller/src/main/java/org/jboss/as/host/controller/jvm/JvmType.java
index f9c61c1c59e..74fa1553bb2 100644
--- a/host-controller/src/main/java/org/jboss/as/host/controller/jvm/JvmType.java
+++ b/host-controller/src/main/java/org/jboss/as/host/controller/jvm/JvmType.java
@@ -63,6 +63,7 @@ public final class JvmType {
         modularJavaOpts.add("--add-exports=java.naming/com.sun.jndi.url.ldap=ALL-UNNAMED");
         modularJavaOpts.add("--add-exports=java.naming/com.sun.jndi.url.ldaps=ALL-UNNAMED");
         modularJavaOpts.add("--add-exports=jdk.naming.dns/com.sun.jndi.dns=ALL-UNNAMED");
+        modularJavaOpts.add("--add-opens=java.base/com.sun.net.ssl.internal.ssl=ALL-UNNAMED");
         modularJavaOpts.add("--add-opens=java.base/java.lang=ALL-UNNAMED");
         modularJavaOpts.add("--add-opens=java.base/java.lang.invoke=ALL-UNNAMED");
         modularJavaOpts.add("--add-opens=java.base/java.lang.reflect=ALL-UNNAMED");
diff --git a/host-controller/src/test/java/org/jboss/as/host/controller/ManagedServerBootCmdFactoryTestCase.java b/host-controller/src/test/java/org/jboss/as/host/controller/ManagedServerBootCmdFactoryTestCase.java
index f8a3744c507..e1cb32db835 100644
--- a/host-controller/src/test/java/org/jboss/as/host/controller/ManagedServerBootCmdFactoryTestCase.java
+++ b/host-controller/src/test/java/org/jboss/as/host/controller/ManagedServerBootCmdFactoryTestCase.java
@@ -129,7 +129,7 @@ public void testGetServerLaunchCommand() throws UnknownHostException {
         List<String> result = instance.getServerLaunchCommand();
         MatcherAssert.assertThat(result.size(), is(notNullValue()));
         if (result.size() > 18) {
-            MatcherAssert.assertThat(result.size(), is(33));
+            MatcherAssert.assertThat(result.size(), is(34));
         } else {
             MatcherAssert.assertThat(result.size(), is(18));
         }
diff --git a/launcher/src/main/java/org/wildfly/core/launcher/AbstractCommandBuilder.java b/launcher/src/main/java/org/wildfly/core/launcher/AbstractCommandBuilder.java
index 75a8051965c..6ebcd69ebc8 100644
--- a/launcher/src/main/java/org/wildfly/core/launcher/AbstractCommandBuilder.java
+++ b/launcher/src/main/java/org/wildfly/core/launcher/AbstractCommandBuilder.java
@@ -68,6 +68,7 @@ abstract class AbstractCommandBuilder<T extends AbstractCommandBuilder<T>> imple
             modularJavaOpts.add("--add-exports=java.naming/com.sun.jndi.url.ldap=ALL-UNNAMED");
             modularJavaOpts.add("--add-exports=java.naming/com.sun.jndi.url.ldaps=ALL-UNNAMED");
             modularJavaOpts.add("--add-exports=jdk.naming.dns/com.sun.jndi.dns=ALL-UNNAMED");
+            modularJavaOpts.add("--add-opens=java.base/com.sun.net.ssl.internal.ssl=ALL-UNNAMED");
             modularJavaOpts.add("--add-opens=java.base/java.lang=ALL-UNNAMED");
             modularJavaOpts.add("--add-opens=java.base/java.lang.invoke=ALL-UNNAMED");
             modularJavaOpts.add("--add-opens=java.base/java.lang.reflect=ALL-UNNAMED");
diff --git a/launcher/src/test/java/org/wildfly/core/launcher/CommandBuilderTest.java b/launcher/src/test/java/org/wildfly/core/launcher/CommandBuilderTest.java
index d26bd9aa501..2cf56baa93d 100644
--- a/launcher/src/test/java/org/wildfly/core/launcher/CommandBuilderTest.java
+++ b/launcher/src/test/java/org/wildfly/core/launcher/CommandBuilderTest.java
@@ -273,6 +273,7 @@ private void testJPMSArguments(final Collection<String> command, final int expec
         assertArgumentExists(command, "--add-exports=java.naming/com.sun.jndi.url.ldap=ALL-UNNAMED", expectedCount);
         assertArgumentExists(command, "--add-exports=java.naming/com.sun.jndi.url.ldaps=ALL-UNNAMED", expectedCount);
         assertArgumentExists(command, "--add-exports=jdk.naming.dns/com.sun.jndi.dns=ALL-UNNAMED", expectedCount);
+        assertArgumentExists(command, "--add-opens=java.base/com.sun.net.ssl.internal.ssl=ALL-UNNAMED", expectedCount);
         assertArgumentExists(command, "--add-opens=java.base/java.lang=ALL-UNNAMED", expectedCount);
         assertArgumentExists(command, "--add-opens=java.base/java.lang.invoke=ALL-UNNAMED", expectedCount);
         assertArgumentExists(command, "--add-opens=java.base/java.lang.reflect=ALL-UNNAMED", expectedCount);
diff --git a/pom.xml b/pom.xml
index 7fdc01a6da6..8adcd3457c3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -164,7 +164,7 @@
              NB: In case an update is made to these exports and opens, make sure that the common.sh script is in sync.
         -->
         <embedding.jar.jpms.exports>java.desktop/sun.awt java.naming/com.sun.jndi.ldap java.naming/com.sun.jndi.url.ldap java.naming/com.sun.jndi.url.ldaps jdk.naming.dns/com.sun.jndi.dns</embedding.jar.jpms.exports>
-        <embedding.jar.jpms.opens>java.base/java.lang java.base/java.lang.invoke java.base/java.lang.reflect java.base/java.io java.base/java.net java.base/java.security java.base/java.util java.base/java.util.concurrent java.management/javax.management java.naming/javax.naming</embedding.jar.jpms.opens>
+        <embedding.jar.jpms.opens>java.base/com.sun.net.ssl.internal.ssl java.base/java.lang java.base/java.lang.invoke java.base/java.lang.reflect java.base/java.io java.base/java.net java.base/java.security java.base/java.util java.base/java.util.concurrent java.management/javax.management java.naming/javax.naming</embedding.jar.jpms.opens>
 
         <!--
             Dependency versions. Please keep alphabetical.

From 853eaea7be3e5568c1d1059c180959bb3f8b90a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Richard=20Op=C3=A1lka?= <opalka.richard@gmail.com>
Date: Thu, 7 Sep 2023 19:48:17 +0200
Subject: [PATCH 2/4] [WFCORE-4296] Make adding of
 java.base/com.sun.net.ssl.internal.ssl conditional because it is not
 available on all JDK versions

---
 .../src/main/resources/content/bin/common.bat | 10 ++-
 .../src/main/resources/content/bin/common.ps1 | 15 +++-
 .../src/main/resources/content/bin/common.sh  | 15 +++-
 .../ManagedServerBootCmdFactory.java          |  1 +
 .../jboss/as/host/controller/jvm/JvmType.java | 76 ++++++++++++++++++-
 .../ManagedServerBootCmdFactoryTestCase.java  |  8 +-
 .../core/launcher/AbstractCommandBuilder.java | 10 ++-
 .../core/launcher/CliCommandBuilder.java      |  5 ++
 .../core/launcher/DomainCommandBuilder.java   | 10 +++
 .../java/org/wildfly/core/launcher/Jvm.java   | 30 +++++++-
 .../launcher/StandaloneCommandBuilder.java    |  5 ++
 .../core/launcher/CommandBuilderTest.java     | 11 ++-
 12 files changed, 187 insertions(+), 9 deletions(-)

diff --git a/core-feature-pack/common/src/main/resources/content/bin/common.bat b/core-feature-pack/common/src/main/resources/content/bin/common.bat
index 42be18ce5f5..62511d43115 100644
--- a/core-feature-pack/common/src/main/resources/content/bin/common.bat
+++ b/core-feature-pack/common/src/main/resources/content/bin/common.bat
@@ -17,6 +17,10 @@ if exist "%COMMON_CONF%" (
 endlocal
 goto :eof
 
+:setPackageAvailable
+    "%JAVA%" --add-opens=$1=ALL-UNNAMED -version >nul 2>&1 && (set PACKAGE_AVAILABLE=true) || (set PACKAGE_AVAILABLE=false)
+goto :eof
+
 :setEnhancedSecurityManager
     "%JAVA%" -Djava.security.manager=allow -version >nul 2>&1 && (set ENHANCED_SM=true) || (set ENHANCED_SM=false)
 goto :eof
@@ -49,7 +53,11 @@ goto :eof
       rem Needed by Netty
       set "DEFAULT_MODULAR_JVM_OPTIONS=!DEFAULT_MODULAR_JVM_OPTIONS! --add-exports=jdk.naming.dns/com.sun.jndi.dns=ALL-UNNAMED"
       rem Needed by WildFly Elytron Extension
-      set "DEFAULT_MODULAR_JVM_OPTIONS=!DEFAULT_MODULAR_JVM_OPTIONS! --add-opens=java.base/com.sun.net.ssl.internal.ssl=ALL-UNNAMED"
+      set PACKAGE_NAME="java.base/com.sun.net.ssl.internal.ssl"
+      call :setPackageAvailable %PACKAGE_NAME%
+      if "!$PACKAGE_AVAILABLE!" == "true" (
+        set "DEFAULT_MODULAR_JVM_OPTIONS=!DEFAULT_MODULAR_JVM_OPTIONS! --add-opens=%PACKAGE_NAME%=ALL-UNNAMED"
+      )
       rem Needed if Hibernate applications use Javassist
       set "DEFAULT_MODULAR_JVM_OPTIONS=!DEFAULT_MODULAR_JVM_OPTIONS! --add-opens=java.base/java.lang=ALL-UNNAMED"
       rem Needed by the MicroProfile REST Client subsystem
diff --git a/core-feature-pack/common/src/main/resources/content/bin/common.ps1 b/core-feature-pack/common/src/main/resources/content/bin/common.ps1
index 01c212f3575..d45f35ed39d 100644
--- a/core-feature-pack/common/src/main/resources/content/bin/common.ps1
+++ b/core-feature-pack/common/src/main/resources/content/bin/common.ps1
@@ -111,6 +111,15 @@ Function Get-Java-Opts {
 	return $JAVA_OPTS
 }
 
+Function SetPackageAvailable($packageName) {
+    $PACKAGE_AVAILABLE = $false
+    & $JAVA "--add-opens=$packageName=ALL-UNNAMED" -version >$null 2>&1
+    if ($LastExitCode -eq 0){
+        $PACKAGE_AVAILABLE = $true
+    }
+    return $PACKAGE_AVAILABLE
+}
+
 Function SetEnhancedSecurityManager {
     $ENHANCED_SM = $false
     & $JAVA "-Djava.security.manager=allow" -version >$null 2>&1
@@ -175,7 +184,11 @@ Param(
         # Needed by Netty
         $DEFAULT_MODULAR_JVM_OPTIONS += "--add-exports=jdk.naming.dns/com.sun.jndi.dns=ALL-UNNAMED"
         # Needed by WildFly Elytron Extension
-        $DEFAULT_MODULAR_JVM_OPTIONS += "--add-opens=java.base/com.sun.net.ssl.internal.ssl=ALL-UNNAMED"
+        $packageName = "java.base/com.sun.net.ssl.internal.ssl"
+        setPackageAvailable($packageName)
+        if($PACKAGE_AVAILABLE -eq 'true') {
+            $DEFAULT_MODULAR_JVM_OPTIONS += "--add-opens=$packageName=ALL-UNNAMED"
+        }
         # Needed if Hibernate applications use Javassist
         $DEFAULT_MODULAR_JVM_OPTIONS += "--add-opens=java.base/java.lang=ALL-UNNAMED"
         # Needed by the MicroProfile REST Client subsystem
diff --git a/core-feature-pack/common/src/main/resources/content/bin/common.sh b/core-feature-pack/common/src/main/resources/content/bin/common.sh
index 083e16a2a4e..cda8b8c5148 100755
--- a/core-feature-pack/common/src/main/resources/content/bin/common.sh
+++ b/core-feature-pack/common/src/main/resources/content/bin/common.sh
@@ -12,6 +12,15 @@ if [ -r "$COMMON_CONF" ]; then
   . "$COMMON_CONF"
 fi
 
+setPackageAvailable() {
+  PACKAGE_STRING=`"$JAVA" --add-opens=$1=ALL-UNNAMED -version 2>&1 | $GREP "WARNING"`
+  if [ "x$PACKAGE_STRING" = "x" ]; then
+     PACKAGE_AVAILABLE=true
+  else
+     PACKAGE_AVAILABLE=false
+  fi
+}
+
 setEnhancedSecurityManager() {
   "$JAVA" -Djava.security.manager=allow -version > /dev/null 2>&1 && ENHANCED_SM=true || ENHANCED_SM=false
 }
@@ -45,7 +54,11 @@ setDefaultModularJvmOptions() {
       # Needed by Netty
       DEFAULT_MODULAR_JVM_OPTIONS="$DEFAULT_MODULAR_JVM_OPTIONS --add-exports=jdk.naming.dns/com.sun.jndi.dns=ALL-UNNAMED"
       # Needed by WildFly Elytron Extension
-      DEFAULT_MODULAR_JVM_OPTIONS="$DEFAULT_MODULAR_JVM_OPTIONS --add-opens=java.base/com.sun.net.ssl.internal.ssl=ALL-UNNAMED"
+      PACKAGE_NAME="java.base/com.sun.net.ssl.internal.ssl"
+      setPackageAvailable $PACKAGE_NAME
+      if [ "$PACKAGE_AVAILABLE" = "true" ]; then
+        DEFAULT_MODULAR_JVM_OPTIONS="$DEFAULT_MODULAR_JVM_OPTIONS --add-opens=$PACKAGE_NAME=ALL-UNNAMED"
+      fi
       # Needed if Hibernate applications use Javassist
       DEFAULT_MODULAR_JVM_OPTIONS="$DEFAULT_MODULAR_JVM_OPTIONS --add-opens=java.base/java.lang=ALL-UNNAMED"
       # Needed by the MicroProfile REST Client subsystem
diff --git a/host-controller/src/main/java/org/jboss/as/host/controller/ManagedServerBootCmdFactory.java b/host-controller/src/main/java/org/jboss/as/host/controller/ManagedServerBootCmdFactory.java
index 6c8d11344b5..1e3b871eade 100644
--- a/host-controller/src/main/java/org/jboss/as/host/controller/ManagedServerBootCmdFactory.java
+++ b/host-controller/src/main/java/org/jboss/as/host/controller/ManagedServerBootCmdFactory.java
@@ -371,6 +371,7 @@ private List<String> getServerLaunchCommand(boolean includeProcessId, boolean fo
         }
 
         command.addAll(localJvmType.getDefaultArguments());
+        command.addAll(localJvmType.getOptionalDefaultArguments());
 
         command.add(String.format("-D%s=%s", ServerEnvironment.SERVER_LOG_DIR, this.logDir));
         command.add(String.format("-D%s=%s", ServerEnvironment.SERVER_TEMP_DIR, this.tmpDir));
diff --git a/host-controller/src/main/java/org/jboss/as/host/controller/jvm/JvmType.java b/host-controller/src/main/java/org/jboss/as/host/controller/jvm/JvmType.java
index 74fa1553bb2..fe7765cf322 100644
--- a/host-controller/src/main/java/org/jboss/as/host/controller/jvm/JvmType.java
+++ b/host-controller/src/main/java/org/jboss/as/host/controller/jvm/JvmType.java
@@ -22,11 +22,18 @@
 
 package org.jboss.as.host.controller.jvm;
 
+import java.io.BufferedReader;
 import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStreamReader;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Locale;
+import java.util.concurrent.TimeUnit;
 
 import org.jboss.as.host.controller.logging.HostControllerLogger;
 import org.wildfly.security.manager.WildFlySecurityManager;
@@ -42,7 +49,10 @@ public final class JvmType {
     private static final String JAVA_HOME_SYS_PROP = "java.home";
     private static final String JAVA_HOME_ENV_VAR = "JAVA_HOME";
     private static final String OS_NAME_SYS_PROP = "os.name";
+    /** Packages being exported or opened are available on all JVMs */
     private static final Collection<String> DEFAULT_MODULAR_JVM_ARGUMENTS;
+    /** Packages being exported or opened may not be available on all JVMs */
+    private static final Collection<String> DEFAULT_OPTIONAL_MODULAR_JVM_ARGUMENTS;
     private static final String JAVA_EXECUTABLE;
     private static final String JAVA_UNIX_EXECUTABLE = "java";
     private static final String JAVA_WIN_EXECUTABLE = "java.exe";
@@ -63,7 +73,6 @@ public final class JvmType {
         modularJavaOpts.add("--add-exports=java.naming/com.sun.jndi.url.ldap=ALL-UNNAMED");
         modularJavaOpts.add("--add-exports=java.naming/com.sun.jndi.url.ldaps=ALL-UNNAMED");
         modularJavaOpts.add("--add-exports=jdk.naming.dns/com.sun.jndi.dns=ALL-UNNAMED");
-        modularJavaOpts.add("--add-opens=java.base/com.sun.net.ssl.internal.ssl=ALL-UNNAMED");
         modularJavaOpts.add("--add-opens=java.base/java.lang=ALL-UNNAMED");
         modularJavaOpts.add("--add-opens=java.base/java.lang.invoke=ALL-UNNAMED");
         modularJavaOpts.add("--add-opens=java.base/java.lang.reflect=ALL-UNNAMED");
@@ -75,6 +84,9 @@ public final class JvmType {
         modularJavaOpts.add("--add-opens=java.management/javax.management=ALL-UNNAMED");
         modularJavaOpts.add("--add-opens=java.naming/javax.naming=ALL-UNNAMED");
         DEFAULT_MODULAR_JVM_ARGUMENTS = Collections.unmodifiableList(modularJavaOpts);
+        final ArrayList<String> modularOptionalJavaOpts = new ArrayList<>();
+        modularOptionalJavaOpts.add("--add-opens=java.base/com.sun.net.ssl.internal.ssl=ALL-UNNAMED");
+        DEFAULT_OPTIONAL_MODULAR_JVM_ARGUMENTS = Collections.unmodifiableList(modularOptionalJavaOpts);
     }
 
     private JvmType(final boolean forLaunch, final boolean isModularJvm, final String javaExecutable) {
@@ -108,6 +120,20 @@ public Collection<String> getDefaultArguments() {
         return isModularJvm ? DEFAULT_MODULAR_JVM_ARGUMENTS : Collections.EMPTY_LIST;
     }
 
+    public Collection<String> getOptionalDefaultArguments() {
+        if (isModularJvm) {
+            Collection<String> retVal = null;
+            for (final String optionalModularArgument : DEFAULT_OPTIONAL_MODULAR_JVM_ARGUMENTS) {
+                if (packageAvailableOnJvm(javaExecutable, true, optionalModularArgument)) {
+                    if (retVal == null) retVal = new ArrayList<>();
+                    retVal.add(optionalModularArgument);
+                }
+            }
+            if (retVal != null) return retVal;
+        }
+        return Collections.EMPTY_LIST;
+    }
+
     /**
      * Create a {@code JvmType} based on the location of the root dir of the JRE/JDK installation.
      * @param javaHome the root dir of the JRE/JDK installation. Cannot be {@code null} or empty
@@ -148,6 +174,54 @@ private static boolean isModularJvm(final String javaExecutable, final boolean f
         return false;
     }
 
+    private static boolean packageAvailableOnJvm(final String javaExecutable, final boolean forLaunch, final String optionalModularArgument) {
+        if (!forLaunch) return false;
+        boolean result;
+        final ProcessBuilder builder = new ProcessBuilder(javaExecutable, optionalModularArgument, "-version");
+        Process process = null;
+        Path stdout = null;
+        try {
+            // Create a temporary file for stdout
+            stdout = Files.createTempFile("stdout", ".txt");
+            process = builder.redirectErrorStream(true)
+                    .redirectOutput(stdout.toFile()).start();
+
+            if (process.waitFor(1, TimeUnit.SECONDS)) {
+                result = process.exitValue() == 0;
+            } else {
+                result = false;
+            }
+        } catch (IOException | InterruptedException e) {
+            result = false;
+        } finally {
+            if (process != null && process.isAlive()) {
+                process.destroyForcibly();
+            }
+            if (stdout != null) {
+                try {
+                    if (containsWarning(stdout)) {
+                        result = false;
+                    }
+                    Files.deleteIfExists(stdout);
+                } catch (IOException ignore) {
+                }
+            }
+        }
+        return result;
+    }
+
+    private static boolean containsWarning(final Path logFile)  throws IOException {
+        String line;
+        try (BufferedReader br = new BufferedReader(new InputStreamReader(new FileInputStream(logFile.toFile())))) {
+            while ((line = br.readLine()) != null) {
+                if (line.startsWith("WARNING:")) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
     /**
      * Create a {@code JvmType} based on the location of the java executable.
      * @param javaExecutable the location of the java executable. Cannot be {@code null} or empty
diff --git a/host-controller/src/test/java/org/jboss/as/host/controller/ManagedServerBootCmdFactoryTestCase.java b/host-controller/src/test/java/org/jboss/as/host/controller/ManagedServerBootCmdFactoryTestCase.java
index e1cb32db835..fc8bcddea5c 100644
--- a/host-controller/src/test/java/org/jboss/as/host/controller/ManagedServerBootCmdFactoryTestCase.java
+++ b/host-controller/src/test/java/org/jboss/as/host/controller/ManagedServerBootCmdFactoryTestCase.java
@@ -118,6 +118,12 @@ public void testCreateConfiguration() throws UnknownHostException {
         Assert.assertNotNull(result);
     }
 
+    private static int getJavaVersion() throws NumberFormatException {
+        final String versionString = System.getProperty("java.version");
+        int indexOfDot = versionString.indexOf('.');
+        return Integer.valueOf(versionString.substring(0, indexOfDot)).intValue();
+    }
+
     /**
      * Test of getServerLaunchCommand method, of class
      * ManagedServerBootCmdFactory.
@@ -129,7 +135,7 @@ public void testGetServerLaunchCommand() throws UnknownHostException {
         List<String> result = instance.getServerLaunchCommand();
         MatcherAssert.assertThat(result.size(), is(notNullValue()));
         if (result.size() > 18) {
-            MatcherAssert.assertThat(result.size(), is(34));
+            MatcherAssert.assertThat(result.size(), is(getJavaVersion() <= 12 ? 34 : 33)); // for condition see WFCORE-4296 - java.base/com.sun.net.ssl.internal.ssl isn't available since JDK13
         } else {
             MatcherAssert.assertThat(result.size(), is(18));
         }
diff --git a/launcher/src/main/java/org/wildfly/core/launcher/AbstractCommandBuilder.java b/launcher/src/main/java/org/wildfly/core/launcher/AbstractCommandBuilder.java
index 6ebcd69ebc8..e0357090eb8 100644
--- a/launcher/src/main/java/org/wildfly/core/launcher/AbstractCommandBuilder.java
+++ b/launcher/src/main/java/org/wildfly/core/launcher/AbstractCommandBuilder.java
@@ -46,7 +46,10 @@ abstract class AbstractCommandBuilder<T extends AbstractCommandBuilder<T>> imple
     static final String SECURITY_MANAGER_PROP = "java.security.manager";
     static final String SECURITY_MANAGER_PROP_WITH_ALLOW_VALUE = "-D" + SECURITY_MANAGER_PROP + "=" + ALLOW_VALUE;
     static final String[] DEFAULT_VM_ARGUMENTS;
+    /** Packages being exported or opened are available on all JVMs */
     static final Collection<String> DEFAULT_MODULAR_VM_ARGUMENTS;
+    /** Packages being exported or opened may not be available on all JVMs */
+    static final Collection<String> OPTIONAL_DEFAULT_MODULAR_VM_ARGUMENTS;
 
     static {
         // Default JVM parameters for all versions
@@ -68,7 +71,6 @@ abstract class AbstractCommandBuilder<T extends AbstractCommandBuilder<T>> imple
             modularJavaOpts.add("--add-exports=java.naming/com.sun.jndi.url.ldap=ALL-UNNAMED");
             modularJavaOpts.add("--add-exports=java.naming/com.sun.jndi.url.ldaps=ALL-UNNAMED");
             modularJavaOpts.add("--add-exports=jdk.naming.dns/com.sun.jndi.dns=ALL-UNNAMED");
-            modularJavaOpts.add("--add-opens=java.base/com.sun.net.ssl.internal.ssl=ALL-UNNAMED");
             modularJavaOpts.add("--add-opens=java.base/java.lang=ALL-UNNAMED");
             modularJavaOpts.add("--add-opens=java.base/java.lang.invoke=ALL-UNNAMED");
             modularJavaOpts.add("--add-opens=java.base/java.lang.reflect=ALL-UNNAMED");
@@ -84,6 +86,12 @@ abstract class AbstractCommandBuilder<T extends AbstractCommandBuilder<T>> imple
             modularJavaOpts.add("--add-modules=java.se");
         }
         DEFAULT_MODULAR_VM_ARGUMENTS = Collections.unmodifiableList(modularJavaOpts);
+
+        final ArrayList<String> optionalModularJavaOpts = new ArrayList<>();
+        if (!Boolean.parseBoolean(System.getProperty("launcher.skip.jpms.properties", "false"))) {
+            optionalModularJavaOpts.add("--add-opens=java.base/com.sun.net.ssl.internal.ssl=ALL-UNNAMED");
+        }
+        OPTIONAL_DEFAULT_MODULAR_VM_ARGUMENTS = Collections.unmodifiableList(optionalModularJavaOpts);
     }
 
     protected final Environment environment;
diff --git a/launcher/src/main/java/org/wildfly/core/launcher/CliCommandBuilder.java b/launcher/src/main/java/org/wildfly/core/launcher/CliCommandBuilder.java
index 7a2c1707ca9..040be35606b 100644
--- a/launcher/src/main/java/org/wildfly/core/launcher/CliCommandBuilder.java
+++ b/launcher/src/main/java/org/wildfly/core/launcher/CliCommandBuilder.java
@@ -674,6 +674,11 @@ public List<String> buildArguments() {
         if (modularLauncher) {
             if (environment.getJvm().isModular()) {
                 cmd.addAll(AbstractCommandBuilder.DEFAULT_MODULAR_VM_ARGUMENTS);
+                for (final String optionalModularArgument : AbstractCommandBuilder.OPTIONAL_DEFAULT_MODULAR_VM_ARGUMENTS) {
+                    if (environment.getJvm().isPackageAvailable(environment.getJvm().getPath(), optionalModularArgument)) {
+                        cmd.add(optionalModularArgument);
+                    }
+                }
             }
         }
         if (environment.getJvm().enhancedSecurityManagerAvailable()) {
diff --git a/launcher/src/main/java/org/wildfly/core/launcher/DomainCommandBuilder.java b/launcher/src/main/java/org/wildfly/core/launcher/DomainCommandBuilder.java
index 5104148da9a..5e7cfda70b9 100644
--- a/launcher/src/main/java/org/wildfly/core/launcher/DomainCommandBuilder.java
+++ b/launcher/src/main/java/org/wildfly/core/launcher/DomainCommandBuilder.java
@@ -715,6 +715,11 @@ public List<String> buildArguments() {
         cmd.addAll(processControllerJavaOpts.asList());
         if (environment.getJvm().isModular()) {
             cmd.addAll(DEFAULT_MODULAR_VM_ARGUMENTS);
+            for (final String optionalModularArgument : OPTIONAL_DEFAULT_MODULAR_VM_ARGUMENTS) {
+                if (environment.getJvm().isPackageAvailable(environment.getJvm().getPath(), optionalModularArgument)) {
+                    cmd.add(optionalModularArgument);
+                }
+            }
         }
         if (environment.getJvm().enhancedSecurityManagerAvailable()) {
             cmd.add(SECURITY_MANAGER_PROP_WITH_ALLOW_VALUE);
@@ -746,6 +751,11 @@ public List<String> buildArguments() {
         cmd.addAll(hostControllerJavaOpts.asList());
         if (hostControllerJvm.isModular()) {
             cmd.addAll(DEFAULT_MODULAR_VM_ARGUMENTS);
+            for (final String optionalModularArgument : OPTIONAL_DEFAULT_MODULAR_VM_ARGUMENTS) {
+                if (environment.getJvm().isPackageAvailable(environment.getJvm().getPath(), optionalModularArgument)) {
+                    cmd.add(optionalModularArgument);
+                }
+            }
         }
         if (hostControllerJvm.enhancedSecurityManagerAvailable()) {
             cmd.add(SECURITY_MANAGER_PROP_WITH_ALLOW_VALUE);
diff --git a/launcher/src/main/java/org/wildfly/core/launcher/Jvm.java b/launcher/src/main/java/org/wildfly/core/launcher/Jvm.java
index a54cc1394f4..5592e6ec129 100644
--- a/launcher/src/main/java/org/wildfly/core/launcher/Jvm.java
+++ b/launcher/src/main/java/org/wildfly/core/launcher/Jvm.java
@@ -20,7 +20,9 @@
 package org.wildfly.core.launcher;
 
 import java.io.BufferedReader;
+import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -57,11 +59,13 @@ class Jvm {
         final String javaSpecVersion = System.getProperty("java.specification.version");
         boolean modularJvm = true;
         boolean enhancedSecurityManager = false;
+        int jvmVersion = 8;
         if (javaSpecVersion != null) {
             final Matcher matcher = Pattern.compile("^(?:1\\.)?(\\d+)$").matcher(javaSpecVersion);
             if (matcher.find()) {
-                modularJvm = Integer.parseInt(matcher.group(1)) >= 9;
-                enhancedSecurityManager = Integer.parseInt(matcher.group(1)) >= 12;
+                jvmVersion = Integer.parseInt(matcher.group(1));
+                modularJvm = jvmVersion >= 9;
+                enhancedSecurityManager = jvmVersion >= 12;
             }
         }
         MODULAR_JVM = modularJvm;
@@ -215,6 +219,14 @@ private static boolean hasEnhancedSecurityManager(final Path javaHome) {
         return checkProcessStatus(cmd);
     }
 
+    static boolean isPackageAvailable(final Path javaHome, final String optionalModularArgument) {
+        final List<String> cmd = new ArrayList<>();
+        cmd.add(resolveJavaCommand(javaHome));
+        cmd.add(optionalModularArgument);
+        cmd.add("-version");
+        return checkProcessStatus(cmd);
+    }
+
     /**
      * Checks to see if the {@code javaHome} is a modular JVM.
      *
@@ -260,6 +272,9 @@ private static boolean checkProcessStatus(final List<String> cmd) {
             }
             if (stdout != null) {
                 try {
+                    if (containsWarning(stdout)) {
+                        result = false;
+                    }
                     Files.deleteIfExists(stdout);
                 } catch (IOException ignore) {
                 }
@@ -268,6 +283,17 @@ private static boolean checkProcessStatus(final List<String> cmd) {
         return result;
     }
 
+    private static boolean containsWarning(final Path logFile)  throws IOException {
+        String line;
+        try (BufferedReader br = new BufferedReader(new InputStreamReader(new FileInputStream(logFile.toFile())))) {
+            while ((line = br.readLine()) != null) {
+                if (line.startsWith("WARNING:")) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
 
     /**
      * Returns the Java executable command.
diff --git a/launcher/src/main/java/org/wildfly/core/launcher/StandaloneCommandBuilder.java b/launcher/src/main/java/org/wildfly/core/launcher/StandaloneCommandBuilder.java
index 0d50782ca49..cc5de19ea7c 100644
--- a/launcher/src/main/java/org/wildfly/core/launcher/StandaloneCommandBuilder.java
+++ b/launcher/src/main/java/org/wildfly/core/launcher/StandaloneCommandBuilder.java
@@ -578,6 +578,11 @@ public List<String> buildArguments() {
         cmd.addAll(getJavaOptions());
         if (environment.getJvm().isModular()) {
             cmd.addAll(DEFAULT_MODULAR_VM_ARGUMENTS);
+            for (final String optionalModularArgument : OPTIONAL_DEFAULT_MODULAR_VM_ARGUMENTS) {
+                if (environment.getJvm().isPackageAvailable(environment.getJvm().getPath(), optionalModularArgument)) {
+                    cmd.add(optionalModularArgument);
+                }
+            }
         }
         if (environment.getJvm().enhancedSecurityManagerAvailable()) {
             cmd.add(SECURITY_MANAGER_PROP_WITH_ALLOW_VALUE);
diff --git a/launcher/src/test/java/org/wildfly/core/launcher/CommandBuilderTest.java b/launcher/src/test/java/org/wildfly/core/launcher/CommandBuilderTest.java
index 2cf56baa93d..fc3bdc8b0c4 100644
--- a/launcher/src/test/java/org/wildfly/core/launcher/CommandBuilderTest.java
+++ b/launcher/src/test/java/org/wildfly/core/launcher/CommandBuilderTest.java
@@ -273,7 +273,10 @@ private void testJPMSArguments(final Collection<String> command, final int expec
         assertArgumentExists(command, "--add-exports=java.naming/com.sun.jndi.url.ldap=ALL-UNNAMED", expectedCount);
         assertArgumentExists(command, "--add-exports=java.naming/com.sun.jndi.url.ldaps=ALL-UNNAMED", expectedCount);
         assertArgumentExists(command, "--add-exports=jdk.naming.dns/com.sun.jndi.dns=ALL-UNNAMED", expectedCount);
-        assertArgumentExists(command, "--add-opens=java.base/com.sun.net.ssl.internal.ssl=ALL-UNNAMED", expectedCount);
+        if (getJavaVersion() <= 12) {
+            // for condition see WFCORE-4296 - java.base/com.sun.net.ssl.internal.ssl isn't available since JDK13
+            assertArgumentExists(command, "--add-opens=java.base/com.sun.net.ssl.internal.ssl=ALL-UNNAMED", expectedCount);
+        }
         assertArgumentExists(command, "--add-opens=java.base/java.lang=ALL-UNNAMED", expectedCount);
         assertArgumentExists(command, "--add-opens=java.base/java.lang.invoke=ALL-UNNAMED", expectedCount);
         assertArgumentExists(command, "--add-opens=java.base/java.lang.reflect=ALL-UNNAMED", expectedCount);
@@ -287,6 +290,12 @@ private void testJPMSArguments(final Collection<String> command, final int expec
         assertArgumentExists(command, "--add-modules=java.se", expectedCount);
     }
 
+    private static int getJavaVersion() throws NumberFormatException {
+        final String versionString = System.getProperty("java.version");
+        int indexOfDot = versionString.indexOf('.');
+        return Integer.valueOf(versionString.substring(0, indexOfDot)).intValue();
+    }
+
     private void testModularJvmArguments(final Collection<String> command, final int expectedCount) {
         testEnhancedSecurityManager(command, expectedCount);
         testJPMSArguments(command, expectedCount);

From 613f5051ef3dfee4cfdedd454ce4da3ae28326e1 Mon Sep 17 00:00:00 2001
From: Lin Gao <lgao@redhat.com>
Date: Mon, 11 Sep 2023 09:06:50 +0800
Subject: [PATCH 3/4] [WFCORE-4296] Tweaks for Windows scripts

---
 .../common/src/main/resources/content/bin/common.bat      | 8 ++++----
 .../common/src/main/resources/content/bin/common.ps1      | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/core-feature-pack/common/src/main/resources/content/bin/common.bat b/core-feature-pack/common/src/main/resources/content/bin/common.bat
index 62511d43115..669aa1ceb2a 100644
--- a/core-feature-pack/common/src/main/resources/content/bin/common.bat
+++ b/core-feature-pack/common/src/main/resources/content/bin/common.bat
@@ -18,7 +18,7 @@ endlocal
 goto :eof
 
 :setPackageAvailable
-    "%JAVA%" --add-opens=$1=ALL-UNNAMED -version >nul 2>&1 && (set PACKAGE_AVAILABLE=true) || (set PACKAGE_AVAILABLE=false)
+    "%JAVA%" --add-opens=%~1=ALL-UNNAMED -version >nul 2>&1 && (set PACKAGE_AVAILABLE=true) || (set PACKAGE_AVAILABLE=false)
 goto :eof
 
 :setEnhancedSecurityManager
@@ -54,9 +54,9 @@ goto :eof
       set "DEFAULT_MODULAR_JVM_OPTIONS=!DEFAULT_MODULAR_JVM_OPTIONS! --add-exports=jdk.naming.dns/com.sun.jndi.dns=ALL-UNNAMED"
       rem Needed by WildFly Elytron Extension
       set PACKAGE_NAME="java.base/com.sun.net.ssl.internal.ssl"
-      call :setPackageAvailable %PACKAGE_NAME%
-      if "!$PACKAGE_AVAILABLE!" == "true" (
-        set "DEFAULT_MODULAR_JVM_OPTIONS=!DEFAULT_MODULAR_JVM_OPTIONS! --add-opens=%PACKAGE_NAME%=ALL-UNNAMED"
+      call :setPackageAvailable !PACKAGE_NAME!
+      if "!PACKAGE_AVAILABLE!" == "true" (
+        set "DEFAULT_MODULAR_JVM_OPTIONS=!DEFAULT_MODULAR_JVM_OPTIONS! --add-opens=!PACKAGE_NAME!=ALL-UNNAMED"
       )
       rem Needed if Hibernate applications use Javassist
       set "DEFAULT_MODULAR_JVM_OPTIONS=!DEFAULT_MODULAR_JVM_OPTIONS! --add-opens=java.base/java.lang=ALL-UNNAMED"
diff --git a/core-feature-pack/common/src/main/resources/content/bin/common.ps1 b/core-feature-pack/common/src/main/resources/content/bin/common.ps1
index d45f35ed39d..f27763e3483 100644
--- a/core-feature-pack/common/src/main/resources/content/bin/common.ps1
+++ b/core-feature-pack/common/src/main/resources/content/bin/common.ps1
@@ -185,8 +185,8 @@ Param(
         $DEFAULT_MODULAR_JVM_OPTIONS += "--add-exports=jdk.naming.dns/com.sun.jndi.dns=ALL-UNNAMED"
         # Needed by WildFly Elytron Extension
         $packageName = "java.base/com.sun.net.ssl.internal.ssl"
-        setPackageAvailable($packageName)
-        if($PACKAGE_AVAILABLE -eq 'true') {
+        $PACKAGE_AVAILABLE = setPackageAvailable($packageName)
+        if($PACKAGE_AVAILABLE) {
             $DEFAULT_MODULAR_JVM_OPTIONS += "--add-opens=$packageName=ALL-UNNAMED"
         }
         # Needed if Hibernate applications use Javassist

From 3b6b41f80833f930d796e2bf7c2bcc74c2dbfc39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Richard=20Op=C3=A1lka?= <opalka.richard@gmail.com>
Date: Thu, 14 Sep 2023 16:26:55 +0200
Subject: [PATCH 4/4] [WFCORE-4296] Increasing forked process timeout to 30
 seconds, adding method javadoc plus refactoring system property parsing

---
 .../java/org/jboss/as/host/controller/jvm/JvmType.java   | 9 ++++++++-
 .../wildfly/core/launcher/AbstractCommandBuilder.java    | 5 +++--
 .../src/main/java/org/wildfly/core/launcher/Jvm.java     | 2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/host-controller/src/main/java/org/jboss/as/host/controller/jvm/JvmType.java b/host-controller/src/main/java/org/jboss/as/host/controller/jvm/JvmType.java
index fe7765cf322..c0bf64a4eb4 100644
--- a/host-controller/src/main/java/org/jboss/as/host/controller/jvm/JvmType.java
+++ b/host-controller/src/main/java/org/jboss/as/host/controller/jvm/JvmType.java
@@ -120,6 +120,13 @@ public Collection<String> getDefaultArguments() {
         return isModularJvm ? DEFAULT_MODULAR_JVM_ARGUMENTS : Collections.EMPTY_LIST;
     }
 
+    /**
+     * The expectation is this method is called once per JvmType instance.
+     * In theory we could cache the result for reuse, but if we change how
+     * we use these instances it may not be the case that a cached value
+     * would be correct over multiple invocations.
+     * @return collection of optional (may not be available on all JDK versions) modular JVM arguments
+     */
     public Collection<String> getOptionalDefaultArguments() {
         if (isModularJvm) {
             Collection<String> retVal = null;
@@ -186,7 +193,7 @@ private static boolean packageAvailableOnJvm(final String javaExecutable, final
             process = builder.redirectErrorStream(true)
                     .redirectOutput(stdout.toFile()).start();
 
-            if (process.waitFor(1, TimeUnit.SECONDS)) {
+            if (process.waitFor(30, TimeUnit.SECONDS)) {
                 result = process.exitValue() == 0;
             } else {
                 result = false;
diff --git a/launcher/src/main/java/org/wildfly/core/launcher/AbstractCommandBuilder.java b/launcher/src/main/java/org/wildfly/core/launcher/AbstractCommandBuilder.java
index e0357090eb8..7d79dc88821 100644
--- a/launcher/src/main/java/org/wildfly/core/launcher/AbstractCommandBuilder.java
+++ b/launcher/src/main/java/org/wildfly/core/launcher/AbstractCommandBuilder.java
@@ -65,7 +65,8 @@ abstract class AbstractCommandBuilder<T extends AbstractCommandBuilder<T>> imple
         // Additions to these should include good explanations why in the relevant JIRA
         // Keep them alphabetical to avoid the code history getting confused by reordering commits
         final ArrayList<String> modularJavaOpts = new ArrayList<>();
-        if (!Boolean.parseBoolean(System.getProperty("launcher.skip.jpms.properties", "false"))) {
+        final boolean skipJPMSOptions = Boolean.getBoolean("launcher.skip.jpms.properties");
+        if (!skipJPMSOptions) {
             modularJavaOpts.add("--add-exports=java.desktop/sun.awt=ALL-UNNAMED");
             modularJavaOpts.add("--add-exports=java.naming/com.sun.jndi.ldap=ALL-UNNAMED");
             modularJavaOpts.add("--add-exports=java.naming/com.sun.jndi.url.ldap=ALL-UNNAMED");
@@ -88,7 +89,7 @@ abstract class AbstractCommandBuilder<T extends AbstractCommandBuilder<T>> imple
         DEFAULT_MODULAR_VM_ARGUMENTS = Collections.unmodifiableList(modularJavaOpts);
 
         final ArrayList<String> optionalModularJavaOpts = new ArrayList<>();
-        if (!Boolean.parseBoolean(System.getProperty("launcher.skip.jpms.properties", "false"))) {
+        if (!skipJPMSOptions) {
             optionalModularJavaOpts.add("--add-opens=java.base/com.sun.net.ssl.internal.ssl=ALL-UNNAMED");
         }
         OPTIONAL_DEFAULT_MODULAR_VM_ARGUMENTS = Collections.unmodifiableList(optionalModularJavaOpts);
diff --git a/launcher/src/main/java/org/wildfly/core/launcher/Jvm.java b/launcher/src/main/java/org/wildfly/core/launcher/Jvm.java
index 5592e6ec129..a175f36f4bc 100644
--- a/launcher/src/main/java/org/wildfly/core/launcher/Jvm.java
+++ b/launcher/src/main/java/org/wildfly/core/launcher/Jvm.java
@@ -259,7 +259,7 @@ private static boolean checkProcessStatus(final List<String> cmd) {
             process = builder.redirectErrorStream(true)
                     .redirectOutput(stdout.toFile()).start();
 
-            if (process.waitFor(1, TimeUnit.SECONDS)) {
+            if (process.waitFor(30, TimeUnit.SECONDS)) {
                 result = process.exitValue() == 0;
             } else {
                 result = false;