Merge pull request #485 from jfdenise/main

Next image is 2.0.1
wildfly · Sep 11, 2024 · ff73ca3 · ff73ca3
2 parents 8e41c31 + 6e22432
commit ff73ca3
Show file tree

Hide file tree

Showing 33 changed files with 35 additions and 35 deletions.
diff --git a/release_process.md b/release_process.md
@@ -24,7 +24,7 @@ and creates “latest, latest-jdkX" image tags.
 ### Switch back to snapshot
 
 * In the wildfly-s2i main branch, update the wildfly-builder-image/jdkX-overrides.yaml files and wildfly-runtime-image/jdkX-overrides.yaml files  
-versions to `1.x.(x+1)-jdkX-snapshot` and use `main` ref for wildfly-cekit-modules and `ubi8` ref for openjdk.
+versions to `1.x.(x+1)-jdkX-snapshot` and use `main` ref for wildfly-cekit-modules and `ubi9` ref for openjdk.
 * Open PR. Merge. New snapshot images will be built and pushed in `quay.io/wildfly-snapshots` organisation.
 
 ## Respin existing images

diff --git a/test/test-app-advanced-extensions/pom.xml b/test/test-app-advanced-extensions/pom.xml
@@ -32,7 +32,7 @@
         <version.maven.war.plugin>3.3.2</version.maven.war.plugin>
         <version.wildfly>33.0.1.Final</version.wildfly>
         <version.wildfly.cloud.galleon.pack>7.0.1.Final</version.wildfly.cloud.galleon.pack>
-        <version.wildfly.plugin>5.0.0.Final</version.wildfly.plugin>
+        <version.wildfly.plugin>5.0.1.Final</version.wildfly.plugin>
     </properties>
 
     <description>This project demonstrates how to implement a JAX-RS service that uses JPA persistence to manage tasks</description>

diff --git a/test/test-app-clustering/pom.xml b/test/test-app-clustering/pom.xml
@@ -16,7 +16,7 @@
         <version.maven.war.plugin>3.3.2</version.maven.war.plugin>
         <version.wildfly>33.0.1.Final</version.wildfly>
         <version.wildfly.cloud.galleon.pack>7.0.1.Final</version.wildfly.cloud.galleon.pack>
-        <version.wildfly.plugin>5.0.0.Final</version.wildfly.plugin>
+        <version.wildfly.plugin>5.0.1.Final</version.wildfly.plugin>
     </properties>
 
     <dependencies>

diff --git a/test/test-app-default-config/pom.xml b/test/test-app-default-config/pom.xml
@@ -36,7 +36,7 @@
     <properties>
         <version.wildfly>33.0.1.Final</version.wildfly>
         <version.wildfly.cloud.galleon.pack>7.0.1.Final</version.wildfly.cloud.galleon.pack>
-        <version.wildfly.plugin>5.0.0.Final</version.wildfly.plugin>
+        <version.wildfly.plugin>5.0.1.Final</version.wildfly.plugin>
     </properties>
     <build>
         <plugins>

diff --git a/test/test-app-ejb/pom.xml b/test/test-app-ejb/pom.xml
@@ -18,7 +18,7 @@
         <version.maven.war.plugin>3.3.2</version.maven.war.plugin>
         <version.wildfly>33.0.1.Final</version.wildfly>
         <version.wildfly.cloud.galleon.pack>7.0.1.Final</version.wildfly.cloud.galleon.pack>
-        <version.wildfly.plugin>5.0.0.Final</version.wildfly.plugin>
+        <version.wildfly.plugin>5.0.1.Final</version.wildfly.plugin>
     </properties>
 
     <dependencies>

diff --git a/test/test-app-elytron-oidc-client/pom.xml b/test/test-app-elytron-oidc-client/pom.xml
@@ -17,7 +17,7 @@
         <version.maven.war.plugin>3.3.2</version.maven.war.plugin>
         <version.wildfly>33.0.1.Final</version.wildfly>
         <version.wildfly.cloud.galleon.pack>7.0.1.Final</version.wildfly.cloud.galleon.pack>
