Repeat for Jakarta EE11

Author: pnicolucci

dev/com.ibm.ws.security.jwt_fat.consumer/bnd.bnd

@@ -1,14 +1,11 @@
 #*******************************************************************************
-# Copyright (c) 2019, 2025 IBM Corporation and others.
+# Copyright (c) 2019, 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
 #*******************************************************************************
 -include= ~../cnf/resources/bnd/bundle.props
 bVersion=1.0
@@ -29,7 +26,8 @@ src: \
 fat.project: true
 tested.features:\
         jwt-1.0, restfulwsclient-3.0, restfulws-3.0, jsonp-2.0, pages-3.0,\
-        restfulws-3.1, pages-3.1, jsonp-2.1
+        restfulws-3.1, pages-3.1, jsonp-2.1,\
+        restfulws-4.0, pages-4.0
 
 
 # To define a global minimum java level for the FAT, use the following property.

dev/com.ibm.ws.security.jwt_fat.consumer/fat/src/com/ibm/ws/security/jwt/fat/consumer/FATSuite.java

@@ -1,14 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2018, 2023 IBM Corporation and others.
+ * Copyright (c) 2018, 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.jwt.fat.consumer;
 
@@ -18,6 +15,7 @@
 import org.junit.runners.Suite.SuiteClasses;
 
 import com.ibm.ws.security.fat.common.actions.SecurityTestFeatureEE10RepeatAction;
+import com.ibm.ws.security.fat.common.actions.SecurityTestFeatureEE11RepeatAction;
 import com.ibm.ws.security.fat.common.actions.SecurityTestFeatureEE9RepeatAction;
 import com.ibm.ws.security.fat.common.actions.SecurityTestRepeatAction;
 
@@ -42,12 +40,13 @@
 public class FATSuite {
 
     /*
-     * Run EE9 and EE10 tests in LITE mode (but not on Windows) and run all tests in FULL mode.
+     * Run EE9/EE10/EE11 tests in LITE mode (but not on Windows) and run all tests in FULL mode.
      */
     @ClassRule
     public static RepeatTests repeat = RepeatTests.with(new EmptyAction().fullFATOnly())
             .andWith(new SecurityTestRepeatAction().onlyOnWindows().liteFATOnly())
             .andWith(new SecurityTestFeatureEE9RepeatAction().notOnWindows().forServerConfigPaths("publish/servers", "publish/shared/config").liteFATOnly())
-            .andWith(new SecurityTestFeatureEE10RepeatAction().notOnWindows().forServerConfigPaths("publish/servers", "publish/shared/config").liteFATOnly());
+            .andWith(new SecurityTestFeatureEE10RepeatAction().notOnWindows().forServerConfigPaths("publish/servers", "publish/shared/config").liteFATOnly())
+            .andWith(new SecurityTestFeatureEE11RepeatAction().notOnWindows().forServers("publish/servers", "publish/shared/config").liteFATOnly());
 
 }

dev/com.ibm.ws.security.jwtsso_fat.noMpJwt/fat/src/com/ibm/ws/security/jwtsso/fat/FATSuite.java

@@ -1,14 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2018, 2023 IBM Corporation and others.
+ * Copyright (c) 2018, 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.jwtsso.fat;
 
@@ -18,6 +15,7 @@
 import org.junit.runners.Suite.SuiteClasses;
 
 import com.ibm.ws.security.fat.common.actions.SecurityTestFeatureEE10RepeatAction;
+import com.ibm.ws.security.fat.common.actions.SecurityTestFeatureEE11RepeatAction;
 import com.ibm.ws.security.fat.common.actions.SecurityTestFeatureEE9RepeatAction;
 import com.ibm.ws.security.fat.common.actions.SecurityTestRepeatAction;
 import com.ibm.ws.security.jwtsso.fat.utils.JwtFatConstants;
@@ -44,6 +42,7 @@ public class FATSuite {
     @ClassRule
     public static RepeatTests r = RepeatTests.with(new SecurityTestRepeatAction(JwtFatConstants.NO_MPJWT))
             .andWith(new SecurityTestFeatureEE9RepeatAction(JwtFatConstants.NO_MPJWT).notOnWindows().liteFATOnly())
-            .andWith(new SecurityTestFeatureEE10RepeatAction(JwtFatConstants.NO_MPJWT).notOnWindows().liteFATOnly());
+            .andWith(new SecurityTestFeatureEE10RepeatAction(JwtFatConstants.NO_MPJWT).notOnWindows().liteFATOnly())
+            .andWith(new SecurityTestFeatureEE11RepeatAction(JwtFatConstants.NO_MPJWT).notOnWindows().liteFATOnly());
 
 }

dev/com.ibm.ws.security.oidc.client_fat.claimPropagation/bnd.bnd

@@ -1,20 +1,18 @@
 #*******************************************************************************
-# Copyright (c) 2022, 2025 IBM Corporation and others.
+# Copyright (c) 2022, 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
 #*******************************************************************************
 -include= ~../cnf/resources/bnd/bundle.props
 bVersion=1.0
 
 tested.features: jsp-2.2, servlet-3.1, transportsecurity-1.0, appsecurity-4.0, expressionlanguage-4.0, servlet-5.0, cdi-3.0, pages-3.0, jsonp-2.0,\
-                 appsecurity-5.0, pages-3.1
+                 appsecurity-5.0, pages-3.1,\
+                 appsecurity-6.0, pages-4.0
 
 src: \
   fat/src

dev/com.ibm.ws.security.oidc.client_fat.claimPropagation/fat/src/com/ibm/ws/security/oidc/client/claimPropagation/fat/FATSuite.java

@@ -1,14 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2022 IBM Corporation and others.
+ * Copyright (c) 2022, 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.oidc.client.claimPropagation.fat;
@@ -19,6 +16,7 @@
 import org.junit.runners.Suite.SuiteClasses;
 
 import com.ibm.ws.security.fat.common.actions.SecurityTestFeatureEE10RepeatAction;
+import com.ibm.ws.security.fat.common.actions.SecurityTestFeatureEE11RepeatAction;
 import com.ibm.ws.security.fat.common.actions.SecurityTestFeatureEE9RepeatAction;
 import com.ibm.ws.security.fat.common.actions.SecurityTestRepeatAction;
 import com.ibm.ws.security.fat.common.utils.ldaputils.CommonLocalLDAPServerSuite;
@@ -44,7 +42,7 @@
 public class FATSuite extends CommonLocalLDAPServerSuite {
 
     /*
-     * Run EE9 tests in only FULL mode and run EE7/EE8 tests only in LITE mode.
+     * Run EE9/EE10/EE11 tests in only FULL mode and run EE7/EE8 tests only in LITE mode.
      *
      * This was done to increase coverage of EE9 while not adding a large amount of test runtime.
      *
@@ -54,6 +52,7 @@ public class FATSuite extends CommonLocalLDAPServerSuite {
     public static RepeatTests repeat = RepeatTests.with(new EmptyAction().liteFATOnly())
             .andWith(new SecurityTestRepeatAction().onlyOnWindows().fullFATOnly())
             .andWith(new SecurityTestFeatureEE9RepeatAction().alwaysAddFeature("servlet-5.0").notOnWindows().fullFATOnly())
-            .andWith(new SecurityTestFeatureEE10RepeatAction().alwaysAddFeature("servlet-6.0").notOnWindows().fullFATOnly());
+            .andWith(new SecurityTestFeatureEE10RepeatAction().alwaysAddFeature("servlet-6.0").notOnWindows().fullFATOnly())
+            .andWith(new SecurityTestFeatureEE11RepeatAction().alwaysAddFeature("servlet-6.1").notOnWindows().fullFATOnly());
 
 }

dev/com.ibm.ws.security.oidc.client_fat.jaxrs/bnd.bnd

@@ -1,20 +1,18 @@
 #*******************************************************************************
-# Copyright (c) 2021, 2025 IBM Corporation and others.
+# Copyright (c) 2021, 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
 #*******************************************************************************
 -include= ~../cnf/resources/bnd/bundle.props
 bVersion=1.0
 
 tested.features: restfulwsclient-3.0, restfulws-3.0, appsecurity-4.0, expressionlanguage-4.0, pages-3.0,\
-                 restfulws-3.1, appsecurity-5.0, pages-3.1
+                 restfulws-3.1, appsecurity-5.0, pages-3.1,\
+                 restfulws-4.0, appsecurity-6.0, pages-4.0
 
 src: \
   fat/src, \

dev/com.ibm.ws.security.oidc.client_fat.jaxrs/fat/src/com/ibm/ws/security/openidconnect/client/fat/jaxrs/FATSuite.java

@@ -1,14 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013, 2022 IBM Corporation and others.
+ * Copyright (c) 2013, 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.openidconnect.client.fat.jaxrs;
 
@@ -21,6 +18,7 @@
 import org.junit.runners.Suite.SuiteClasses;
 
 import com.ibm.ws.security.fat.common.actions.SecurityTestFeatureEE10RepeatAction;
+import com.ibm.ws.security.fat.common.actions.SecurityTestFeatureEE11RepeatAction;
 import com.ibm.ws.security.fat.common.actions.SecurityTestFeatureEE9RepeatAction;
 import com.ibm.ws.security.fat.common.actions.SecurityTestRepeatAction;
 import com.ibm.ws.security.openidconnect.client.fat.jaxrs.IBM.OIDCTokenMappingResolverGenericTest;
@@ -65,16 +63,17 @@ public class FATSuite {
     }
 
     /*
-     * Run EE9 and EE10 tests in only FULL mode and run EE7/EE8 tests only in LITE mode.
+     * Run EE9/EE10/EE11 tests in only FULL mode and run EE7/EE8 tests only in LITE mode.
      *
-     * This was done to increase coverage of EE9 and EE10 while not adding a large amount of test runtime.
+     * This was done to increase coverage of EE9/EE10/EE11 while not adding a large amount of test runtime.
      *
      */
     /* always add servlet-5.0 to enable EE9 in the op which had no feature versions to swap out to enable EE9 */
     @ClassRule
     public static RepeatTests repeat = RepeatTests.with(new EmptyAction().liteFATOnly())
             .andWith(new SecurityTestRepeatAction().onlyOnWindows().fullFATOnly())
             .andWith(new SecurityTestFeatureEE9RepeatAction().notOnWindows().removeFeatures(REMOVE).addFeatures(INSERT).alwaysAddFeature("servlet-5.0").fullFATOnly())
-            .andWith(new SecurityTestFeatureEE10RepeatAction().notOnWindows().removeFeatures(REMOVE).addFeatures(INSERT).alwaysAddFeature("servlet-6.0").fullFATOnly());
+            .andWith(new SecurityTestFeatureEE10RepeatAction().notOnWindows().removeFeatures(REMOVE).addFeatures(INSERT).alwaysAddFeature("servlet-6.0").fullFATOnly())
+            .andWith(new SecurityTestFeatureEE11RepeatAction().notOnWindows().removeFeatures(REMOVE).addFeatures(INSERT).alwaysAddFeature("servlet-6.1").fullFATOnly());
 
 }

