Merge pull request #35006 from jhanders34/branch3

Update to use server Java when making Java level decisions for FATs

Author: jhanders34

dev/com.ibm.ws.security.oauth.oidc_fat.common/src/com/ibm/ws/security/oauth_oidc/fat/commonTest/CommonTest.java

@@ -1,14 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2020, 2025 IBM Corporation and others.
+ * Copyright (c) 2020, 2026 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-2.0/
  *
  * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
  *******************************************************************************/
 package com.ibm.ws.security.oauth_oidc.fat.commonTest;
 
@@ -373,12 +370,7 @@ public static TestServer commonSetUp(String requestedServer, String serverXML, S
                 }
             }
 
-            boolean overrideForConsul = false;
-            if (!useDerby && useMongo && JavaInfo.JAVA_VERSION == 7) { // Added Java 7 back in, need to do this to connect to Consul for MongoDB
-                overrideForConsul = true;
-            }
-
-            setupSSLClient(overrideForConsul);
+            setupSSLClient();
 
             /*
              * reconfigExpectations = new FATDataHelpers().addExpectation(null,
@@ -528,7 +520,7 @@ private static void addToServerRefList(TestServer server) throws Exception {
      * Perform setup for testing with SSL connections: TrustManager, hostname
      * verifier, ...
      */
-    private static void setupSSLClient(boolean overrideForConsul) {
+    private static void setupSSLClient() {
 
         String thisMethod = "setupSSLCLient";
 

dev/fattest.simplicity/src/componenttest/annotation/processor/TestServletProcessor.java

@@ -1,14 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2017, 2025 IBM Corporation and others.
+ * Copyright (c) 2017, 2026 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-2.0/
  *
  * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
  *******************************************************************************/
 package componenttest.annotation.processor;
 
@@ -71,9 +68,9 @@ public static List<FrameworkMethod> getServletTests(TestClass testClass) {
 
             // For each @TestServlet for this server, add all @Test methods
             for (TestServlet anno : testServlets) {
-                if (JavaInfo.JAVA_VERSION < anno.minJavaLevel()) {
+                if (JavaInfo.BOOTSTRAP_JAVA_VERSION < anno.minJavaLevel()) {
                     Log.info(c, m, "Skipping scan of TestServlet " + anno.servlet()
-                                   + " because the current java level " + JavaInfo.JAVA_VERSION
+                                   + " because the current java level " + JavaInfo.BOOTSTRAP_JAVA_VERSION
                                    + " did not meet the configured minimum " + anno.minJavaLevel());
                     continue;
                 }

dev/fattest.simplicity/src/componenttest/custom/junit/runner/JavaLevelFilter.java

@@ -1,14 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2017, 2025 IBM Corporation and others.
+ * Copyright (c) 2017, 2026 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-2.0/
  *
  * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
  *******************************************************************************/
 package componenttest.custom.junit.runner;
 
@@ -50,10 +47,10 @@ public boolean shouldRun(Description desc) {
             maximumJavaLevelAnnotation = FilterUtils.getTestClass(desc, getMyClass()).getAnnotation(MaximumJavaLevel.class);
         }
         if (maximumJavaLevelAnnotation != null) {
-            if (JavaInfo.JAVA_VERSION > maximumJavaLevelAnnotation.javaLevel()) {
+            if (JavaInfo.BOOTSTRAP_JAVA_VERSION > maximumJavaLevelAnnotation.javaLevel()) {
                 Log.debug(getMyClass(), "Removing test " + desc.getMethodName()
                                         + " from list to run, because its maximum java level is " + maximumJavaLevelAnnotation.javaLevel()
-                                        + " and we are running with " + JavaInfo.JAVA_VERSION);
+                                        + " and we are running with " + JavaInfo.BOOTSTRAP_JAVA_VERSION);
                 return false;
             }
         }
@@ -69,11 +66,11 @@ public boolean shouldRun(Description desc) {
         }
 
         // If there's a minimum java level annotaton, that sets a global minimum level, so if we don't meet that, don't run tests
-        boolean javaLevelTooLowForAllFeatures = minimumJavaLevelAnnotation != null && JavaInfo.JAVA_VERSION < minimumJavaLevelAnnotation.javaLevel();
+        boolean javaLevelTooLowForAllFeatures = minimumJavaLevelAnnotation != null && JavaInfo.BOOTSTRAP_JAVA_VERSION < minimumJavaLevelAnnotation.javaLevel();
         if (javaLevelTooLowForAllFeatures) {
             Log.debug(getMyClass(), "Removing test " + desc.getMethodName() + " with minimum java level " + minimumJavaLevelAnnotation.javaLevel()
                                     + " from list to run, because it is too high for current java level "
-                                    + JavaInfo.JAVA_VERSION);
+                                    + JavaInfo.BOOTSTRAP_JAVA_VERSION);
             return false;
         }
 

dev/fattest.simplicity/src/componenttest/rules/repeater/EmptyAction.java

@@ -28,9 +28,9 @@ public class EmptyAction implements RepeatTestAction {
     private TestMode testRunMode = TestMode.LITE;
     private boolean liteFATOnly = false;
 
-    public static final Predicate<EmptyAction> GREATER_THAN_OR_EQUAL_JAVA_11 = (action) -> JavaInfo.JAVA_VERSION >= 11;
-    public static final Predicate<EmptyAction> GREATER_THAN_OR_EQUAL_JAVA_17 = (action) -> JavaInfo.JAVA_VERSION >= 17;
-    public static final Predicate<EmptyAction> GREATER_THAN_OR_EQUAL_JAVA_21 = (action) -> JavaInfo.JAVA_VERSION >= 21;
+    public static final Predicate<EmptyAction> GREATER_THAN_OR_EQUAL_JAVA_11 = (action) -> JavaInfo.BOOTSTRAP_JAVA_VERSION >= 11;
+    public static final Predicate<EmptyAction> GREATER_THAN_OR_EQUAL_JAVA_17 = (action) -> JavaInfo.BOOTSTRAP_JAVA_VERSION >= 17;
+    public static final Predicate<EmptyAction> GREATER_THAN_OR_EQUAL_JAVA_21 = (action) -> JavaInfo.BOOTSTRAP_JAVA_VERSION >= 21;
 
     @Override
     public void setup() {}

dev/fattest.simplicity/src/componenttest/rules/repeater/FeatureReplacementAction.java

@@ -1,14 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2017, 2025 IBM Corporation and others.
+ * Copyright (c) 2017, 2026 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-2.0/
  *
  * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
  *******************************************************************************/
 package componenttest.rules.repeater;
 
@@ -106,9 +103,9 @@ public class FeatureReplacementAction implements RepeatTestAction {
         featuresWithNameChangeOnEE9 = Collections.unmodifiableMap(featureNameMapping);
     }
 
-    public static final Predicate<FeatureReplacementAction> GREATER_THAN_OR_EQUAL_JAVA_11 = (action) -> JavaInfo.JAVA_VERSION >= 11;
-    public static final Predicate<FeatureReplacementAction> GREATER_THAN_OR_EQUAL_JAVA_17 = (action) -> JavaInfo.JAVA_VERSION >= 17;
-    public static final Predicate<FeatureReplacementAction> GREATER_THAN_OR_EQUAL_JAVA_21 = (action) -> JavaInfo.JAVA_VERSION >= 21;
+    public static final Predicate<FeatureReplacementAction> GREATER_THAN_OR_EQUAL_JAVA_11 = (action) -> JavaInfo.BOOTSTRAP_JAVA_VERSION >= 11;
+    public static final Predicate<FeatureReplacementAction> GREATER_THAN_OR_EQUAL_JAVA_17 = (action) -> JavaInfo.BOOTSTRAP_JAVA_VERSION >= 17;
+    public static final Predicate<FeatureReplacementAction> GREATER_THAN_OR_EQUAL_JAVA_21 = (action) -> JavaInfo.BOOTSTRAP_JAVA_VERSION >= 21;
 
     public static EmptyAction NO_REPLACEMENT() {
         return new EmptyAction();
@@ -514,11 +511,11 @@ public boolean isEnabled() {
     }
 
     public boolean checkEnabled() {
-        if (JavaInfo.forCurrentVM().majorVersion() < minJavaLevel.majorVersion()) {
+        if (JavaInfo.BOOTSTRAP_JAVA_VERSION < minJavaLevel.majorVersion()) {
             Log.info(c, "isEnabled", "Skipping action '" + toString() + "' because the java level is too low.");
             return false;
         }
-        if (maxJavaLevel != null && JavaInfo.forCurrentVM().majorVersion() > maxJavaLevel.majorVersion()) {
+        if (maxJavaLevel != null && JavaInfo.BOOTSTRAP_JAVA_VERSION > maxJavaLevel.majorVersion()) {
             Log.info(c, "isEnabled", "Skipping action '" + toString() + "' because the java level is too high.");
             return false;
         }

dev/fattest.simplicity/src/componenttest/rules/repeater/RepeatActions.java

@@ -1,14 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2020, 2024 IBM Corporation and others.
+ * Copyright (c) 2020, 2026 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-2.0/
  *
  * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
  *******************************************************************************/
 package componenttest.rules.repeater;
 
@@ -165,7 +162,7 @@ public static RepeatTests repeat(String[] servers,
         List<FeatureSet> actualOtherFeatureSets = new ArrayList<>(otherFeatureSets);
 
         // If the firstFeatureSet requires a Java level higher than the one we're running, try to find a suitable replacement so we don't end up not running the test at all in LITE mode
-        int currentJavaLevel = JavaInfo.forCurrentVM().majorVersion();
+        int currentJavaLevel = JavaInfo.BOOTSTRAP_JAVA_VERSION;
         if (currentJavaLevel < firstFeatureSet.getMinJavaLevel().majorVersion()) {
 
             // Find the newest feature set that's in otherFeatureSets and is compatible with the current java version

dev/fattest.simplicity/src/componenttest/topology/impl/JavaInfo.java

@@ -1,14 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2017, 2025 IBM Corporation and others.
+ * Copyright (c) 2017, 2026 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-2.0/
  *
  * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
  *******************************************************************************/
 package componenttest.topology.impl;
 
@@ -29,6 +26,8 @@
 import com.ibm.websphere.simplicity.log.Log;
 import com.ibm.ws.ffdc.annotation.FFDCIgnore;
 
+import componenttest.common.apiservices.Bootstrap;
+
 /**
  * A class used for identifying properties of a JDK other
  * than the one that is currently being run.
@@ -37,7 +36,19 @@ public class JavaInfo {
     private static Class<?> c = JavaInfo.class;
     private static Map<String, JavaInfo> cache = new HashMap<String, JavaInfo>();
 
-    public static int JAVA_VERSION = JavaInfo.forCurrentVM().majorVersion();
+    public final static int JAVA_VERSION = JavaInfo.forCurrentVM().majorVersion();
+
+    public final static int BOOTSTRAP_JAVA_VERSION;
+    static {
+        try {
+            BOOTSTRAP_JAVA_VERSION = JavaInfo.forBootstrap(Bootstrap.getInstance()).majorVersion();
+        } catch (Exception ex) {
+            if (ex instanceof RuntimeException) {
+                throw (RuntimeException) ex;
+            }
+            throw new RuntimeException(ex);
+        }
+    }
 
     public static JavaInfo forCurrentVM() {
         String javaHome = System.getProperty("java.home");
@@ -69,6 +80,19 @@ private static void cacheJavaInfo(String jdkPath, JavaInfo info) {
             cache.put(jdkPath.replace("\\", "/"), info);
     }
 
+    /**
+     * Get the JavaInfo for the JDK that will be used for LibertyServer and LibertyClient
+     * from the Bootstrap that is fed to those classes. The Java used to run the tests
+     * can be different than the one to run the client and server when using the
+     * supports.framework.java variable.
+     * </ol>
+     */
+    public static JavaInfo forBootstrap(Bootstrap bootstrap) throws IOException {
+        String bootstrapHostName = bootstrap.getValue("hostName");
+        String bootstrapJava = bootstrap.getValue(bootstrapHostName + ".JavaHome");
+        return fromPath(bootstrapJava);
+    }
+
     /**
      * Get the JavaInfo for the JDK that will be used for a given LibertyServer.
      * The priority is determined in the following way: