Merge vNext to main

.gitignore

@@ -1,3 +1,3 @@
 # Ignore .DS_Store 
 .DS_Store
-#ga/*/*/resources/*
+ga/*/*/resources/*

.pre-commit-config.yaml

@@ -18,4 +18,11 @@ repos:
         # when "--baseline" without "--use-all-plugins", pre-commit scan with just plugins in baseline file
         # when "--baseline" with "--use-all-plugins", pre-commit scan with all available plugins
         # add "--fail-on-unaudited" to fail pre-commit for unaudited potential secrets
-        args: [--baseline, .secrets.baseline, --use-all-plugins]
+        args: [--baseline, .secrets.baseline, --use-all-plugins]
+  - repo: local
+    hooks:
+      - id: no-gitignore-commit
+        name: Prevent .gitignore from getting committed
+        entry: ".gitignore file commit detected"
+        language: fail
+        files: ^.gitignore$

.secrets.baseline

@@ -3,7 +3,7 @@
     "files": "^.secrets.baseline$",
     "lines": "fbf6a96d49214c0abc6a3bc5da6e48cd|REPLACE|PWD_TRUST|SECRET|keyStore|secret|rootpwd|dbpassword"
   },
-  "generated_at": "2026-04-08T10:03:43Z",
+  "generated_at": "2026-05-15T15:51:08Z",
   "plugins_used": [
     {
       "name": "AWSKeyDetector"
@@ -651,7 +651,7 @@
         "verified_result": null
       }
     ],
-    "ga/26.0.0.4/full/server.xml": [
+    "ga/26.0.0.5/full/server.xml": [
       {
         "hashed_secret": "d1bbd0d69a08402e6c1fc2d1bc5a5ea5c3a7ea13",
         "is_secret": false,
@@ -661,7 +661,7 @@
         "verified_result": null
       }
     ],
-    "ga/26.0.0.4/kernel/Dockerfile.ubi.ibmjava8": [
+    "ga/26.0.0.5/kernel/Dockerfile.ubi.ibmjava8": [
       {
         "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
         "is_secret": false,
@@ -671,7 +671,7 @@
         "verified_result": null
       }
     ],
-    "ga/26.0.0.4/kernel/Dockerfile.ubi.openjdk11": [
+    "ga/26.0.0.5/kernel/Dockerfile.ubi.openjdk11": [
       {
         "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
         "is_secret": false,
@@ -681,7 +681,7 @@
         "verified_result": null
       }
     ],
-    "ga/26.0.0.4/kernel/Dockerfile.ubi.openjdk17": [
+    "ga/26.0.0.5/kernel/Dockerfile.ubi.openjdk17": [
       {
         "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
         "is_secret": false,
@@ -691,7 +691,7 @@
         "verified_result": null
       }
     ],
-    "ga/26.0.0.4/kernel/Dockerfile.ubi.openjdk8": [
+    "ga/26.0.0.5/kernel/Dockerfile.ubi.openjdk8": [
       {
         "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
         "is_secret": false,
@@ -701,7 +701,7 @@
         "verified_result": null
       }
     ],
-    "ga/26.0.0.4/kernel/Dockerfile.ubi9-minimal.ibmjava8": [
+    "ga/26.0.0.5/kernel/Dockerfile.ubi9-minimal.ibmjava8": [
       {
         "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
         "is_secret": false,
@@ -711,7 +711,7 @@
         "verified_result": null
       }
     ],
-    "ga/26.0.0.4/kernel/Dockerfile.ubi9-minimal.openjdk11": [
+    "ga/26.0.0.5/kernel/Dockerfile.ubi9-minimal.openjdk11": [
       {
         "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
         "is_secret": false,
@@ -721,7 +721,7 @@
         "verified_result": null
       }
     ],
-    "ga/26.0.0.4/kernel/Dockerfile.ubi9-minimal.openjdk17": [
+    "ga/26.0.0.5/kernel/Dockerfile.ubi9-minimal.openjdk17": [
       {
         "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
         "is_secret": false,
@@ -731,7 +731,7 @@
         "verified_result": null
       }
     ],
-    "ga/26.0.0.4/kernel/Dockerfile.ubi9-minimal.openjdk21": [
+    "ga/26.0.0.5/kernel/Dockerfile.ubi9-minimal.openjdk21": [
       {
         "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
         "is_secret": false,
@@ -741,7 +741,7 @@
         "verified_result": null
       }
     ],
-    "ga/26.0.0.4/kernel/Dockerfile.ubi9-minimal.openjdk25": [
+    "ga/26.0.0.5/kernel/Dockerfile.ubi9-minimal.openjdk25": [
       {
         "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
         "is_secret": false,
@@ -751,7 +751,7 @@
         "verified_result": null
       }
     ],
-    "ga/26.0.0.4/kernel/Dockerfile.ubi9-minimal.openjdk8": [
+    "ga/26.0.0.5/kernel/Dockerfile.ubi9-minimal.openjdk8": [
       {
         "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
         "is_secret": false,
@@ -761,7 +761,7 @@
         "verified_result": null
       }
     ],
-    "ga/26.0.0.4/kernel/Dockerfile.ubuntu.ibmjava8": [
+    "ga/26.0.0.5/kernel/Dockerfile.ubuntu.ibmjava8": [
       {
         "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
         "is_secret": false,
@@ -771,7 +771,7 @@
         "verified_result": null
       }
     ],
-    "ga/26.0.0.4/kernel/Dockerfile.ubuntu.openjdk11": [
+    "ga/26.0.0.5/kernel/Dockerfile.ubuntu.openjdk11": [
       {
         "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
         "is_secret": false,
@@ -781,7 +781,7 @@
         "verified_result": null
       }
     ],
-    "ga/26.0.0.4/kernel/Dockerfile.ubuntu.openjdk17": [
+    "ga/26.0.0.5/kernel/Dockerfile.ubuntu.openjdk17": [
       {
         "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
         "is_secret": false,
@@ -791,7 +791,7 @@
         "verified_result": null
       }
     ],
-    "ga/26.0.0.4/kernel/helpers/build/configuration_snippets/keystore.xml": [
+    "ga/26.0.0.5/kernel/helpers/build/configuration_snippets/keystore.xml": [
       {
         "hashed_secret": "3cacc7bfac0a382c669a884c953d0401a689785d",
         "is_secret": false,
@@ -801,7 +801,7 @@
         "verified_result": null
       }
     ],
-    "ga/26.0.0.4/kernel/helpers/build/configuration_snippets/truststore.xml": [
+    "ga/26.0.0.5/kernel/helpers/build/configuration_snippets/truststore.xml": [
       {
         "hashed_secret": "662e721e5b6494888b2792ea3b8a1fa310f6ea45",
         "is_secret": false,
@@ -811,17 +811,25 @@
         "verified_result": null
       }
     ],
-    "ga/26.0.0.4/kernel/helpers/runtime/docker-server.sh": [
+    "ga/26.0.0.5/kernel/helpers/runtime/docker-server.sh": [
+      {
+        "hashed_secret": "196ce2adfe494f21d7fe2adcd3bcf4ff4e267b92",
+        "is_secret": false,
+        "is_verified": false,
+        "line_number": 118,
+        "type": "Secret Keyword",
+        "verified_result": null
+      },
       {
         "hashed_secret": "ad321232b1e4e90a29208e1f70d06aad788caa16",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 141,
+        "line_number": 147,
         "type": "Secret Keyword",
         "verified_result": null
       }
     ],
-    "ga/26.0.0.4/oidcProvider/server.xml": [
+    "ga/26.0.0.5/oidcProvider/server.xml": [
       {
         "hashed_secret": "1511e358bea6f50b2ddb2ca19c6422e871a0086f",
         "is_secret": false,
@@ -1000,11 +1008,19 @@
       }
     ],
     "ga/latest/kernel/helpers/runtime/docker-server.sh": [
+      {
+        "hashed_secret": "196ce2adfe494f21d7fe2adcd3bcf4ff4e267b92",
+        "is_secret": false,
+        "is_verified": false,
+        "line_number": 118,
+        "type": "Secret Keyword",
+        "verified_result": null
+      },
       {
         "hashed_secret": "ad321232b1e4e90a29208e1f70d06aad788caa16",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 141,
+        "line_number": 147,
         "type": "Secret Keyword",
         "verified_result": null
       }

README.md

@@ -82,6 +82,10 @@ This section describes the optional build variables that can be enabled via the
   *  XML Snippet Location:  [keystore.xml](ga/latest/kernel/helpers/build/configuration_snippets/keystore.xml).
 * `VERBOSE`
   *  Description: When set to `true` it outputs the commands and results to stdout from `configure.sh`. Otherwise, default setting is `false` and `configure.sh` is silenced.
+* `GENERATE_LTPA_KEYS_PASSWORD` (26.0.0.5+)
+  * Description: Automatically generates a secure random password for LTPA keys and exports it as the `ltpa_keys_password` environment variable. This prevents the LTPA service from failing with error `CWWKS4118E` when no LTPA keys password is configured.
+  * Default: `"true"`.
+  * Note: If `ltpa_keys_password` is already set, automatic generation is skipped. Set to `"false"` to disable.
 
 
 ### Deprecated Build Variables

create-new-release.sh

@@ -68,3 +68,6 @@ sed -i'.bak' -e "s/ga\/\*\/\*\/resources\/\*/#ga\/\*\/\*\/resources\/\*/g" .giti
 rm ./.gitignore.bak
 
 echo "Done performing file updates.";
+echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+echo "!!!!!! Please do NOT commit and push the changed .gitignore file, which is only a temporary LOCAL change. !!!!!!"
+echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"

ga/26.0.0.4/full/Dockerfile.ubi.ibmjava8 → ga/26.0.0.5/full/Dockerfile.ubi.ibmjava8

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:26.0.0.4-kernel-java8-ibmjava-ubi
+ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:26.0.0.5-kernel-java8-ibmjava-ubi
 FROM $PARENT_IMAGE AS installBundle
 
 ARG VERBOSE=false
@@ -36,7 +36,7 @@ RUN set -eux; \
   rm -rf /output/workarea /output/logs; \
   find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;
 
-ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:26.0.0.4-kernel-java8-ibmjava-ubi
+ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:26.0.0.5-kernel-java8-ibmjava-ubi
 FROM $PARENT_IMAGE
 ARG VERBOSE=false
 

ga/26.0.0.4/full/Dockerfile.ubi.openjdk11 → ga/26.0.0.5/full/Dockerfile.ubi.openjdk11

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:26.0.0.4-kernel-java11-openj9-ubi
+ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:26.0.0.5-kernel-java11-openj9-ubi
 FROM $PARENT_IMAGE AS installBundle
 
 ARG VERBOSE=false
@@ -36,7 +36,7 @@ RUN set -eux; \
   rm -rf /output/workarea /output/logs; \
   find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;
 
-ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:26.0.0.4-kernel-java11-openj9-ubi
+ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:26.0.0.5-kernel-java11-openj9-ubi
 FROM $PARENT_IMAGE
 ARG VERBOSE=false
 

ga/26.0.0.4/full/Dockerfile.ubi.openjdk17 → ga/26.0.0.5/full/Dockerfile.ubi.openjdk17

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:26.0.0.4-kernel-java17-openj9-ubi
+ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:26.0.0.5-kernel-java17-openj9-ubi
 FROM $PARENT_IMAGE AS installBundle
 
 ARG VERBOSE=false
@@ -36,7 +36,7 @@ RUN set -eux; \
   rm -rf /output/workarea /output/logs; \
   find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;
 
-ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:26.0.0.4-kernel-java17-openj9-ubi
+ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:26.0.0.5-kernel-java17-openj9-ubi
 FROM $PARENT_IMAGE
 ARG VERBOSE=false
 

ga/26.0.0.4/full/Dockerfile.ubi.openjdk8 → ga/26.0.0.5/full/Dockerfile.ubi.openjdk8

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:26.0.0.4-kernel-java8-openj9-ubi
+ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:26.0.0.5-kernel-java8-openj9-ubi
 FROM $PARENT_IMAGE AS installBundle
 
 ARG VERBOSE=false
@@ -36,7 +36,7 @@ RUN set -eux; \
   rm -rf /output/workarea /output/logs; \
   find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;
 
-ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:26.0.0.4-kernel-java8-openj9-ubi
+ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:26.0.0.5-kernel-java8-openj9-ubi
 FROM $PARENT_IMAGE
 ARG VERBOSE=false
 

ga/26.0.0.4/full/Dockerfile.ubi9-minimal.ibmjava8 → ga/26.0.0.5/full/Dockerfile.ubi9-minimal.ibmjava8

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:26.0.0.4-kernel-java8-ibmjava-ubi-minimal
+ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:26.0.0.5-kernel-java8-ibmjava-ubi-minimal
 FROM $PARENT_IMAGE AS installBundle
 
 ARG VERBOSE=false
@@ -36,7 +36,7 @@ RUN set -eux; \
   rm -rf /output/workarea /output/logs; \
   find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;
 
-ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:26.0.0.4-kernel-java8-ibmjava-ubi-minimal
+ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:26.0.0.5-kernel-java8-ibmjava-ubi-minimal
 FROM $PARENT_IMAGE
 ARG VERBOSE=false
 

ga/26.0.0.4/full/Dockerfile.ubi9-minimal.openjdk11 → ga/26.0.0.5/full/Dockerfile.ubi9-minimal.openjdk11

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:26.0.0.4-kernel-java11-openj9-ubi-minimal
+ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:26.0.0.5-kernel-java11-openj9-ubi-minimal
 FROM $PARENT_IMAGE AS installBundle
 
 ARG VERBOSE=false
@@ -36,7 +36,7 @@ RUN set -eux; \
   rm -rf /output/workarea /output/logs; \
   find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;
 
-ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:26.0.0.4-kernel-java11-openj9-ubi-minimal
+ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:26.0.0.5-kernel-java11-openj9-ubi-minimal
 FROM $PARENT_IMAGE
 ARG VERBOSE=false
 

ga/26.0.0.4/full/Dockerfile.ubi9-minimal.openjdk17 → ga/26.0.0.5/full/Dockerfile.ubi9-minimal.openjdk17

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:26.0.0.4-kernel-java17-openj9-ubi-minimal
+ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:26.0.0.5-kernel-java17-openj9-ubi-minimal
 FROM $PARENT_IMAGE AS installBundle
 
 ARG VERBOSE=false
@@ -36,7 +36,7 @@ RUN set -eux; \
   rm -rf /output/workarea /output/logs; \
   find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;
 
-ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:26.0.0.4-kernel-java17-openj9-ubi-minimal
+ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:26.0.0.5-kernel-java17-openj9-ubi-minimal
 FROM $PARENT_IMAGE
 ARG VERBOSE=false