-        <version.wildfly.plugin>5.0.0.Final</version.wildfly.plugin>
+        <version.wildfly.plugin>5.0.1.Final</version.wildfly.plugin>
     </properties>
 
     <dependencies>

diff --git a/test/test-app-extension/pom.xml b/test/test-app-extension/pom.xml
@@ -32,7 +32,7 @@
         <version.maven.war.plugin>3.3.2</version.maven.war.plugin>
         <version.wildfly>33.0.1.Final</version.wildfly>
         <version.wildfly.cloud.galleon.pack>7.0.1.Final</version.wildfly.cloud.galleon.pack>
-        <version.wildfly.plugin>5.0.0.Final</version.wildfly.plugin>
+        <version.wildfly.plugin>5.0.1.Final</version.wildfly.plugin>
     </properties>
 
     <description>This project demonstrates how to implement a JAX-RS service that uses JPA persistence to manage tasks</description>

diff --git a/test/test-app-extension2/pom.xml b/test/test-app-extension2/pom.xml
@@ -32,7 +32,7 @@
         <version.maven.war.plugin>3.3.2</version.maven.war.plugin>
         <version.wildfly>33.0.1.Final</version.wildfly>
         <version.wildfly.cloud.galleon.pack>7.0.1.Final</version.wildfly.cloud.galleon.pack>
-        <version.wildfly.plugin>5.0.0.Final</version.wildfly.plugin>
+        <version.wildfly.plugin>5.0.1.Final</version.wildfly.plugin>
     </properties>
 
     <description>This project demonstrates how to implement a JAX-RS service that uses JPA persistence to manage tasks</description>

diff --git a/test/test-app-invalid/pom.xml b/test/test-app-invalid/pom.xml
@@ -16,7 +16,7 @@
         <version.maven.war.plugin>3.3.2</version.maven.war.plugin>
         <version.wildfly>33.0.1.Final</version.wildfly>
         <version.wildfly.cloud.galleon.pack>7.0.1.Final</version.wildfly.cloud.galleon.pack>
-        <version.wildfly.plugin>5.0.0.Final</version.wildfly.plugin>
+        <version.wildfly.plugin>5.0.1.Final</version.wildfly.plugin>
     </properties>
 
     <dependencies>

diff --git a/test/test-app-jpa2lc/pom.xml b/test/test-app-jpa2lc/pom.xml
@@ -18,7 +18,7 @@
         <version.maven.war.plugin>3.3.2</version.maven.war.plugin>
         <version.wildfly>33.0.1.Final</version.wildfly>
         <version.wildfly.cloud.galleon.pack>7.0.1.Final</version.wildfly.cloud.galleon.pack>
-        <version.wildfly.plugin>5.0.0.Final</version.wildfly.plugin>
+        <version.wildfly.plugin>5.0.1.Final</version.wildfly.plugin>
     </properties>
 
     <dependencies>

diff --git a/test/test-app-keycloak-saml/pom.xml b/test/test-app-keycloak-saml/pom.xml
@@ -14,7 +14,7 @@
         <maven.compiler.target>11</maven.compiler.target>
         <version.maven.war.plugin>3.3.2</version.maven.war.plugin>
         <version.wildfly>33.0.1.Final</version.wildfly>
-        <version.wildfly.plugin>5.0.0.Final</version.wildfly.plugin>
+        <version.wildfly.plugin>5.0.1.Final</version.wildfly.plugin>
         <version.wildfly.cloud.galleon.pack>7.0.1.Final</version.wildfly.cloud.galleon.pack>
         <jakarta.jakartaee-api.version>10.0.0</jakarta.jakartaee-api.version>
         <version.keycloak>23.0.0</version.keycloak>

diff --git a/test/test-app-mdb/pom.xml b/test/test-app-mdb/pom.xml
@@ -35,7 +35,7 @@
         <version.maven.war.plugin>3.3.2</version.maven.war.plugin>
         <version.wildfly>33.0.1.Final</version.wildfly>
         <version.wildfly.cloud.galleon.pack>7.0.1.Final</version.wildfly.cloud.galleon.pack>
-        <version.wildfly.plugin>5.0.0.Final</version.wildfly.plugin>
+        <version.wildfly.plugin>5.0.1.Final</version.wildfly.plugin>
     </properties>
 
     <dependencies>

diff --git a/test/test-app-multi-deployments-invalid/pom.xml b/test/test-app-multi-deployments-invalid/pom.xml
@@ -15,7 +15,7 @@
         <version.maven.war.plugin>3.3.2</version.maven.war.plugin>
         <version.wildfly>33.0.1.Final</version.wildfly>
         <version.wildfly.cloud.galleon.pack>7.0.1.Final</version.wildfly.cloud.galleon.pack>
-        <version.wildfly.plugin>5.0.0.Final</version.wildfly.plugin>
+        <version.wildfly.plugin>5.0.1.Final</version.wildfly.plugin>
     </properties>
 
     <modules>

diff --git a/test/test-app-multi-deployments-legacy/pom.xml b/test/test-app-multi-deployments-legacy/pom.xml
@@ -15,7 +15,7 @@
         <version.maven.war.plugin>3.3.2</version.maven.war.plugin>
         <version.wildfly>33.0.1.Final</version.wildfly>
         <version.wildfly.cloud.galleon.pack>7.0.1.Final</version.wildfly.cloud.galleon.pack>
-        <version.wildfly.plugin>5.0.0.Final</version.wildfly.plugin>
+        <version.wildfly.plugin>5.0.1.Final</version.wildfly.plugin>
     </properties>
 
     <modules>

diff --git a/test/test-app-multi-deployments/pom.xml b/test/test-app-multi-deployments/pom.xml
@@ -15,7 +15,7 @@
         <version.maven.war.plugin>3.3.2</version.maven.war.plugin>
         <version.wildfly>33.0.1.Final</version.wildfly>
         <version.wildfly.cloud.galleon.pack>7.0.1.Final</version.wildfly.cloud.galleon.pack>
-        <version.wildfly.plugin>5.0.0.Final</version.wildfly.plugin>
+        <version.wildfly.plugin>5.0.1.Final</version.wildfly.plugin>
     </properties>
 
     <modules>

diff --git a/test/test-app-multi-deployments2/pom.xml b/test/test-app-multi-deployments2/pom.xml
@@ -15,7 +15,7 @@
         <version.maven.war.plugin>3.3.2</version.maven.war.plugin>
         <version.wildfly>33.0.1.Final</version.wildfly>
         <version.wildfly.cloud.galleon.pack>7.0.1.Final</version.wildfly.cloud.galleon.pack>
-        <version.wildfly.plugin>5.0.0.Final</version.wildfly.plugin>
+        <version.wildfly.plugin>5.0.1.Final</version.wildfly.plugin>
     </properties>
 
     <modules>

diff --git a/test/test-app-multi-deployments3/pom.xml b/test/test-app-multi-deployments3/pom.xml
@@ -15,7 +15,7 @@
         <version.maven.war.plugin>3.3.2</version.maven.war.plugin>
         <version.wildfly>33.0.1.Final</version.wildfly>
         <version.wildfly.cloud.galleon.pack>7.0.1.Final</version.wildfly.cloud.galleon.pack>
-        <version.wildfly.plugin>5.0.0.Final</version.wildfly.plugin>
+        <version.wildfly.plugin>5.0.1.Final</version.wildfly.plugin>
     </properties>
 
     <modules>

diff --git a/test/test-app-postgres/pom.xml b/test/test-app-postgres/pom.xml
@@ -34,7 +34,7 @@
         <version.wildfly>33.0.1.Final</version.wildfly>
         <version.wildfly.datasources.galleon.pack>8.0.1.Final</version.wildfly.datasources.galleon.pack>
         <version.wildfly.cloud.galleon.pack>7.0.1.Final</version.wildfly.cloud.galleon.pack>
-        <version.wildfly.plugin>5.0.0.Final</version.wildfly.plugin>
+        <version.wildfly.plugin>5.0.1.Final</version.wildfly.plugin>
     </properties>
 
     <description>This project demonstrates how to implement a JAX-RS service that uses JPA persistence to manage tasks</description>

diff --git a/test/test-app-postgresql-mysql/pom.xml b/test/test-app-postgresql-mysql/pom.xml
@@ -17,7 +17,7 @@
         <version.wildfly>33.0.1.Final</version.wildfly>
         <version.wildfly.cloud.galleon.pack>7.0.1.Final</version.wildfly.cloud.galleon.pack>
         <version.wildfly.datasources.galleon.pack>8.0.1.Final</version.wildfly.datasources.galleon.pack>
-        <version.wildfly.plugin>5.0.0.Final</version.wildfly.plugin>
+        <version.wildfly.plugin>5.0.1.Final</version.wildfly.plugin>
     </properties>
 
     <dependencies>

diff --git a/test/test-app-settings/pom.xml b/test/test-app-settings/pom.xml
@@ -32,7 +32,7 @@
         <version.maven.war.plugin>3.3.2</version.maven.war.plugin>
         <version.wildfly>33.0.1.Final</version.wildfly>
         <version.wildfly.cloud.galleon.pack>7.0.1.Final</version.wildfly.cloud.galleon.pack>
-        <version.wildfly.plugin>5.0.0.Final</version.wildfly.plugin>
+        <version.wildfly.plugin>5.0.1.Final</version.wildfly.plugin>
     </properties>
 
     <description>This project demonstrates how to implement a JAX-RS service that uses JPA persistence to manage tasks</description>

diff --git a/test/test-app-slim/pom.xml b/test/test-app-slim/pom.xml
@@ -16,7 +16,7 @@
         <version.maven.war.plugin>3.3.2</version.maven.war.plugin>
         <version.wildfly>33.0.1.Final</version.wildfly>
         <version.wildfly.cloud.galleon.pack>7.0.1.Final</version.wildfly.cloud.galleon.pack>
-        <version.wildfly.plugin>5.0.0.Final</version.wildfly.plugin>
+        <version.wildfly.plugin>5.0.1.Final</version.wildfly.plugin>
     </properties>
 
     <dependencies>

diff --git a/test/test-app-stability-preview/pom.xml b/test/test-app-stability-preview/pom.xml
@@ -36,7 +36,7 @@
     <properties>
         <version.wildfly>33.0.1.Final</version.wildfly>
         <version.wildfly.cloud.galleon.pack>7.0.1.Final</version.wildfly.cloud.galleon.pack>
-        <version.wildfly.plugin>5.0.0.Final</version.wildfly.plugin>
+        <version.wildfly.plugin>5.0.1.Final</version.wildfly.plugin>
     </properties>
     <build>
         <plugins>

diff --git a/test/test-app/pom.xml b/test/test-app/pom.xml
@@ -16,7 +16,7 @@
         <version.maven.war.plugin>3.3.2</version.maven.war.plugin>
         <version.wildfly>33.0.1.Final</version.wildfly>
         <version.wildfly.cloud.galleon.pack>7.0.1.Final</version.wildfly.cloud.galleon.pack>
-        <version.wildfly.plugin>5.0.0.Final</version.wildfly.plugin>
+        <version.wildfly.plugin>5.0.1.Final</version.wildfly.plugin>
     </properties>
 
     <dependencies>

diff --git a/test/vanilla-wildfly/test-app-s2i-cli-scripts/pom.xml b/test/vanilla-wildfly/test-app-s2i-cli-scripts/pom.xml
@@ -10,7 +10,7 @@
 
     <properties>
         <version.wildfly>33.0.1.Final</version.wildfly>
-        <version.wildfly.plugin>5.0.0.Final</version.wildfly.plugin>
+        <version.wildfly.plugin>5.0.1.Final</version.wildfly.plugin>
     </properties>
     <build>
         <plugins>

diff --git a/test/vanilla-wildfly/test-app/pom.xml b/test/vanilla-wildfly/test-app/pom.xml
@@ -15,7 +15,7 @@
         <jakarta.jakartaee-api.version>10.0.0</jakarta.jakartaee-api.version>
         <version.maven.war.plugin>3.3.2</version.maven.war.plugin>
         <version.wildfly>33.0.1.Final</version.wildfly>
-        <version.wildfly.plugin>5.0.0.Final</version.wildfly.plugin>
+        <version.wildfly.plugin>5.0.1.Final</version.wildfly.plugin>
     </properties>
 
     <dependencies>

