Actually Repeat Jakarta 3.0 tests for EE11

dev/io.openliberty.security.jakartasec.3.0.internal_fat.common/publish/shared/config/op_features_ee11.xml

@@ -0,0 +1,10 @@
+<server>
+
+    <featureManager>
+        <feature>servlet-6.1</feature>
+        <feature>appSecurity-6.0</feature>
+        <feature>openidConnectServer-1.0</feature>
+        <feature>ssl-1.0</feature>
+    </featureManager>
+
+</server>

dev/io.openliberty.security.jakartasec.3.0.internal_fat.common/publish/shared/config/rp_features_ee11.xml

@@ -0,0 +1,10 @@
+<server>
+
+    <featureManager>
+        <feature>servlet-6.1</feature>
+        <feature>appSecurity-6.0</feature>
+        <feature>ssl-1.0</feature>
+        <feature>jsonp-2.1</feature>
+    </featureManager>
+
+</server>

dev/io.openliberty.security.jakartasec.3.0.internal_fat.common/src/io/openliberty/security/jakartasec/fat/commonTests/CommonAnnotatedSecurityTests.java

@@ -779,4 +779,15 @@ public boolean refreshTokensAreDifferent(Page response1, Page response2) throws
 
     }
 
+    public static String getServerConfigFile(String origConfigFile){
+        String configFile = origConfigFile;
+        String repeatAction = RepeatTestFilter.getRepeatActionsAsString();
+        String[] fileArray = configFile.split("\\.");
+        if (repeatAction.contains("EE11_FEATURES")){
+            configFile = fileArray[0] + "_ee11." + fileArray[1];
+        }
+
+        return configFile;
+    }
+
 }

dev/io.openliberty.security.jakartasec.3.0.internal_fat.config.1/bnd.bnd

@@ -25,7 +25,7 @@ src: \
 fat.project: true
 publish.wlp.jar.disabled: true
 
-tested.features: pages-3.1, transportsecurity-1.0, distributedmap-1.0, ssl-1.0, appsecurity-5.0, jndi-1.0, jsonp-2.1, federatedregistry-1.0, oauth-2.0, openidconnectserver-1.0, json-1.0, cdi-4.0, ldapregistry-3.0
+tested.features: pages-3.1, transportsecurity-1.0, distributedmap-1.0, ssl-1.0, appsecurity-5.0, jndi-1.0, jsonp-2.1, federatedregistry-1.0, oauth-2.0, openidconnectserver-1.0, json-1.0, cdi-4.0, ldapregistry-3.0, expressionlanguage-6.0, appsecurity-6.0, cdi-4.1, pages-4.0, servlet-6.1
 
 javac.source: 11
 javac.target: 11

dev/io.openliberty.security.jakartasec.3.0.internal_fat.config.2/bnd.bnd

@@ -25,7 +25,7 @@ src: \
 fat.project: true
 publish.wlp.jar.disabled: true
 
-tested.features: pages-3.1, transportsecurity-1.0, distributedmap-1.0, ssl-1.0, appsecurity-5.0, jndi-1.0, jsonp-2.1, federatedregistry-1.0, oauth-2.0, openidconnectserver-1.0, json-1.0, cdi-4.0, ldapregistry-3.0
+tested.features: pages-3.1, transportsecurity-1.0, distributedmap-1.0, ssl-1.0, appsecurity-5.0, jndi-1.0, jsonp-2.1, federatedregistry-1.0, oauth-2.0, openidconnectserver-1.0, json-1.0, cdi-4.0, ldapregistry-3.0, expressionlanguage-6.0, appsecurity-6.0, cdi-4.1, pages-4.0, servlet-6.1
 
 javac.source: 11
 javac.target: 11