dev/com.ibm.ws.security.wim.core_fat/bnd.bnd

@@ -1,14 +1,11 @@
 #*******************************************************************************
-# Copyright (c) 2017, 2021 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
 #*******************************************************************************
 
 -include= ~../cnf/resources/bnd/bundle.props
@@ -19,7 +16,7 @@ src: \
 
 fat.project: true
 tested.features: appsecurity-4.0, expressionlanguage-4.0, cdi-3.0, servlet-3.1,\
-	appsecurity-5.0
+	appsecurity-5.0, appsecurity-6.0
 
 -buildpath: \
 	com.ibm.websphere.javaee.servlet.3.0;version=latest,\

dev/com.ibm.ws.security.wim.core_fat/fat/src/com/ibm/ws/security/wim/core/fat/FATSuite.java

@@ -1,14 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2023 IBM Corporation and others.
+ * Copyright (c) 2011, 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.wim.core.fat;
@@ -53,9 +50,9 @@ public class FATSuite {
     private static InMemoryLDAPServer tdsLdapServer, adLdapServer;
 
     /**
-     * Repeat tests for Jakarta EE 9 and 10.
+     * Repeat tests for Jakarta EE9/EE10/EE11
      *
-     * We need to replace appSecurity-1.0 with appSecurity-4.0. The appSecurity-3.0 4.0 and 5.0 features
+     * We need to replace appSecurity-1.0 with appSecurity-4.0. The appSecurity-3.0/4.0/5.0/6.0 features
      * no longer include ldapRegistry-3.0, so we need to add that as well.
      */
     @ClassRule
@@ -64,7 +61,12 @@ public class FATSuite {
                                     .removeFeature("appSecurity-1.0")
                                     .alwaysAddFeature("ldapRegistry-3.0")
                                     .conditionalFullFATOnly(FeatureReplacementAction.GREATER_THAN_OR_EQUAL_JAVA_11))
-                    .andWith(new JakartaEE10Action().addFeature("appSecurity-5.0").removeFeature("appSecurity-1.0").alwaysAddFeature("ldapRegistry-3.0"));
+                    .andWith(new JakartaEE10Action().addFeature("appSecurity-5.0").removeFeature("appSecurity-1.0").alwaysAddFeature("ldapRegistry-3.0"))
+                    .andWith(FeatureReplacementAction.EE11_FEATURES()
+                                    .addFeature("appSecurity-6.0")
+                                    .removeFeature("appSecurity-1.0")
+                                    .removeFeature("appSecurity-5.0")
+                                    .alwaysAddFeature("ldapRegistry-3.0"));
 
     @BeforeClass
     public static void setup() throws Exception {