From 0f2e14cf6b808e2bc45dc5a21bfbe0e3456382e5 Mon Sep 17 00:00:00 2001 From: Jean-Francois Denise Date: Wed, 11 Sep 2024 09:40:31 +0200 Subject: [PATCH 1/3] Fix openjdk tag --- release_process.md | 2 +- wildfly-builder-image/image.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/release_process.md b/release_process.md index bfe164b2..2e7b6df3 100644 --- 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/wildfly-builder-image/image.yaml b/wildfly-builder-image/image.yaml index cfe0d0ce..448adf5e 100644 --- a/wildfly-builder-image/image.yaml +++ b/wildfly-builder-image/image.yaml @@ -43,7 +43,7 @@ modules: - name: openjdk git: url: https://github.com/jboss-container-images/openjdk - ref: ubi9 + ref: ubi9-wildfly-container-33.0 - name: wildfly-cekit-modules git: url: https://github.com/wildfly/wildfly-cekit-modules From 12013b983866140627c78429d7f422ea67de6d30 Mon Sep 17 00:00:00 2001 From: Jean-Francois Denise Date: Wed, 11 Sep 2024 09:45:28 +0200 Subject: [PATCH 2/3] Next version is 2.0.1 --- wildfly-builder-image/image.yaml | 4 ++-- wildfly-builder-image/jdk11-overrides.yaml | 2 +- wildfly-builder-image/jdk17-overrides.yaml | 2 +- wildfly-builder-image/jdk21-overrides.yaml | 2 +- wildfly-runtime-image/image.yaml | 4 ++-- wildfly-runtime-image/jdk11-overrides.yaml | 2 +- wildfly-runtime-image/jdk17-overrides.yaml | 2 +- wildfly-runtime-image/jdk21-overrides.yaml | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/wildfly-builder-image/image.yaml b/wildfly-builder-image/image.yaml index 448adf5e..7cd64414 100644 --- a/wildfly-builder-image/image.yaml +++ b/wildfly-builder-image/image.yaml @@ -43,11 +43,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-builder-image/jdk11-overrides.yaml b/wildfly-builder-image/jdk11-overrides.yaml index ffdb855f..b5bbec2e 100644 --- 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 index d11a769a..97ce4d6c 100644 --- 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 index e9bae2ff..778a811b 100644 --- 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 index 775581ff..30402b8c 100644 --- 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 index 26747f5a..7a83462c 100644 --- 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 index 7fefac9e..8412a724 100644 --- 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 index 722d3139..7b7ac08f 100644 --- 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 From 6e2243266089dc3466c2bba256cb21e99389ec04 Mon Sep 17 00:00:00 2001 From: Jean-Francois Denise Date: Wed, 11 Sep 2024 09:47:18 +0200 Subject: [PATCH 3/3] Upgrade test pass to WildFly Maven Plugin 5.0.1.Final --- test/test-app-advanced-extensions/pom.xml | 2 +- test/test-app-clustering/pom.xml | 2 +- test/test-app-default-config/pom.xml | 2 +- test/test-app-ejb/pom.xml | 2 +- test/test-app-elytron-oidc-client/pom.xml | 2 +- test/test-app-extension/pom.xml | 2 +- test/test-app-extension2/pom.xml | 2 +- test/test-app-invalid/pom.xml | 2 +- test/test-app-jpa2lc/pom.xml | 2 +- test/test-app-keycloak-saml/pom.xml | 2 +- test/test-app-mdb/pom.xml | 2 +- test/test-app-multi-deployments-invalid/pom.xml | 2 +- test/test-app-multi-deployments-legacy/pom.xml | 2 +- test/test-app-multi-deployments/pom.xml | 2 +- test/test-app-multi-deployments2/pom.xml | 2 +- test/test-app-multi-deployments3/pom.xml | 2 +- test/test-app-postgres/pom.xml | 2 +- test/test-app-postgresql-mysql/pom.xml | 2 +- test/test-app-settings/pom.xml | 2 +- test/test-app-slim/pom.xml | 2 +- test/test-app-stability-preview/pom.xml | 2 +- test/test-app/pom.xml | 2 +- test/vanilla-wildfly/test-app-s2i-cli-scripts/pom.xml | 2 +- test/vanilla-wildfly/test-app/pom.xml | 2 +- wildfly-builder-image/image.yaml | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/test/test-app-advanced-extensions/pom.xml b/test/test-app-advanced-extensions/pom.xml index 6c2c0883..41f9bdd9 100644 --- a/test/test-app-advanced-extensions/pom.xml +++ b/test/test-app-advanced-extensions/pom.xml @@ -32,7 +32,7 @@ 3.3.2 33.0.1.Final 7.0.1.Final - 5.0.0.Final + 5.0.1.Final This project demonstrates how to implement a JAX-RS service that uses JPA persistence to manage tasks diff --git a/test/test-app-clustering/pom.xml b/test/test-app-clustering/pom.xml index 9921ad5e..3f4fa64c 100644 --- a/test/test-app-clustering/pom.xml +++ b/test/test-app-clustering/pom.xml @@ -16,7 +16,7 @@ 3.3.2 33.0.1.Final 7.0.1.Final - 5.0.0.Final + 5.0.1.Final diff --git a/test/test-app-default-config/pom.xml b/test/test-app-default-config/pom.xml index 746f1d23..d1355405 100644 --- a/test/test-app-default-config/pom.xml +++ b/test/test-app-default-config/pom.xml @@ -36,7 +36,7 @@ 33.0.1.Final 7.0.1.Final - 5.0.0.Final + 5.0.1.Final diff --git a/test/test-app-ejb/pom.xml b/test/test-app-ejb/pom.xml index 0eae4509..d7034b82 100644 --- a/test/test-app-ejb/pom.xml +++ b/test/test-app-ejb/pom.xml @@ -18,7 +18,7 @@ 3.3.2 33.0.1.Final 7.0.1.Final - 5.0.0.Final + 5.0.1.Final diff --git a/test/test-app-elytron-oidc-client/pom.xml b/test/test-app-elytron-oidc-client/pom.xml index 6b80c395..d428a525 100644 --- a/test/test-app-elytron-oidc-client/pom.xml +++ b/test/test-app-elytron-oidc-client/pom.xml @@ -17,7 +17,7 @@ 3.3.2 33.0.1.Final 7.0.1.Final - 5.0.0.Final + 5.0.1.Final diff --git a/test/test-app-extension/pom.xml b/test/test-app-extension/pom.xml index d1316ce1..4e99a69c 100644 --- a/test/test-app-extension/pom.xml +++ b/test/test-app-extension/pom.xml @@ -32,7 +32,7 @@ 3.3.2 33.0.1.Final 7.0.1.Final - 5.0.0.Final + 5.0.1.Final This project demonstrates how to implement a JAX-RS service that uses JPA persistence to manage tasks diff --git a/test/test-app-extension2/pom.xml b/test/test-app-extension2/pom.xml index de5cfaef..6c8dc307 100644 --- a/test/test-app-extension2/pom.xml +++ b/test/test-app-extension2/pom.xml @@ -32,7 +32,7 @@ 3.3.2 33.0.1.Final 7.0.1.Final - 5.0.0.Final + 5.0.1.Final This project demonstrates how to implement a JAX-RS service that uses JPA persistence to manage tasks diff --git a/test/test-app-invalid/pom.xml b/test/test-app-invalid/pom.xml index ed4d5b96..bed282ae 100644 --- a/test/test-app-invalid/pom.xml +++ b/test/test-app-invalid/pom.xml @@ -16,7 +16,7 @@ 3.3.2 33.0.1.Final 7.0.1.Final - 5.0.0.Final + 5.0.1.Final diff --git a/test/test-app-jpa2lc/pom.xml b/test/test-app-jpa2lc/pom.xml index 6080c152..41a488de 100644 --- a/test/test-app-jpa2lc/pom.xml +++ b/test/test-app-jpa2lc/pom.xml @@ -18,7 +18,7 @@ 3.3.2 33.0.1.Final 7.0.1.Final - 5.0.0.Final + 5.0.1.Final diff --git a/test/test-app-keycloak-saml/pom.xml b/test/test-app-keycloak-saml/pom.xml index 507ceead..144b4dc5 100644 --- a/test/test-app-keycloak-saml/pom.xml +++ b/test/test-app-keycloak-saml/pom.xml @@ -14,7 +14,7 @@ 11 3.3.2 33.0.1.Final - 5.0.0.Final + 5.0.1.Final 7.0.1.Final 10.0.0 23.0.0 diff --git a/test/test-app-mdb/pom.xml b/test/test-app-mdb/pom.xml index bf42787c..6159b795 100644 --- a/test/test-app-mdb/pom.xml +++ b/test/test-app-mdb/pom.xml @@ -35,7 +35,7 @@ 3.3.2 33.0.1.Final 7.0.1.Final - 5.0.0.Final + 5.0.1.Final diff --git a/test/test-app-multi-deployments-invalid/pom.xml b/test/test-app-multi-deployments-invalid/pom.xml index 407ad7b4..ffb395fe 100644 --- a/test/test-app-multi-deployments-invalid/pom.xml +++ b/test/test-app-multi-deployments-invalid/pom.xml @@ -15,7 +15,7 @@ 3.3.2 33.0.1.Final 7.0.1.Final - 5.0.0.Final + 5.0.1.Final diff --git a/test/test-app-multi-deployments-legacy/pom.xml b/test/test-app-multi-deployments-legacy/pom.xml index 1d2fb89f..b6dafa11 100644 --- a/test/test-app-multi-deployments-legacy/pom.xml +++ b/test/test-app-multi-deployments-legacy/pom.xml @@ -15,7 +15,7 @@ 3.3.2 33.0.1.Final 7.0.1.Final - 5.0.0.Final + 5.0.1.Final diff --git a/test/test-app-multi-deployments/pom.xml b/test/test-app-multi-deployments/pom.xml index 407ad7b4..ffb395fe 100644 --- a/test/test-app-multi-deployments/pom.xml +++ b/test/test-app-multi-deployments/pom.xml @@ -15,7 +15,7 @@ 3.3.2 33.0.1.Final 7.0.1.Final - 5.0.0.Final + 5.0.1.Final diff --git a/test/test-app-multi-deployments2/pom.xml b/test/test-app-multi-deployments2/pom.xml index 407ad7b4..ffb395fe 100644 --- a/test/test-app-multi-deployments2/pom.xml +++ b/test/test-app-multi-deployments2/pom.xml @@ -15,7 +15,7 @@ 3.3.2 33.0.1.Final 7.0.1.Final - 5.0.0.Final + 5.0.1.Final diff --git a/test/test-app-multi-deployments3/pom.xml b/test/test-app-multi-deployments3/pom.xml index 407ad7b4..ffb395fe 100644 --- a/test/test-app-multi-deployments3/pom.xml +++ b/test/test-app-multi-deployments3/pom.xml @@ -15,7 +15,7 @@ 3.3.2 33.0.1.Final 7.0.1.Final - 5.0.0.Final + 5.0.1.Final diff --git a/test/test-app-postgres/pom.xml b/test/test-app-postgres/pom.xml index 0a1ded2c..ff238785 100644 --- a/test/test-app-postgres/pom.xml +++ b/test/test-app-postgres/pom.xml @@ -34,7 +34,7 @@ 33.0.1.Final 8.0.1.Final 7.0.1.Final - 5.0.0.Final + 5.0.1.Final This project demonstrates how to implement a JAX-RS service that uses JPA persistence to manage tasks diff --git a/test/test-app-postgresql-mysql/pom.xml b/test/test-app-postgresql-mysql/pom.xml index 594fa657..3dac77a9 100644 --- a/test/test-app-postgresql-mysql/pom.xml +++ b/test/test-app-postgresql-mysql/pom.xml @@ -17,7 +17,7 @@ 33.0.1.Final 7.0.1.Final 8.0.1.Final - 5.0.0.Final + 5.0.1.Final diff --git a/test/test-app-settings/pom.xml b/test/test-app-settings/pom.xml index 68b8595c..63f56ac1 100644 --- a/test/test-app-settings/pom.xml +++ b/test/test-app-settings/pom.xml @@ -32,7 +32,7 @@ 3.3.2 33.0.1.Final 7.0.1.Final - 5.0.0.Final + 5.0.1.Final This project demonstrates how to implement a JAX-RS service that uses JPA persistence to manage tasks diff --git a/test/test-app-slim/pom.xml b/test/test-app-slim/pom.xml index 4f0428a7..c0bff1f7 100644 --- a/test/test-app-slim/pom.xml +++ b/test/test-app-slim/pom.xml @@ -16,7 +16,7 @@ 3.3.2 33.0.1.Final 7.0.1.Final - 5.0.0.Final + 5.0.1.Final diff --git a/test/test-app-stability-preview/pom.xml b/test/test-app-stability-preview/pom.xml index 083d0cf4..cb523b75 100644 --- a/test/test-app-stability-preview/pom.xml +++ b/test/test-app-stability-preview/pom.xml @@ -36,7 +36,7 @@ 33.0.1.Final 7.0.1.Final - 5.0.0.Final + 5.0.1.Final diff --git a/test/test-app/pom.xml b/test/test-app/pom.xml index c221fd9b..4545d51b 100644 --- a/test/test-app/pom.xml +++ b/test/test-app/pom.xml @@ -16,7 +16,7 @@ 3.3.2 33.0.1.Final 7.0.1.Final - 5.0.0.Final + 5.0.1.Final diff --git a/test/vanilla-wildfly/test-app-s2i-cli-scripts/pom.xml b/test/vanilla-wildfly/test-app-s2i-cli-scripts/pom.xml index 33dec49d..51abe141 100644 --- 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 @@ 33.0.1.Final - 5.0.0.Final + 5.0.1.Final diff --git a/test/vanilla-wildfly/test-app/pom.xml b/test/vanilla-wildfly/test-app/pom.xml index 44d0359d..539dcc32 100644 --- a/test/vanilla-wildfly/test-app/pom.xml +++ b/test/vanilla-wildfly/test-app/pom.xml @@ -15,7 +15,7 @@ 10.0.0 3.3.2 33.0.1.Final - 5.0.0.Final + 5.0.1.Final diff --git a/wildfly-builder-image/image.yaml b/wildfly-builder-image/image.yaml index 7cd64414..843c96dc 100644 --- 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: