Run the transform of the idp.war only once per EE9/EE10/EE11

Author: c00crane

dev/build.featureStart.base/resources/com/ibm/ws/test/featurestart/features/feature-levels.properties

@@ -15,9 +15,9 @@ data-1.0=17
 expressionLanguage-5.0=11
 expressionLanguage-6.0=21
 faces-4.0=11
-faces-5.0=21
+faces-4.1=21
 facesContainer-4.0=11
-facesContainer-5.0=21
+facesContainer-4.1=21
 jakartaee-10.0=11
 jakartaee-11.0=21
 jakartaeeClient-10.0=11

dev/cnf/dependabot/check_this_in_if_it_changes/pom.xml

@@ -1291,6 +1291,11 @@
       <artifactId>jakarta.persistence-api</artifactId>
       <version>3.1.0</version>
     </dependency>
+    <dependency>
+      <groupId>jakarta.persistence</groupId>
+      <artifactId>jakarta.persistence-api</artifactId>
+      <version>3.2.0-M1</version>
+    </dependency>
     <dependency>
       <groupId>jakarta.resource</groupId>
       <artifactId>jakarta.resource-api</artifactId>
@@ -1331,6 +1336,11 @@
       <artifactId>jakarta.servlet.jsp-api</artifactId>
       <version>3.1.1</version>
     </dependency>
+    <dependency>
+      <groupId>jakarta.servlet.jsp</groupId>
+      <artifactId>jakarta.servlet.jsp-api</artifactId>
+      <version>4.0.0-M1</version>
+    </dependency>
     <dependency>
       <groupId>jakarta.servlet</groupId>
       <artifactId>jakarta.servlet-api</artifactId>
@@ -1371,11 +1381,21 @@
       <artifactId>jakarta.websocket-api</artifactId>
       <version>2.1.0</version>
     </dependency>
+    <dependency>
+      <groupId>jakarta.websocket</groupId>
+      <artifactId>jakarta.websocket-api</artifactId>
+      <version>2.2.0-M1</version>
+    </dependency>
     <dependency>
       <groupId>jakarta.websocket</groupId>
       <artifactId>jakarta.websocket-client-api</artifactId>
       <version>2.1.0</version>
     </dependency>
+    <dependency>
+      <groupId>jakarta.websocket</groupId>
+      <artifactId>jakarta.websocket-client-api</artifactId>
+      <version>2.2.0-M1</version>
+    </dependency>
     <dependency>
       <groupId>jakarta.ws.rs</groupId>
       <artifactId>jakarta.ws.rs-api</artifactId>

dev/cnf/oss_dependencies.maven

@@ -254,6 +254,7 @@ jakarta.nosql:nosql-document:1.0.0-b6
 jakarta.nosql:nosql-key-value:1.0.0-b6
 jakarta.persistence:jakarta.persistence-api:3.0.0
 jakarta.persistence:jakarta.persistence-api:3.1.0
+jakarta.persistence:jakarta.persistence-api:3.2.0-M1
 jakarta.resource:jakarta.resource-api:2.0.0
 jakarta.resource:jakarta.resource-api:2.1.0
 jakarta.security.enterprise:jakarta.security.enterprise-api:2.0.0
@@ -262,6 +263,7 @@ jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api:2.0.0
 jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api:3.0.0
 jakarta.servlet.jsp:jakarta.servlet.jsp-api:3.0.0
 jakarta.servlet.jsp:jakarta.servlet.jsp-api:3.1.1
+jakarta.servlet.jsp:jakarta.servlet.jsp-api:4.0.0-M1
 jakarta.servlet:jakarta.servlet-api:5.0.0
 jakarta.servlet:jakarta.servlet-api:6.0.0
 jakarta.servlet:jakarta.servlet-api:6.1.0-M1
@@ -270,7 +272,9 @@ jakarta.transaction:jakarta.transaction-api:2.0.1
 jakarta.validation:jakarta.validation-api:3.0.2
 jakarta.websocket:jakarta.websocket-api:2.0.0
 jakarta.websocket:jakarta.websocket-api:2.1.0
+jakarta.websocket:jakarta.websocket-api:2.2.0-M1
 jakarta.websocket:jakarta.websocket-client-api:2.1.0
+jakarta.websocket:jakarta.websocket-client-api:2.2.0-M1
 jakarta.ws.rs:jakarta.ws.rs-api:3.0.0
 jakarta.ws.rs:jakarta.ws.rs-api:3.1.0
 jakarta.xml.bind:jakarta.xml.bind-api:3.0.1

dev/com.ibm.websphere.appserver.features/visibility/auto/io.openliberty.faces3.0-beanValidation3.0.feature

@@ -2,7 +2,7 @@
 symbolicName=io.openliberty.faces3.0-beanValidation3.0
 IBM-App-ForceRestart: install, \
  uninstall