dev/io.openliberty.security.jakartasec.3.0.internal_fat.config.commonTest/fat/src/io/openliberty/security/jakartasec/fat/config/tests/ConfigurationClaimsDefinitionTests.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2022, 2024 IBM Corporation and others.
+ * Copyright (c) 2022, 2025 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
@@ -82,12 +82,12 @@ public static void setUp() throws Exception {
         updateTrackers(opServer, rpServer, false);
 
         List<String> waitForMsgs = null;
-        opServer.startServerUsingExpandedConfiguration("server_orig.xml", waitForMsgs);
+        opServer.startServerUsingExpandedConfiguration(getServerConfigFile("server_orig.xml"), waitForMsgs);
         SecurityFatHttpUtils.saveServerPorts(opServer, Constants.BVT_SERVER_1_PORT_NAME_ROOT);
         opHttpBase = "http://localhost:" + opServer.getBvtPort();
         opHttpsBase = "https://localhost:" + opServer.getBvtSecurePort();
 
-        rpServer.startServerUsingExpandedConfiguration("server_orig.xml", waitForMsgs);
+        rpServer.startServerUsingExpandedConfiguration(getServerConfigFile("server_orig.xml"), waitForMsgs);
         SecurityFatHttpUtils.saveServerPorts(rpServer, Constants.BVT_SERVER_2_PORT_NAME_ROOT);
 
         rpHttpBase = "http://localhost:" + rpServer.getBvtPort();

dev/io.openliberty.security.jakartasec.3.0.internal_fat.config.commonTest/fat/src/io/openliberty/security/jakartasec/fat/config/tests/ConfigurationDisplayTests.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2023 IBM Corporation and others.
+ * Copyright (c) 2023, 2025 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
@@ -80,12 +80,12 @@ public static void setUp() throws Exception {
         updateTrackers(opServer, rpServer, false);
 
         List<String> waitForMsgs = null;
-        opServer.startServerUsingExpandedConfiguration("server_display.xml", waitForMsgs);
+        opServer.startServerUsingExpandedConfiguration(getServerConfigFile("server_display.xml"), waitForMsgs);
         SecurityFatHttpUtils.saveServerPorts(opServer, Constants.BVT_SERVER_1_PORT_NAME_ROOT);
         opHttpBase = "http://localhost:" + opServer.getBvtPort();
         opHttpsBase = "https://localhost:" + opServer.getBvtSecurePort();
 
-        rpServer.startServerUsingExpandedConfiguration("server_orig.xml", waitForMsgs);
+        rpServer.startServerUsingExpandedConfiguration(getServerConfigFile("server_orig.xml"), waitForMsgs);
         SecurityFatHttpUtils.saveServerPorts(rpServer, Constants.BVT_SERVER_2_PORT_NAME_ROOT);
 
         rpHttpBase = "http://localhost:" + rpServer.getBvtPort();

dev/io.openliberty.security.jakartasec.3.0.internal_fat.config.commonTest/fat/src/io/openliberty/security/jakartasec/fat/config/tests/ConfigurationELValuesOverrideTests.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2022, 2023 IBM Corporation and others.
+ * Copyright (c) 2022, 2025 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
@@ -73,12 +73,12 @@ public static void setUp() throws Exception {
         updateTrackers(opServer, rpServer, false);
 
         List<String> waitForMsgs = null;
-        opServer.startServerUsingExpandedConfiguration("server_orig.xml", waitForMsgs);
+        opServer.startServerUsingExpandedConfiguration(getServerConfigFile("server_orig.xml"), waitForMsgs);
         SecurityFatHttpUtils.saveServerPorts(opServer, Constants.BVT_SERVER_1_PORT_NAME_ROOT);
         opHttpBase = "http://localhost:" + opServer.getBvtPort();
         opHttpsBase = "https://localhost:" + opServer.getBvtSecurePort();
 
-        rpServer.startServerUsingExpandedConfiguration("server_orig.xml", waitForMsgs);
+        rpServer.startServerUsingExpandedConfiguration(getServerConfigFile("server_orig.xml"), waitForMsgs);
         SecurityFatHttpUtils.saveServerPorts(rpServer, Constants.BVT_SERVER_2_PORT_NAME_ROOT);
 
         rpHttpBase = "http://localhost:" + rpServer.getBvtPort();

dev/io.openliberty.security.jakartasec.3.0.internal_fat.config.commonTest/fat/src/io/openliberty/security/jakartasec/fat/config/tests/ConfigurationELValuesOverrideWithoutHttpSessionTests.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2022, 2023 IBM Corporation and others.
+ * Copyright (c) 2022, 2025 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
@@ -71,12 +71,12 @@ public static void setUp() throws Exception {
         updateTrackers(opServer, rpServer, false);
 
         List<String> waitForMsgs = null;
-        opServer.startServerUsingExpandedConfiguration("server_orig_withoutHttpSession.xml", waitForMsgs);
+        opServer.startServerUsingExpandedConfiguration(getServerConfigFile("server_orig_withoutHttpSession.xml"), waitForMsgs);
         SecurityFatHttpUtils.saveServerPorts(opServer, Constants.BVT_SERVER_1_PORT_NAME_ROOT);
         opHttpBase = "http://localhost:" + opServer.getBvtPort();
         opHttpsBase = "https://localhost:" + opServer.getBvtSecurePort();
 
-        rpServer.startServerUsingExpandedConfiguration("server_orig.xml", waitForMsgs);
+        rpServer.startServerUsingExpandedConfiguration(getServerConfigFile("server_orig.xml"), waitForMsgs);
         SecurityFatHttpUtils.saveServerPorts(rpServer, Constants.BVT_SERVER_2_PORT_NAME_ROOT);
 
         rpHttpBase = "http://localhost:" + rpServer.getBvtPort();

dev/io.openliberty.security.jakartasec.3.0.internal_fat.config.commonTest/fat/src/io/openliberty/security/jakartasec/fat/config/tests/ConfigurationExtraParametersTests.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2023 IBM Corporation and others.
+ * Copyright (c) 2023, 2025 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
@@ -86,12 +86,12 @@ public static void setUp() throws Exception {
         updateTrackers(opServer, rpServer, false);
 
         List<String> waitForMsgs = null;
-        opServer.startServerUsingExpandedConfiguration("server_extraParameters.xml", waitForMsgs);
+        opServer.startServerUsingExpandedConfiguration(getServerConfigFile("server_extraParameters.xml"), waitForMsgs);
         SecurityFatHttpUtils.saveServerPorts(opServer, Constants.BVT_SERVER_1_PORT_NAME_ROOT);
         opHttpBase = "http://localhost:" + opServer.getBvtPort();
         opHttpsBase = "https://localhost:" + opServer.getBvtSecurePort();
 
-        rpServer.startServerUsingExpandedConfiguration("server_orig.xml", waitForMsgs);
+        rpServer.startServerUsingExpandedConfiguration(getServerConfigFile("server_orig.xml"), waitForMsgs);
         SecurityFatHttpUtils.saveServerPorts(rpServer, Constants.BVT_SERVER_2_PORT_NAME_ROOT);
 
         rpHttpBase = "http://localhost:" + rpServer.getBvtPort();

dev/io.openliberty.security.jakartasec.3.0.internal_fat.config.commonTest/fat/src/io/openliberty/security/jakartasec/fat/config/tests/ConfigurationPromptTests.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2023 IBM Corporation and others.
+ * Copyright (c) 2023, 2025 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
@@ -91,12 +91,12 @@ public static void setUp() throws Exception {
         updateTrackers(opServer, rpServer, false);
 
         List<String> waitForMsgs = null;
-        opServer.startServerUsingExpandedConfiguration("server_prompt.xml", waitForMsgs);
+        opServer.startServerUsingExpandedConfiguration(getServerConfigFile("server_prompt.xml"), waitForMsgs);
         SecurityFatHttpUtils.saveServerPorts(opServer, Constants.BVT_SERVER_1_PORT_NAME_ROOT);
         opHttpBase = "http://localhost:" + opServer.getBvtPort();
         opHttpsBase = "https://localhost:" + opServer.getBvtSecurePort();
 
-        rpServer.startServerUsingExpandedConfiguration("server_orig.xml", waitForMsgs);
+        rpServer.startServerUsingExpandedConfiguration(getServerConfigFile("server_orig.xml"), waitForMsgs);
         SecurityFatHttpUtils.saveServerPorts(rpServer, Constants.BVT_SERVER_2_PORT_NAME_ROOT);
 
         rpHttpBase = "http://localhost:" + rpServer.getBvtPort();

dev/io.openliberty.security.jakartasec.3.0.internal_fat.config.commonTest/fat/src/io/openliberty/security/jakartasec/fat/config/tests/ConfigurationProviderMetadataTests.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2023 IBM Corporation and others.
+ * Copyright (c) 2023, 2025 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
@@ -36,6 +36,7 @@
 import componenttest.custom.junit.runner.FATRunner;
 import componenttest.custom.junit.runner.Mode;
 import componenttest.custom.junit.runner.Mode.TestMode;
+import componenttest.custom.junit.runner.RepeatTestFilter;
 import componenttest.rules.repeater.RepeatTests;
 import componenttest.topology.impl.LibertyServer;
 import io.openliberty.security.jakartasec.fat.commonTests.CommonAnnotatedSecurityTests;
@@ -107,12 +108,12 @@ public static void setUp() throws Exception {
         updateTrackers(opServer, rpServer, false);
 
         List<String> waitForMsgs = null;
-        opServer.startServerUsingExpandedConfiguration("server_providerMetadata.xml", waitForMsgs);
+        opServer.startServerUsingExpandedConfiguration(getServerConfigFile("server_providerMetadata.xml"), waitForMsgs);
         SecurityFatHttpUtils.saveServerPorts(opServer, Constants.BVT_SERVER_1_PORT_NAME_ROOT);
         opHttpBase = "http://localhost:" + opServer.getBvtPort();
         opHttpsBase = "https://localhost:" + opServer.getBvtSecurePort();
 
-        rpServer.startServerUsingExpandedConfiguration("server_orig.xml", waitForMsgs);
+        rpServer.startServerUsingExpandedConfiguration(getServerConfigFile("server_orig.xml"), waitForMsgs);
         SecurityFatHttpUtils.saveServerPorts(rpServer, Constants.BVT_SERVER_2_PORT_NAME_ROOT);
 
         rpHttpBase = "http://localhost:" + rpServer.getBvtPort();

dev/io.openliberty.security.jakartasec.3.0.internal_fat.config.commonTest/fat/src/io/openliberty/security/jakartasec/fat/config/tests/ConfigurationResponseModeTests.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2022, 2023 IBM Corporation and others.
+ * Copyright (c) 2022, 2025 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
@@ -36,6 +36,7 @@
 import componenttest.custom.junit.runner.FATRunner;
 import componenttest.custom.junit.runner.Mode;
 import componenttest.custom.junit.runner.Mode.TestMode;
+import componenttest.custom.junit.runner.RepeatTestFilter;
 import componenttest.rules.repeater.RepeatTests;
 import componenttest.topology.impl.LibertyServer;
 import io.openliberty.security.jakartasec.fat.commonTests.CommonAnnotatedSecurityTests;
@@ -93,12 +94,12 @@ public static void setUp() throws Exception {
         updateTrackers(opServer, rpServer, false);
 
         List<String> waitForMsgs = null;
-        opServer.startServerUsingExpandedConfiguration("server_orig.xml", waitForMsgs);
+        opServer.startServerUsingExpandedConfiguration(getServerConfigFile("server_orig.xml"), waitForMsgs);
         SecurityFatHttpUtils.saveServerPorts(opServer, Constants.BVT_SERVER_1_PORT_NAME_ROOT);
         opHttpBase = "http://localhost:" + opServer.getBvtPort();
         opHttpsBase = "https://localhost:" + opServer.getBvtSecurePort();
 
-        rpServer.startServerUsingExpandedConfiguration("server_orig.xml", waitForMsgs);
+        rpServer.startServerUsingExpandedConfiguration(getServerConfigFile("server_orig.xml"), waitForMsgs);
         SecurityFatHttpUtils.saveServerPorts(rpServer, Constants.BVT_SERVER_2_PORT_NAME_ROOT);
 
         rpHttpBase = "http://localhost:" + rpServer.getBvtPort();

dev/io.openliberty.security.jakartasec.3.0.internal_fat.config.commonTest/fat/src/io/openliberty/security/jakartasec/fat/config/tests/ConfigurationScopeTests.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2022, 2023 IBM Corporation and others.
+ * Copyright (c) 2022, 2025 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
@@ -88,12 +88,12 @@ public static void setUp() throws Exception {
         updateTrackers(opServer, rpServer, false);
 
         List<String> waitForMsgs = null;
-        opServer.startServerUsingExpandedConfiguration("server_scope.xml", waitForMsgs);
+        opServer.startServerUsingExpandedConfiguration(getServerConfigFile("server_orig.xml"), waitForMsgs);
         SecurityFatHttpUtils.saveServerPorts(opServer, Constants.BVT_SERVER_1_PORT_NAME_ROOT);
         opHttpBase = "http://localhost:" + opServer.getBvtPort();
         opHttpsBase = "https://localhost:" + opServer.getBvtSecurePort();
 
-        rpServer.startServerUsingExpandedConfiguration("server_orig.xml", waitForMsgs);
+        rpServer.startServerUsingExpandedConfiguration(getServerConfigFile("server_orig.xml"), waitForMsgs);
         SecurityFatHttpUtils.saveServerPorts(rpServer, Constants.BVT_SERVER_2_PORT_NAME_ROOT);
 
         rpHttpBase = "http://localhost:" + rpServer.getBvtPort();

dev/io.openliberty.security.jakartasec.3.0.internal_fat.config.commonTest/fat/src/io/openliberty/security/jakartasec/fat/config/tests/ConfigurationSigningTests.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2022, 2023 IBM Corporation and others.
+ * Copyright (c) 2022, 2025 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
@@ -113,12 +113,12 @@ public static void setUp() throws Exception {
         updateTrackers(opServer, rpServer, false);
 
         List<String> waitForMsgs = null;
-        opServer.startServerUsingExpandedConfiguration("server_signing.xml", waitForMsgs);
+        opServer.startServerUsingExpandedConfiguration(getServerConfigFile("server_signing.xml"), waitForMsgs);
         SecurityFatHttpUtils.saveServerPorts(opServer, Constants.BVT_SERVER_1_PORT_NAME_ROOT);
         opHttpBase = "http://localhost:" + opServer.getBvtPort();
         opHttpsBase = "https://localhost:" + opServer.getBvtSecurePort();
 
-        rpServer.startServerUsingExpandedConfiguration("server_orig.xml", waitForMsgs);
+        rpServer.startServerUsingExpandedConfiguration(getServerConfigFile("server_orig.xml"), waitForMsgs);
         SecurityFatHttpUtils.saveServerPorts(rpServer, Constants.BVT_SERVER_2_PORT_NAME_ROOT);
 
         rpHttpBase = "http://localhost:" + rpServer.getBvtPort();

dev/io.openliberty.security.jakartasec.3.0.internal_fat.config.commonTest/fat/src/io/openliberty/security/jakartasec/fat/config/tests/ConfigurationTests.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2022, 2023 IBM Corporation and others.
+ * Copyright (c) 2022, 2025 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
@@ -77,12 +77,12 @@ public static void setUp() throws Exception {
         updateTrackers(opServer, rpServer, false);
 
         List<String> waitForMsgs = null;
-        opServer.startServerUsingExpandedConfiguration("server_orig.xml", waitForMsgs);
+        opServer.startServerUsingExpandedConfiguration(getServerConfigFile("server_orig.xml"), waitForMsgs);
         SecurityFatHttpUtils.saveServerPorts(opServer, Constants.BVT_SERVER_1_PORT_NAME_ROOT);
         opHttpBase = "http://localhost:" + opServer.getBvtPort();
         opHttpsBase = "https://localhost:" + opServer.getBvtSecurePort();
 
-        rpServer.startServerUsingExpandedConfiguration("server_orig.xml", waitForMsgs);
+        rpServer.startServerUsingExpandedConfiguration(getServerConfigFile("server_orig.xml"), waitForMsgs);
         SecurityFatHttpUtils.saveServerPorts(rpServer, Constants.BVT_SERVER_2_PORT_NAME_ROOT);
 
         rpHttpBase = "http://localhost:" + rpServer.getBvtPort();

dev/io.openliberty.security.jakartasec.3.0.internal_fat.config.commonTest/fat/src/io/openliberty/security/jakartasec/fat/config/tests/ConfigurationTokenMinValidityTests.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2023, 2024 IBM Corporation and others.
+ * Copyright (c) 2023, 2025 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
@@ -94,12 +94,12 @@ public static void setUp() throws Exception {
         updateTrackers(opServer, rpServer, false);
 
         List<String> waitForMsgs = null;
-        opServer.startServerUsingExpandedConfiguration("server_tokenMinValidity.xml", waitForMsgs);
+        opServer.startServerUsingExpandedConfiguration(getServerConfigFile("server_tokenMinValidity.xml"), waitForMsgs);
         SecurityFatHttpUtils.saveServerPorts(opServer, Constants.BVT_SERVER_1_PORT_NAME_ROOT);
         opHttpBase = "http://localhost:" + opServer.getBvtPort();
         opHttpsBase = "https://localhost:" + opServer.getBvtSecurePort();
 
-        rpServer.startServerUsingExpandedConfiguration("server_orig.xml", waitForMsgs);
+        rpServer.startServerUsingExpandedConfiguration(getServerConfigFile("server_orig.xml"), waitForMsgs);
         SecurityFatHttpUtils.saveServerPorts(rpServer, Constants.BVT_SERVER_2_PORT_NAME_ROOT);
 
         rpHttpBase = "http://localhost:" + rpServer.getBvtPort();