Merge pull request wildfly#5887 from ropalka/WFCORE-6167

[WFCORE-6167] Workaround for known issue (enabled on JDK22+)
ehsavoie · Mar 5, 2024 · 05ef859 · 05ef859
2 parents ab3e7a3 + 43e7946
commit 05ef859
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/...test/java/org/jboss/as/test/manualmode/management/cli/CLIEmbedHostControllerTestCase.java b/...test/java/org/jboss/as/test/manualmode/management/cli/CLIEmbedHostControllerTestCase.java
@@ -81,6 +81,9 @@ public class CLIEmbedHostControllerTestCase extends AbstractCliTestBase {
 
     @BeforeClass
     public static void beforeClass() throws Exception {
+        if (Runtime.version().feature() > 21) {
+            System.setProperty("jdk.console", "java.base"); // WFCORE-6167 workaround on JDK22+
+        }
         Assume.assumeFalse("This test does not work with the IBM J9 JVM. There seems to be an issue with stdout" +
                 " logging.", TestSuiteEnvironment.isIbmJvm());
 
@@ -104,6 +107,9 @@ public static void beforeClass() throws Exception {
 
     @AfterClass
     public static void afterClass() throws IOException {
+        if (Runtime.version().feature() > 21) {
+            System.setProperty("jdk.console", "jdk.internal.le"); // WFCORE-6167 workaround on JDK22+
+        }
         if (!TestSuiteEnvironment.isIbmJvm()) {
             CLIEmbedUtil.copyConfig(ROOT, "domain", "logging.properties.backup", "logging.properties", false);
             try {

diff --git a/...ode/src/test/java/org/jboss/as/test/manualmode/management/cli/CLIEmbedServerTestCase.java b/...ode/src/test/java/org/jboss/as/test/manualmode/management/cli/CLIEmbedServerTestCase.java
@@ -101,6 +101,9 @@ public class CLIEmbedServerTestCase extends AbstractCliTestBase {
 
     @BeforeClass
     public static void beforeClass() throws Exception {
+        if (Runtime.version().feature() > 21) {
+            System.setProperty("jdk.console", "java.base"); // WFCORE-6167 workaround on JDK22+
+        }
         Assume.assumeFalse("This test does not work with the IBM J9 JVM. There seems to be an issue with stdout" +
                 " logging.", TestSuiteEnvironment.isIbmJvm());
 
@@ -137,6 +140,9 @@ public static void beforeClass() throws Exception {
 
     @AfterClass
     public static void afterClass() throws IOException {
+        if (Runtime.version().feature() > 21) {
+            System.setProperty("jdk.console", "jdk.internal.le"); // WFCORE-6167 workaround on JDK22+
+        }
         if (!TestSuiteEnvironment.isIbmJvm()) {
             CLIEmbedUtil.copyConfig(ROOT, "standalone", "logging.properties.backup", "logging.properties", false);
             try {