-IBM-Provision-Capability: osgi.identity; filter:="(&(type=osgi.subsystem.feature)(|(osgi.identity=io.openliberty.faces-3.0)(osgi.identity=io.openliberty.faces-4.0)(osgi.identity=io.openliberty.faces-5.0)))", \
+IBM-Provision-Capability: osgi.identity; filter:="(&(type=osgi.subsystem.feature)(|(osgi.identity=io.openliberty.faces-3.0)(osgi.identity=io.openliberty.faces-4.0)(osgi.identity=io.openliberty.faces-4.1)))", \
  osgi.identity; filter:="(&(type=osgi.subsystem.feature)(|(osgi.identity=io.openliberty.beanValidation-3.0)(osgi.identity=io.openliberty.beanValidation-3.1)))"
 IBM-Install-Policy: when-satisfied
 -bundles=com.ibm.ws.jsf.beanvalidation.jakarta

dev/com.ibm.websphere.appserver.features/visibility/private/com.ibm.websphere.appserver.javaeedd-1.0.feature

@@ -19,7 +19,7 @@ IBM-Process-Types: server, \
  com.ibm.ws.javaee.dd.common, \
  com.ibm.ws.javaee.dd.ejb
 -jars=com.ibm.websphere.appserver.spi.javaeedd; location:=dev/spi/ibm/
--files=dev/spi/ibm/javadoc/com.ibm.websphere.appserver.spi.javaeedd_1.7-javadoc.zip
+-files=dev/spi/ibm/javadoc/com.ibm.websphere.appserver.spi.javaeedd_1.8-javadoc.zip
 kind=ga
 edition=core
 WLP-Activation-Type: parallel

dev/com.ibm.websphere.appserver.features/visibility/private/com.ibm.websphere.appserver.org.eclipse.persistence-3.2.feature

@@ -5,7 +5,7 @@ IBM-Process-Types: server, \
  client
 -features=io.openliberty.jakarta.persistence.base-3.2, \
   com.ibm.websphere.appserver.eeCompatible-11.0
--bundles=io.openliberty.persistence.3.1.thirdparty; apiJar=false; location:=dev/api/third-party/; mavenCoordinates="org.eclipse.persistence:eclipselink:4.0.0"
+-bundles=io.openliberty.persistence.3.2.thirdparty; apiJar=false; location:=dev/api/third-party/; mavenCoordinates="org.eclipse.persistence:eclipselink:4.0.0"
 kind=noship
 edition=full
 WLP-Activation-Type: parallel

…ty.facesProvider-5.0.0.Container.feature …ty.facesProvider-4.1.0.Container.featuredev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.facesProvider-5.0.0.Container.feature renamed to dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.facesProvider-4.1.0.Container.feature dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.facesProvider-5.0.0.Container.feature renamed to dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.facesProvider-4.1.0.Container.feature

@@ -1,7 +1,7 @@
 # This private feature corresponds to using a JSF-providing feature
-# with just a container and no implementation (e.g. facesContainer-5.0)
+# with just a container and no implementation (e.g. facesContainer-4.1)
 -include= ~${workspace}/cnf/resources/bnd/feature.props
-symbolicName=io.openliberty.facesProvider-5.0.0.Container
+symbolicName=io.openliberty.facesProvider-4.1.0.Container
 singleton=true
 visibility=private
 kind=noship

…erty.facesProvider-5.0.0.MyFaces.feature …erty.facesProvider-4.1.0.MyFaces.featuredev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.facesProvider-5.0.0.MyFaces.feature renamed to dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.facesProvider-4.1.0.MyFaces.feature dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.facesProvider-5.0.0.MyFaces.feature renamed to dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.facesProvider-4.1.0.MyFaces.feature

@@ -1,7 +1,7 @@
 # This private feature corresponds to using a JSF-providing feature
 # with the Apache MyFaces implementation
 -include= ~${workspace}/cnf/resources/bnd/feature.props
-symbolicName=io.openliberty.facesProvider-5.0.0.MyFaces
+symbolicName=io.openliberty.facesProvider-4.1.0.MyFaces
 singleton=true
 visibility=private
 kind=noship

…io.openliberty.jakarta.faces-5.0.feature …io.openliberty.jakarta.faces-4.1.featuredev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.jakarta.faces-5.0.feature renamed to dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.jakarta.faces-4.1.feature dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.jakarta.faces-5.0.feature renamed to dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.jakarta.faces-4.1.feature

@@ -1,5 +1,5 @@
 -include= ~${workspace}/cnf/resources/bnd/feature.props
-symbolicName=io.openliberty.jakarta.faces-5.0
+symbolicName=io.openliberty.jakarta.faces-4.1
 singleton=true
 -features=com.ibm.websphere.appserver.eeCompatible-11.0, \
   io.openliberty.noShip-1.0

dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.jakarta.persistence-3.2.feature

@@ -5,8 +5,8 @@ IBM-Process-Types: server, \
  client
 -features=io.openliberty.jakarta.persistence.base-3.2, \
   com.ibm.websphere.appserver.eeCompatible-11.0
--bundles=io.openliberty.jakarta.persistence.api.3.1
--jars=io.openliberty.jakarta.persistence.3.1; location:=dev/api/spec/; mavenCoordinates="jakarta.persistence:jakarta.persistence-api:3.1.0"
+-bundles=io.openliberty.jakarta.persistence.api.3.2
+-jars=io.openliberty.jakarta.persistence.3.2; location:=dev/api/spec/; mavenCoordinates="jakarta.persistence:jakarta.persistence-api:3.2.0-M1"
 kind=noship
 edition=full
 WLP-Activation-Type: parallel