diff --git a/wildfly-builder-image/image.yaml b/wildfly-builder-image/image.yaml
@@ -35,7 +35,7 @@ envs:
     - name: PROVISIONING_MAVEN_PLUGIN_ARTIFACT_ID
       value: wildfly-maven-plugin
     - name: PROVISIONING_MAVEN_PLUGIN_VERSION
-      value: 5.0.0.Final
+      value: 5.0.1.Final
 ports:
     - value: 8080
 modules:
@@ -47,7 +47,7 @@ modules:
           - name: wildfly-cekit-modules
             git:
               url: https://github.com/wildfly/wildfly-cekit-modules
-              ref: 0.33.0
+              ref: main
           - name: wildfly-modules
             path: ../wildfly-modules
       install:

diff --git a/wildfly-builder-image/jdk11-overrides.yaml b/wildfly-builder-image/jdk11-overrides.yaml
@@ -1,7 +1,7 @@
 schema_version: 1
 
 description: "The WildFly s2i builder image, JDK 11"
-version: &imgVersion "2.0.0-jdk11"
+version: &imgVersion "2.0.1-jdk11-snapshot"
 labels:
     - name: io.k8s.display-name
       value: "WildFly s2i builder image, JDK 11"

diff --git a/wildfly-builder-image/jdk17-overrides.yaml b/wildfly-builder-image/jdk17-overrides.yaml
@@ -1,7 +1,7 @@
 schema_version: 1
 
 description: "The WildFly s2i builder image, JDK 17"
-version: &imgVersion "2.0.0-jdk17"
+version: &imgVersion "2.0.1-jdk17-snapshot"
 labels:
     - name: io.k8s.display-name
       value: "WildFly s2i builder image, JDK 17"

diff --git a/wildfly-builder-image/jdk21-overrides.yaml b/wildfly-builder-image/jdk21-overrides.yaml
@@ -1,7 +1,7 @@
 schema_version: 1
 
 description: "The WildFly s2i builder image, JDK 21"
-version: &imgVersion "2.0.0-jdk21"
+version: &imgVersion "2.0.1-jdk21-snapshot"
 labels:
     - name: io.k8s.display-name
       value: "WildFly s2i builder image, JDK 21"

diff --git a/wildfly-runtime-image/image.yaml b/wildfly-runtime-image/image.yaml
@@ -31,11 +31,11 @@ modules:
           - name: openjdk
             git:
               url: https://github.com/jboss-container-images/openjdk
-              ref: ubi9-wildfly-container-33.0
+              ref: ubi9
           - name: wildfly-cekit-modules
             git:
               url: https://github.com/wildfly/wildfly-cekit-modules
-              ref: 0.33.0
+              ref: main
           - name: wildfly-modules
             path: ../wildfly-modules
       install:

diff --git a/wildfly-runtime-image/jdk11-overrides.yaml b/wildfly-runtime-image/jdk11-overrides.yaml
@@ -1,7 +1,7 @@
 schema_version: 1
 
 description: "The WildFly runtime image, JDK 11"
-version: &imgVersion "2.0.0-jdk11"
+version: &imgVersion "2.0.1-jdk11-snapshot"
 labels:
   - name: "org.jboss.product.version"
     value: *imgVersion

diff --git a/wildfly-runtime-image/jdk17-overrides.yaml b/wildfly-runtime-image/jdk17-overrides.yaml
@@ -1,7 +1,7 @@
 schema_version: 1
 
 description: "The WildFly runtime image, JDK 17"
-version: &imgVersion "2.0.0-jdk17"
+version: &imgVersion "2.0.1-jdk17-snapshot"
 labels:
   - name: "org.jboss.product.version"
     value: *imgVersion

diff --git a/wildfly-runtime-image/jdk21-overrides.yaml b/wildfly-runtime-image/jdk21-overrides.yaml
@@ -1,7 +1,7 @@
 schema_version: 1
 
 description: "The WildFly runtime image, JDK 21"
-version: &imgVersion "2.0.0-jdk21"
+version: &imgVersion "2.0.1-jdk21-snapshot"
 labels:
   - name: "org.jboss.product.version"
     value: *imgVersion