From a6c99b98dffa0182b966cbe671fd59aed3d3694e Mon Sep 17 00:00:00 2001
From: Jean Francois Denise <jdenise@jdenise-thinkpadp1gen3.rmtfr.csb>
Date: Fri, 12 Apr 2024 14:15:37 +0200
Subject: [PATCH] Release 1.1.5-jdk

---
 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 fc3cda17..e6da659d 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: ubi8
+              ref: wildfly-container-32.0
           - name: wildfly-cekit-modules
             git:
               url: https://github.com/wildfly/wildfly-cekit-modules
-              ref: main
+              ref: 0.32.0
           - name: wildfly-modules
             path: ../wildfly-modules
       install:
diff --git a/wildfly-builder-image/jdk11-overrides.yaml b/wildfly-builder-image/jdk11-overrides.yaml
index dd4bf3fc..505a0c5c 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 "1.1.5-jdk11-snapshot"
+version: &imgVersion "1.1.5-jdk11"
 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 5bcb9e0f..bfd5753c 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 "1.1.5-jdk17-snapshot"
+version: &imgVersion "1.1.5-jdk17"
 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 acf5b59c..dbeb7574 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 "1.1.5-jdk21-snapshot"
+version: &imgVersion "1.1.5-jdk21"
 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 8cffde8a..2b13a04f 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: ubi8
+              ref: wildfly-container-32.0
           - name: wildfly-cekit-modules
             git:
               url: https://github.com/wildfly/wildfly-cekit-modules
-              ref: main
+              ref: 0.32.0
           - name: wildfly-modules
             path: ../wildfly-modules
       install:
diff --git a/wildfly-runtime-image/jdk11-overrides.yaml b/wildfly-runtime-image/jdk11-overrides.yaml
index 3ac8224c..723013d9 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 "1.1.5-jdk11-snapshot"
+version: &imgVersion "1.1.5-jdk11"
 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 2c3f99a9..8bcde63f 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 "1.1.5-jdk17-snapshot"
+version: &imgVersion "1.1.5-jdk17"
 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 7e4df997..7d26c8a9 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 "1.1.5-jdk21-snapshot"
+version: &imgVersion "1.1.5-jdk21"
 labels:
   - name: "org.jboss.product.version"
     value: *imgVersion