Merge pull request #716 from WASdev/gk-conflicts

Fixing conflicts

Author: leochr

.secrets.baseline

@@ -3,7 +3,7 @@
     "files": "^.secrets.baseline$",
     "lines": "fbf6a96d49214c0abc6a3bc5da6e48cd|REPLACE|PWD_TRUST|SECRET|keyStore|secret|rootpwd|dbpassword"
   },
-  "generated_at": "2025-08-22T19:43:14Z",
+  "generated_at": "2025-09-11T13:25:02Z",
   "plugins_used": [
     {
       "name": "AWSKeyDetector"

docs/icr-images.md

@@ -18,7 +18,7 @@ The `latest` tag simplifies pulling the full latest Open Liberty release with th
 
 Append a tag to `icr.io/appcafe/websphere-liberty` to pull a specific image. For example, 
 ```
-icr.io/appcafe/websphere-liberty:25.0.0.3-kernel-java17-openj9-ubi
+icr.io/appcafe/websphere-liberty:25.0.0.9-kernel-java17-openj9-ubi
 ```
 
 Available images can be listed using [IBM Cloud CLI](https://cloud.ibm.com/docs/cli?topic=cli-getting-started). Log in with your IBMid prior to running the following commands. Note that authentication is only required to list the images. **Images can be pulled from ICR without authentication** : 
@@ -30,7 +30,7 @@ ibmcloud cr images --restrict appcafe/websphere-liberty
 
 ## Latest version
 
-The following tags include the most recent WebSphere Liberty version: `25.0.0.5` 
+The following tags include the most recent WebSphere Liberty version: `25.0.0.9` 
 
 ```
 kernel-java21-openj9-ubi-minimal
@@ -58,30 +58,56 @@ full-java8-ibmjava-ubi
 latest
 ```
 
-## 25.0.0.5
+## 25.0.0.9
 
 ```
-25.0.0.5-kernel-java21-openj9-ubi-minimal
-25.0.0.5-kernel-java17-openj9-ubi-minimal
-25.0.0.5-kernel-java11-openj9-ubi-minimal
-25.0.0.5-kernel-java8-openj9-ubi-minimal
-25.0.0.5-kernel-java8-ibmjava-ubi-minimal
-
-25.0.0.5-kernel-java17-openj9-ubi
-25.0.0.5-kernel-java11-openj9-ubi
-25.0.0.5-kernel-java8-openj9-ubi
-25.0.0.5-kernel-java8-ibmjava-ubi
-
-25.0.0.5-full-java21-openj9-ubi-minimal
-25.0.0.5-full-java17-openj9-ubi-minimal
-25.0.0.5-full-java11-openj9-ubi-minimal
-25.0.0.5-full-java8-openj9-ubi-minimal
-25.0.0.5-full-java8-ibmjava-ubi-minimal
-
-25.0.0.5-full-java17-openj9-ubi
-25.0.0.5-full-java11-openj9-ubi
-25.0.0.5-full-java8-openj9-ubi
-25.0.0.5-full-java8-ibmjava-ubi
+25.0.0.9-kernel-java21-openj9-ubi-minimal
+25.0.0.9-kernel-java17-openj9-ubi-minimal
+25.0.0.9-kernel-java11-openj9-ubi-minimal
+25.0.0.9-kernel-java8-openj9-ubi-minimal
+25.0.0.9-kernel-java8-ibmjava-ubi-minimal
+
+25.0.0.9-kernel-java17-openj9-ubi
+25.0.0.9-kernel-java11-openj9-ubi
+25.0.0.9-kernel-java8-openj9-ubi
+25.0.0.9-kernel-java8-ibmjava-ubi
+
+25.0.0.9-full-java21-openj9-ubi-minimal
+25.0.0.9-full-java17-openj9-ubi-minimal
+25.0.0.9-full-java11-openj9-ubi-minimal
+25.0.0.9-full-java8-openj9-ubi-minimal
+25.0.0.9-full-java8-ibmjava-ubi-minimal
+
+25.0.0.9-full-java17-openj9-ubi
+25.0.0.9-full-java11-openj9-ubi
+25.0.0.9-full-java8-openj9-ubi
+25.0.0.9-full-java8-ibmjava-ubi
+```
+
+## 25.0.0.6
+
+```
+25.0.0.6-kernel-java21-openj9-ubi-minimal
+25.0.0.6-kernel-java17-openj9-ubi-minimal
+25.0.0.6-kernel-java11-openj9-ubi-minimal
+25.0.0.6-kernel-java8-openj9-ubi-minimal
+25.0.0.6-kernel-java8-ibmjava-ubi-minimal
+
+25.0.0.6-kernel-java17-openj9-ubi
+25.0.0.6-kernel-java11-openj9-ubi
+25.0.0.6-kernel-java8-openj9-ubi
+25.0.0.6-kernel-java8-ibmjava-ubi
+
+25.0.0.6-full-java21-openj9-ubi-minimal
+25.0.0.6-full-java17-openj9-ubi-minimal
+25.0.0.6-full-java11-openj9-ubi-minimal
+25.0.0.6-full-java8-openj9-ubi-minimal
+25.0.0.6-full-java8-ibmjava-ubi-minimal
+
+25.0.0.6-full-java17-openj9-ubi
+25.0.0.6-full-java11-openj9-ubi
+25.0.0.6-full-java8-openj9-ubi
+25.0.0.6-full-java8-ibmjava-ubi
 ```
 
 ## 25.0.0.3
@@ -99,19 +125,3 @@ latest
 25.0.0.3-full-java8-openj9-ubi
 25.0.0.3-full-java8-ibmjava-ubi
 ```
-
-## 24.0.0.12
-
-```
-24.0.0.12-kernel-java21-openj9-ubi-minimal
-24.0.0.12-kernel-java17-openj9-ubi
-24.0.0.12-kernel-java11-openj9-ubi
-24.0.0.12-kernel-java8-ibmjava-ubi
-24.0.0.12-kernel-java8-openj9-ubi
-
-24.0.0.12-full-java21-openj9-ubi-minimal
-24.0.0.12-full-java17-openj9-ubi
-24.0.0.12-full-java11-openj9-ubi
-24.0.0.12-full-java8-openj9-ubi
-24.0.0.12-full-java8-ibmjava-ubi
-```