From 0e3fc2b9ffba47621a350d9e4dc6ce4b71e1d2e2 Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Fri, 22 Aug 2025 12:37:46 -0700 Subject: [PATCH 1/4] 25.0.0.9 updates --- ga/25.0.0.8/images.txt | 18 ------------------ ga/{25.0.0.8 => 25.0.0.9}/README.md | 0 .../full/Dockerfile.ubi.ibmjava8 | 4 ++-- .../full/Dockerfile.ubi.openjdk11 | 4 ++-- .../full/Dockerfile.ubi.openjdk17 | 4 ++-- .../full/Dockerfile.ubi.openjdk8 | 4 ++-- .../full/Dockerfile.ubi9-minimal.ibmjava8 | 4 ++-- .../full/Dockerfile.ubi9-minimal.openjdk11 | 4 ++-- .../full/Dockerfile.ubi9-minimal.openjdk17 | 4 ++-- .../full/Dockerfile.ubi9-minimal.openjdk21 | 4 ++-- .../full/Dockerfile.ubi9-minimal.openjdk8 | 4 ++-- .../full/Dockerfile.ubuntu.ibmjava8 | 2 +- .../full/Dockerfile.ubuntu.openjdk11 | 2 +- .../full/Dockerfile.ubuntu.openjdk17 | 2 +- ga/{25.0.0.8 => 25.0.0.9}/full/README.md | 0 .../full/resources/.gitkeep | 0 ga/{25.0.0.8 => 25.0.0.9}/full/server.xml | 0 ga/25.0.0.9/images.txt | 18 ++++++++++++++++++ .../kernel/Dockerfile.ubi.ibmjava8 | 8 ++++---- .../kernel/Dockerfile.ubi.openjdk11 | 8 ++++---- .../kernel/Dockerfile.ubi.openjdk17 | 8 ++++---- .../kernel/Dockerfile.ubi.openjdk8 | 8 ++++---- .../kernel/Dockerfile.ubi9-minimal.ibmjava8 | 8 ++++---- .../kernel/Dockerfile.ubi9-minimal.openjdk11 | 8 ++++---- .../kernel/Dockerfile.ubi9-minimal.openjdk17 | 8 ++++---- .../kernel/Dockerfile.ubi9-minimal.openjdk21 | 8 ++++---- .../kernel/Dockerfile.ubi9-minimal.openjdk8 | 8 ++++---- .../kernel/Dockerfile.ubuntu.ibmjava8 | 6 +++--- .../kernel/Dockerfile.ubuntu.openjdk11 | 6 +++--- .../kernel/Dockerfile.ubuntu.openjdk17 | 6 +++--- ga/{25.0.0.8 => 25.0.0.9}/kernel/NOTICES | 0 ga/{25.0.0.8 => 25.0.0.9}/kernel/README.md | 0 .../kernel/fixes/.gitkeep | 0 .../kernel/helpers/build/checkpoint.sh | 0 .../hazelcast-client.xml | 0 .../hazelcast-embedded.xml | 0 .../hazelcast-sessioncache-config.xml | 0 .../hazelcast-sessioncache.xml | 0 .../configuration_snippets/http-endpoint.xml | 0 .../http-ssl-endpoint.xml | 0 .../configuration_snippets/iiop-endpoint.xml | 0 .../iiop-ssl-endpoint.xml | 0 .../infinispan-client-sessioncache-config.xml | 0 .../infinispan-client-sessioncache.xml | 0 .../configuration_snippets/jms-endpoint.xml | 0 .../jms-ssl-endpoint.xml | 0 .../build/configuration_snippets/keystore.xml | 0 .../configuration_snippets/mp-health-check.xml | 0 .../configuration_snippets/mp-monitoring.xml | 0 .../configuration_snippets/oidc-config.xml | 0 .../build/configuration_snippets/oidc.xml | 0 .../sessioncache-features.xml | 0 .../configuration_snippets/sso-facebook.xml | 0 .../configuration_snippets/sso-features.xml | 0 .../configuration_snippets/sso-github.xml | 0 .../configuration_snippets/sso-google.xml | 0 .../configuration_snippets/sso-linkedin.xml | 0 .../configuration_snippets/sso-oauth2.xml | 0 .../build/configuration_snippets/sso-oidc.xml | 0 .../configuration_snippets/sso-twitter.xml | 0 .../build/configuration_snippets/tls.xml | 0 .../configuration_snippets/trustDefault.xml | 0 .../configuration_snippets/truststore.xml | 0 .../kernel/helpers/build/configure.sh | 0 .../kernel/helpers/build/features.sh | 0 .../helpers/build/infinispan-client-setup.sh | 0 .../build/internal/features-installed.sh | 0 .../kernel/helpers/build/internal/logger.sh | 0 .../kernel/helpers/build/pidplus.sh | 0 .../kernel/helpers/build/populate_scc.sh | 0 .../kernel/helpers/runtime/docker-server.sh | 0 .../helpers/runtime/livenessHealthCheck.sh | 0 .../helpers/runtime/readinessHealthCheck.sh | 0 .../kernel/helpers/runtime/restore-server.sh | 0 .../helpers/runtime/startupHealthCheck.sh | 0 .../kernel/resources/.gitkeep | 0 .../oidcProvider/Dockerfile | 0 .../oidcProvider/Dockerfile.java11 | 0 .../oidcProvider/README.md | 0 .../oidcProvider/server.xml | 0 ga/latest/kernel/Dockerfile.ubi.ibmjava8 | 8 ++++---- ga/latest/kernel/Dockerfile.ubi.openjdk11 | 8 ++++---- ga/latest/kernel/Dockerfile.ubi.openjdk17 | 8 ++++---- ga/latest/kernel/Dockerfile.ubi.openjdk8 | 8 ++++---- .../kernel/Dockerfile.ubi9-minimal.ibmjava8 | 8 ++++---- .../kernel/Dockerfile.ubi9-minimal.openjdk11 | 8 ++++---- .../kernel/Dockerfile.ubi9-minimal.openjdk17 | 8 ++++---- .../kernel/Dockerfile.ubi9-minimal.openjdk21 | 8 ++++---- .../kernel/Dockerfile.ubi9-minimal.openjdk8 | 8 ++++---- ga/latest/kernel/Dockerfile.ubuntu.ibmjava8 | 6 +++--- ga/latest/kernel/Dockerfile.ubuntu.openjdk11 | 6 +++--- ga/latest/kernel/Dockerfile.ubuntu.openjdk17 | 6 +++--- 92 files changed, 129 insertions(+), 129 deletions(-) delete mode 100644 ga/25.0.0.8/images.txt rename ga/{25.0.0.8 => 25.0.0.9}/README.md (100%) rename ga/{25.0.0.8 => 25.0.0.9}/full/Dockerfile.ubi.ibmjava8 (93%) rename ga/{25.0.0.8 => 25.0.0.9}/full/Dockerfile.ubi.openjdk11 (93%) rename ga/{25.0.0.8 => 25.0.0.9}/full/Dockerfile.ubi.openjdk17 (93%) rename ga/{25.0.0.8 => 25.0.0.9}/full/Dockerfile.ubi.openjdk8 (93%) rename ga/{25.0.0.8 => 25.0.0.9}/full/Dockerfile.ubi9-minimal.ibmjava8 (93%) rename ga/{25.0.0.8 => 25.0.0.9}/full/Dockerfile.ubi9-minimal.openjdk11 (93%) rename ga/{25.0.0.8 => 25.0.0.9}/full/Dockerfile.ubi9-minimal.openjdk17 (93%) rename ga/{25.0.0.8 => 25.0.0.9}/full/Dockerfile.ubi9-minimal.openjdk21 (93%) rename ga/{25.0.0.8 => 25.0.0.9}/full/Dockerfile.ubi9-minimal.openjdk8 (93%) rename ga/{25.0.0.8 => 25.0.0.9}/full/Dockerfile.ubuntu.ibmjava8 (96%) rename ga/{25.0.0.8 => 25.0.0.9}/full/Dockerfile.ubuntu.openjdk11 (96%) rename ga/{25.0.0.8 => 25.0.0.9}/full/Dockerfile.ubuntu.openjdk17 (96%) rename ga/{25.0.0.8 => 25.0.0.9}/full/README.md (100%) rename ga/{25.0.0.8 => 25.0.0.9}/full/resources/.gitkeep (100%) rename ga/{25.0.0.8 => 25.0.0.9}/full/server.xml (100%) create mode 100644 ga/25.0.0.9/images.txt rename ga/{25.0.0.8 => 25.0.0.9}/kernel/Dockerfile.ubi.ibmjava8 (97%) rename ga/{25.0.0.8 => 25.0.0.9}/kernel/Dockerfile.ubi.openjdk11 (97%) rename ga/{25.0.0.8 => 25.0.0.9}/kernel/Dockerfile.ubi.openjdk17 (97%) rename ga/{25.0.0.8 => 25.0.0.9}/kernel/Dockerfile.ubi.openjdk8 (97%) rename ga/{25.0.0.8 => 25.0.0.9}/kernel/Dockerfile.ubi9-minimal.ibmjava8 (98%) rename ga/{25.0.0.8 => 25.0.0.9}/kernel/Dockerfile.ubi9-minimal.openjdk11 (98%) rename ga/{25.0.0.8 => 25.0.0.9}/kernel/Dockerfile.ubi9-minimal.openjdk17 (98%) rename ga/{25.0.0.8 => 25.0.0.9}/kernel/Dockerfile.ubi9-minimal.openjdk21 (98%) rename ga/{25.0.0.8 => 25.0.0.9}/kernel/Dockerfile.ubi9-minimal.openjdk8 (98%) rename ga/{25.0.0.8 => 25.0.0.9}/kernel/Dockerfile.ubuntu.ibmjava8 (98%) rename ga/{25.0.0.8 => 25.0.0.9}/kernel/Dockerfile.ubuntu.openjdk11 (98%) rename ga/{25.0.0.8 => 25.0.0.9}/kernel/Dockerfile.ubuntu.openjdk17 (98%) rename ga/{25.0.0.8 => 25.0.0.9}/kernel/NOTICES (100%) rename ga/{25.0.0.8 => 25.0.0.9}/kernel/README.md (100%) rename ga/{25.0.0.8 => 25.0.0.9}/kernel/fixes/.gitkeep (100%) rename ga/{25.0.0.8 => 25.0.0.9}/kernel/helpers/build/checkpoint.sh (100%) rename ga/{25.0.0.8 => 25.0.0.9}/kernel/helpers/build/configuration_snippets/hazelcast-client.xml (100%) rename ga/{25.0.0.8 => 25.0.0.9}/kernel/helpers/build/configuration_snippets/hazelcast-embedded.xml (100%) rename ga/{25.0.0.8 => 25.0.0.9}/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache-config.xml (100%) rename ga/{25.0.0.8 => 25.0.0.9}/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache.xml (100%) rename ga/{25.0.0.8 => 25.0.0.9}/kernel/helpers/build/configuration_snippets/http-endpoint.xml (100%) rename ga/{25.0.0.8 => 25.0.0.9}/kernel/helpers/build/configuration_snippets/http-ssl-endpoint.xml (100%) rename ga/{25.0.0.8 => 25.0.0.9}/kernel/helpers/build/configuration_snippets/iiop-endpoint.xml (100%) rename ga/{25.0.0.8 => 25.0.0.9}/kernel/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml (100%) rename ga/{25.0.0.8 => 25.0.0.9}/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache-config.xml (100%) rename ga/{25.0.0.8 => 25.0.0.9}/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml (100%) rename ga/{25.0.0.8 => 25.0.0.9}/kernel/helpers/build/configuration_snippets/jms-endpoint.xml (100%) rename ga/{25.0.0.8 => 25.0.0.9}/kernel/helpers/build/configuration_snippets/jms-ssl-endpoint.xml (100%) rename ga/{25.0.0.8 => 25.0.0.9}/kernel/helpers/build/configuration_snippets/keystore.xml (100%) rename ga/{25.0.0.8 => 25.0.0.9}/kernel/helpers/build/configuration_snippets/mp-health-check.xml (100%) rename ga/{25.0.0.8 => 25.0.0.9}/kernel/helpers/build/configuration_snippets/mp-monitoring.xml (100%) rename ga/{25.0.0.8 => 25.0.0.9}/kernel/helpers/build/configuration_snippets/oidc-config.xml (100%) rename ga/{25.0.0.8 => 25.0.0.9}/kernel/helpers/build/configuration_snippets/oidc.xml (100%) rename ga/{25.0.0.8 => 25.0.0.9}/kernel/helpers/build/configuration_snippets/sessioncache-features.xml (100%) rename ga/{25.0.0.8 => 25.0.0.9}/kernel/helpers/build/configuration_snippets/sso-facebook.xml (100%) rename ga/{25.0.0.8 => 25.0.0.9}/kernel/helpers/build/configuration_snippets/sso-features.xml (100%) rename ga/{25.0.0.8 => 25.0.0.9}/kernel/helpers/build/configuration_snippets/sso-github.xml (100%) rename ga/{25.0.0.8 => 25.0.0.9}/kernel/helpers/build/configuration_snippets/sso-google.xml (100%) rename ga/{25.0.0.8 => 25.0.0.9}/kernel/helpers/build/configuration_snippets/sso-linkedin.xml (100%) rename ga/{25.0.0.8 => 25.0.0.9}/kernel/helpers/build/configuration_snippets/sso-oauth2.xml (100%) rename ga/{25.0.0.8 => 25.0.0.9}/kernel/helpers/build/configuration_snippets/sso-oidc.xml (100%) rename ga/{25.0.0.8 => 25.0.0.9}/kernel/helpers/build/configuration_snippets/sso-twitter.xml (100%) rename ga/{25.0.0.8 => 25.0.0.9}/kernel/helpers/build/configuration_snippets/tls.xml (100%) rename ga/{25.0.0.8 => 25.0.0.9}/kernel/helpers/build/configuration_snippets/trustDefault.xml (100%) rename ga/{25.0.0.8 => 25.0.0.9}/kernel/helpers/build/configuration_snippets/truststore.xml (100%) rename ga/{25.0.0.8 => 25.0.0.9}/kernel/helpers/build/configure.sh (100%) rename ga/{25.0.0.8 => 25.0.0.9}/kernel/helpers/build/features.sh (100%) rename ga/{25.0.0.8 => 25.0.0.9}/kernel/helpers/build/infinispan-client-setup.sh (100%) rename ga/{25.0.0.8 => 25.0.0.9}/kernel/helpers/build/internal/features-installed.sh (100%) rename ga/{25.0.0.8 => 25.0.0.9}/kernel/helpers/build/internal/logger.sh (100%) rename ga/{25.0.0.8 => 25.0.0.9}/kernel/helpers/build/pidplus.sh (100%) rename ga/{25.0.0.8 => 25.0.0.9}/kernel/helpers/build/populate_scc.sh (100%) rename ga/{25.0.0.8 => 25.0.0.9}/kernel/helpers/runtime/docker-server.sh (100%) rename ga/{25.0.0.8 => 25.0.0.9}/kernel/helpers/runtime/livenessHealthCheck.sh (100%) rename ga/{25.0.0.8 => 25.0.0.9}/kernel/helpers/runtime/readinessHealthCheck.sh (100%) rename ga/{25.0.0.8 => 25.0.0.9}/kernel/helpers/runtime/restore-server.sh (100%) rename ga/{25.0.0.8 => 25.0.0.9}/kernel/helpers/runtime/startupHealthCheck.sh (100%) rename ga/{25.0.0.8 => 25.0.0.9}/kernel/resources/.gitkeep (100%) rename ga/{25.0.0.8 => 25.0.0.9}/oidcProvider/Dockerfile (100%) rename ga/{25.0.0.8 => 25.0.0.9}/oidcProvider/Dockerfile.java11 (100%) rename ga/{25.0.0.8 => 25.0.0.9}/oidcProvider/README.md (100%) rename ga/{25.0.0.8 => 25.0.0.9}/oidcProvider/server.xml (100%) diff --git a/ga/25.0.0.8/images.txt b/ga/25.0.0.8/images.txt deleted file mode 100644 index e34e78615..000000000 --- a/ga/25.0.0.8/images.txt +++ /dev/null @@ -1,18 +0,0 @@ -websphere-liberty:25.0.0.8-kernel ../ga/25.0.0.8/kernel ../ga/25.0.0.8/kernel/Dockerfile.ubuntu.ibmjava8 -websphere-liberty:25.0.0.8-kernel-java11-openj9 ../ga/25.0.0.8/kernel ../ga/25.0.0.8/kernel/Dockerfile.ubuntu.openjdk11 -websphere-liberty:25.0.0.8-kernel-java17-openj9 ../ga/25.0.0.8/kernel ../ga/25.0.0.8/kernel/Dockerfile.ubuntu.openjdk17 -websphere-liberty:25.0.0.8-kernel-java8-ibmjava-ubi ../ga/25.0.0.8/kernel ../ga/25.0.0.8/kernel/Dockerfile.ubi.ibmjava8 -websphere-liberty:25.0.0.8-kernel-java8-openj9-ubi ../ga/25.0.0.8/kernel ../ga/25.0.0.8/kernel/Dockerfile.ubi.openjdk8 -websphere-liberty:25.0.0.8-kernel-java11-openj9-ubi ../ga/25.0.0.8/kernel ../ga/25.0.0.8/kernel/Dockerfile.ubi.openjdk11 -websphere-liberty:25.0.0.8-kernel-java17-openj9-ubi ../ga/25.0.0.8/kernel ../ga/25.0.0.8/kernel/Dockerfile.ubi.openjdk17 -websphere-liberty:25.0.0.8-full ../ga/25.0.0.8/full ../ga/25.0.0.8/full/Dockerfile.ubuntu.ibmjava8 -websphere-liberty:25.0.0.8-full-java11-openj9 ../ga/25.0.0.8/full ../ga/25.0.0.8/full/Dockerfile.ubuntu.openjdk11 -websphere-liberty:25.0.0.8-full-java17-openj9 ../ga/25.0.0.8/full ../ga/25.0.0.8/full/Dockerfile.ubuntu.openjdk17 -websphere-liberty:25.0.0.8-full-java8-ibmjava-ubi ../ga/25.0.0.8/full ../ga/25.0.0.8/full/Dockerfile.ubi.ibmjava8 -websphere-liberty:25.0.0.8-full-java8-openj9-ubi ../ga/25.0.0.8/full ../ga/25.0.0.8/full/Dockerfile.ubi.openjdk8 -websphere-liberty:25.0.0.8-full-java11-openj9-ubi ../ga/25.0.0.8/full ../ga/25.0.0.8/full/Dockerfile.ubi.openjdk11 -websphere-liberty:25.0.0.8-full-java17-openj9-ubi ../ga/25.0.0.8/full ../ga/25.0.0.8/full/Dockerfile.ubi.openjdk17 -websphere-liberty:beta ../beta -websphere-liberty:test-stock-quote test-stock-quote -websphere-liberty:test-stock-trader test-stock-trader -websphere-liberty:test-pet-clinic test-pet-clinic diff --git a/ga/25.0.0.8/README.md b/ga/25.0.0.9/README.md similarity index 100% rename from ga/25.0.0.8/README.md rename to ga/25.0.0.9/README.md diff --git a/ga/25.0.0.8/full/Dockerfile.ubi.ibmjava8 b/ga/25.0.0.9/full/Dockerfile.ubi.ibmjava8 similarity index 93% rename from ga/25.0.0.8/full/Dockerfile.ubi.ibmjava8 rename to ga/25.0.0.9/full/Dockerfile.ubi.ibmjava8 index 3517d398d..087335755 100644 --- a/ga/25.0.0.8/full/Dockerfile.ubi.ibmjava8 +++ b/ga/25.0.0.9/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:25.0.0.8-kernel-java8-ibmjava-ubi +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.9-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:25.0.0.8-kernel-java8-ibmjava-ubi +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.9-kernel-java8-ibmjava-ubi FROM $PARENT_IMAGE ARG VERBOSE=false diff --git a/ga/25.0.0.8/full/Dockerfile.ubi.openjdk11 b/ga/25.0.0.9/full/Dockerfile.ubi.openjdk11 similarity index 93% rename from ga/25.0.0.8/full/Dockerfile.ubi.openjdk11 rename to ga/25.0.0.9/full/Dockerfile.ubi.openjdk11 index ec7522d5a..df1963de7 100644 --- a/ga/25.0.0.8/full/Dockerfile.ubi.openjdk11 +++ b/ga/25.0.0.9/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:25.0.0.8-kernel-java11-openj9-ubi +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.9-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:25.0.0.8-kernel-java11-openj9-ubi +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.9-kernel-java11-openj9-ubi FROM $PARENT_IMAGE ARG VERBOSE=false diff --git a/ga/25.0.0.8/full/Dockerfile.ubi.openjdk17 b/ga/25.0.0.9/full/Dockerfile.ubi.openjdk17 similarity index 93% rename from ga/25.0.0.8/full/Dockerfile.ubi.openjdk17 rename to ga/25.0.0.9/full/Dockerfile.ubi.openjdk17 index d0833a539..abdaffcc5 100644 --- a/ga/25.0.0.8/full/Dockerfile.ubi.openjdk17 +++ b/ga/25.0.0.9/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:25.0.0.8-kernel-java17-openj9-ubi +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.9-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:25.0.0.8-kernel-java17-openj9-ubi +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.9-kernel-java17-openj9-ubi FROM $PARENT_IMAGE ARG VERBOSE=false diff --git a/ga/25.0.0.8/full/Dockerfile.ubi.openjdk8 b/ga/25.0.0.9/full/Dockerfile.ubi.openjdk8 similarity index 93% rename from ga/25.0.0.8/full/Dockerfile.ubi.openjdk8 rename to ga/25.0.0.9/full/Dockerfile.ubi.openjdk8 index 8fd73551a..245ae4517 100644 --- a/ga/25.0.0.8/full/Dockerfile.ubi.openjdk8 +++ b/ga/25.0.0.9/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:25.0.0.8-kernel-java8-openj9-ubi +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.9-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:25.0.0.8-kernel-java8-openj9-ubi +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.9-kernel-java8-openj9-ubi FROM $PARENT_IMAGE ARG VERBOSE=false diff --git a/ga/25.0.0.8/full/Dockerfile.ubi9-minimal.ibmjava8 b/ga/25.0.0.9/full/Dockerfile.ubi9-minimal.ibmjava8 similarity index 93% rename from ga/25.0.0.8/full/Dockerfile.ubi9-minimal.ibmjava8 rename to ga/25.0.0.9/full/Dockerfile.ubi9-minimal.ibmjava8 index 925b73713..545d21e7b 100644 --- a/ga/25.0.0.8/full/Dockerfile.ubi9-minimal.ibmjava8 +++ b/ga/25.0.0.9/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:25.0.0.8-kernel-java8-ibmjava-ubi-minimal +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.9-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:25.0.0.8-kernel-java8-ibmjava-ubi-minimal +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.9-kernel-java8-ibmjava-ubi-minimal FROM $PARENT_IMAGE ARG VERBOSE=false diff --git a/ga/25.0.0.8/full/Dockerfile.ubi9-minimal.openjdk11 b/ga/25.0.0.9/full/Dockerfile.ubi9-minimal.openjdk11 similarity index 93% rename from ga/25.0.0.8/full/Dockerfile.ubi9-minimal.openjdk11 rename to ga/25.0.0.9/full/Dockerfile.ubi9-minimal.openjdk11 index b2cbf13e8..fc1183bef 100644 --- a/ga/25.0.0.8/full/Dockerfile.ubi9-minimal.openjdk11 +++ b/ga/25.0.0.9/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:25.0.0.8-kernel-java11-openj9-ubi-minimal +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.9-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:25.0.0.8-kernel-java11-openj9-ubi-minimal +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.9-kernel-java11-openj9-ubi-minimal FROM $PARENT_IMAGE ARG VERBOSE=false diff --git a/ga/25.0.0.8/full/Dockerfile.ubi9-minimal.openjdk17 b/ga/25.0.0.9/full/Dockerfile.ubi9-minimal.openjdk17 similarity index 93% rename from ga/25.0.0.8/full/Dockerfile.ubi9-minimal.openjdk17 rename to ga/25.0.0.9/full/Dockerfile.ubi9-minimal.openjdk17 index 99f2649b1..df112b392 100644 --- a/ga/25.0.0.8/full/Dockerfile.ubi9-minimal.openjdk17 +++ b/ga/25.0.0.9/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:25.0.0.8-kernel-java17-openj9-ubi-minimal +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.9-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:25.0.0.8-kernel-java17-openj9-ubi-minimal +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.9-kernel-java17-openj9-ubi-minimal FROM $PARENT_IMAGE ARG VERBOSE=false diff --git a/ga/25.0.0.8/full/Dockerfile.ubi9-minimal.openjdk21 b/ga/25.0.0.9/full/Dockerfile.ubi9-minimal.openjdk21 similarity index 93% rename from ga/25.0.0.8/full/Dockerfile.ubi9-minimal.openjdk21 rename to ga/25.0.0.9/full/Dockerfile.ubi9-minimal.openjdk21 index bd495749e..f72896ec4 100644 --- a/ga/25.0.0.8/full/Dockerfile.ubi9-minimal.openjdk21 +++ b/ga/25.0.0.9/full/Dockerfile.ubi9-minimal.openjdk21 @@ -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:25.0.0.8-kernel-java21-openj9-ubi-minimal +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.9-kernel-java21-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:25.0.0.8-kernel-java21-openj9-ubi-minimal +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.9-kernel-java21-openj9-ubi-minimal FROM $PARENT_IMAGE ARG VERBOSE=false diff --git a/ga/25.0.0.8/full/Dockerfile.ubi9-minimal.openjdk8 b/ga/25.0.0.9/full/Dockerfile.ubi9-minimal.openjdk8 similarity index 93% rename from ga/25.0.0.8/full/Dockerfile.ubi9-minimal.openjdk8 rename to ga/25.0.0.9/full/Dockerfile.ubi9-minimal.openjdk8 index 8452845a7..0f7e91ab3 100644 --- a/ga/25.0.0.8/full/Dockerfile.ubi9-minimal.openjdk8 +++ b/ga/25.0.0.9/full/Dockerfile.ubi9-minimal.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:25.0.0.8-kernel-java8-openj9-ubi-minimal +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.9-kernel-java8-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:25.0.0.8-kernel-java8-openj9-ubi-minimal +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.9-kernel-java8-openj9-ubi-minimal FROM $PARENT_IMAGE ARG VERBOSE=false diff --git a/ga/25.0.0.8/full/Dockerfile.ubuntu.ibmjava8 b/ga/25.0.0.9/full/Dockerfile.ubuntu.ibmjava8 similarity index 96% rename from ga/25.0.0.8/full/Dockerfile.ubuntu.ibmjava8 rename to ga/25.0.0.9/full/Dockerfile.ubuntu.ibmjava8 index 973abde15..55b39a731 100644 --- a/ga/25.0.0.8/full/Dockerfile.ubuntu.ibmjava8 +++ b/ga/25.0.0.9/full/Dockerfile.ubuntu.ibmjava8 @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM websphere-liberty:25.0.0.8-kernel-java8-ibmjava +FROM websphere-liberty:25.0.0.9-kernel-java8-ibmjava ARG VERBOSE=false ARG REPOSITORIES_PROPERTIES="" diff --git a/ga/25.0.0.8/full/Dockerfile.ubuntu.openjdk11 b/ga/25.0.0.9/full/Dockerfile.ubuntu.openjdk11 similarity index 96% rename from ga/25.0.0.8/full/Dockerfile.ubuntu.openjdk11 rename to ga/25.0.0.9/full/Dockerfile.ubuntu.openjdk11 index 36e4586a0..78708e09f 100644 --- a/ga/25.0.0.8/full/Dockerfile.ubuntu.openjdk11 +++ b/ga/25.0.0.9/full/Dockerfile.ubuntu.openjdk11 @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM websphere-liberty:25.0.0.8-kernel-java11-openj9 +FROM websphere-liberty:25.0.0.9-kernel-java11-openj9 ARG VERBOSE=false ARG REPOSITORIES_PROPERTIES="" diff --git a/ga/25.0.0.8/full/Dockerfile.ubuntu.openjdk17 b/ga/25.0.0.9/full/Dockerfile.ubuntu.openjdk17 similarity index 96% rename from ga/25.0.0.8/full/Dockerfile.ubuntu.openjdk17 rename to ga/25.0.0.9/full/Dockerfile.ubuntu.openjdk17 index 16a932e8e..33332295a 100644 --- a/ga/25.0.0.8/full/Dockerfile.ubuntu.openjdk17 +++ b/ga/25.0.0.9/full/Dockerfile.ubuntu.openjdk17 @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM websphere-liberty:25.0.0.8-kernel-java17-openj9 +FROM websphere-liberty:25.0.0.9-kernel-java17-openj9 ARG VERBOSE=false ARG REPOSITORIES_PROPERTIES="" diff --git a/ga/25.0.0.8/full/README.md b/ga/25.0.0.9/full/README.md similarity index 100% rename from ga/25.0.0.8/full/README.md rename to ga/25.0.0.9/full/README.md diff --git a/ga/25.0.0.8/full/resources/.gitkeep b/ga/25.0.0.9/full/resources/.gitkeep similarity index 100% rename from ga/25.0.0.8/full/resources/.gitkeep rename to ga/25.0.0.9/full/resources/.gitkeep diff --git a/ga/25.0.0.8/full/server.xml b/ga/25.0.0.9/full/server.xml similarity index 100% rename from ga/25.0.0.8/full/server.xml rename to ga/25.0.0.9/full/server.xml diff --git a/ga/25.0.0.9/images.txt b/ga/25.0.0.9/images.txt new file mode 100644 index 000000000..223817ade --- /dev/null +++ b/ga/25.0.0.9/images.txt @@ -0,0 +1,18 @@ +websphere-liberty:25.0.0.9-kernel ../ga/25.0.0.9/kernel ../ga/25.0.0.9/kernel/Dockerfile.ubuntu.ibmjava8 +websphere-liberty:25.0.0.9-kernel-java11-openj9 ../ga/25.0.0.9/kernel ../ga/25.0.0.9/kernel/Dockerfile.ubuntu.openjdk11 +websphere-liberty:25.0.0.9-kernel-java17-openj9 ../ga/25.0.0.9/kernel ../ga/25.0.0.9/kernel/Dockerfile.ubuntu.openjdk17 +websphere-liberty:25.0.0.9-kernel-java8-ibmjava-ubi ../ga/25.0.0.9/kernel ../ga/25.0.0.9/kernel/Dockerfile.ubi.ibmjava8 +websphere-liberty:25.0.0.9-kernel-java8-openj9-ubi ../ga/25.0.0.9/kernel ../ga/25.0.0.9/kernel/Dockerfile.ubi.openjdk8 +websphere-liberty:25.0.0.9-kernel-java11-openj9-ubi ../ga/25.0.0.9/kernel ../ga/25.0.0.9/kernel/Dockerfile.ubi.openjdk11 +websphere-liberty:25.0.0.9-kernel-java17-openj9-ubi ../ga/25.0.0.9/kernel ../ga/25.0.0.9/kernel/Dockerfile.ubi.openjdk17 +websphere-liberty:25.0.0.9-full ../ga/25.0.0.9/full ../ga/25.0.0.9/full/Dockerfile.ubuntu.ibmjava8 +websphere-liberty:25.0.0.9-full-java11-openj9 ../ga/25.0.0.9/full ../ga/25.0.0.9/full/Dockerfile.ubuntu.openjdk11 +websphere-liberty:25.0.0.9-full-java17-openj9 ../ga/25.0.0.9/full ../ga/25.0.0.9/full/Dockerfile.ubuntu.openjdk17 +websphere-liberty:25.0.0.9-full-java8-ibmjava-ubi ../ga/25.0.0.9/full ../ga/25.0.0.9/full/Dockerfile.ubi.ibmjava8 +websphere-liberty:25.0.0.9-full-java8-openj9-ubi ../ga/25.0.0.9/full ../ga/25.0.0.9/full/Dockerfile.ubi.openjdk8 +websphere-liberty:25.0.0.9-full-java11-openj9-ubi ../ga/25.0.0.9/full ../ga/25.0.0.9/full/Dockerfile.ubi.openjdk11 +websphere-liberty:25.0.0.9-full-java17-openj9-ubi ../ga/25.0.0.9/full ../ga/25.0.0.9/full/Dockerfile.ubi.openjdk17 +websphere-liberty:beta ../beta +websphere-liberty:test-stock-quote test-stock-quote +websphere-liberty:test-stock-trader test-stock-trader +websphere-liberty:test-pet-clinic test-pet-clinic diff --git a/ga/25.0.0.8/kernel/Dockerfile.ubi.ibmjava8 b/ga/25.0.0.9/kernel/Dockerfile.ubi.ibmjava8 similarity index 97% rename from ga/25.0.0.8/kernel/Dockerfile.ubi.ibmjava8 rename to ga/25.0.0.9/kernel/Dockerfile.ubi.ibmjava8 index 737dc6db1..e85d7fb3c 100644 --- a/ga/25.0.0.8/kernel/Dockerfile.ubi.ibmjava8 +++ b/ga/25.0.0.9/kernel/Dockerfile.ubi.ibmjava8 @@ -19,10 +19,10 @@ USER root ARG VERBOSE=false # Install WebSphere Liberty -ARG LIBERTY_VERSION=25.0.0.8 +ARG LIBERTY_VERSION=25.0.0.9 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" -ARG LIBERTY_SHA=27abac812660d4dba368044ba969b29c27e23f85 +ARG LIBERTY_SHA={replace_with_correct_sha} # If there is a local copy of the image use that instead COPY resources/ /tmp/ @@ -48,8 +48,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=25.0.0.8 -ARG LIBERTY_BUILD_LABEL=cl250420250407-1902 +ARG LIBERTY_VERSION=25.0.0.9 +ARG LIBERTY_BUILD_LABEL=cl250920250821-1629 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/25.0.0.8/kernel/Dockerfile.ubi.openjdk11 b/ga/25.0.0.9/kernel/Dockerfile.ubi.openjdk11 similarity index 97% rename from ga/25.0.0.8/kernel/Dockerfile.ubi.openjdk11 rename to ga/25.0.0.9/kernel/Dockerfile.ubi.openjdk11 index 6ecb08a4f..fa5c0d42c 100644 --- a/ga/25.0.0.8/kernel/Dockerfile.ubi.openjdk11 +++ b/ga/25.0.0.9/kernel/Dockerfile.ubi.openjdk11 @@ -19,10 +19,10 @@ USER root ARG VERBOSE=false # Install WebSphere Liberty -ARG LIBERTY_VERSION=25.0.0.8 +ARG LIBERTY_VERSION=25.0.0.9 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" -ARG LIBERTY_SHA=27abac812660d4dba368044ba969b29c27e23f85 +ARG LIBERTY_SHA={replace_with_correct_sha} # If there is a local copy of the image use that instead @@ -49,8 +49,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=25.0.0.8 -ARG LIBERTY_BUILD_LABEL=cl250420250407-1902 +ARG LIBERTY_VERSION=25.0.0.9 +ARG LIBERTY_BUILD_LABEL=cl250920250821-1629 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/25.0.0.8/kernel/Dockerfile.ubi.openjdk17 b/ga/25.0.0.9/kernel/Dockerfile.ubi.openjdk17 similarity index 97% rename from ga/25.0.0.8/kernel/Dockerfile.ubi.openjdk17 rename to ga/25.0.0.9/kernel/Dockerfile.ubi.openjdk17 index 9908e6f4e..9d9373a88 100644 --- a/ga/25.0.0.8/kernel/Dockerfile.ubi.openjdk17 +++ b/ga/25.0.0.9/kernel/Dockerfile.ubi.openjdk17 @@ -19,10 +19,10 @@ USER root ARG VERBOSE=false # Install WebSphere Liberty -ARG LIBERTY_VERSION=25.0.0.8 +ARG LIBERTY_VERSION=25.0.0.9 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" -ARG LIBERTY_SHA=27abac812660d4dba368044ba969b29c27e23f85 +ARG LIBERTY_SHA={replace_with_correct_sha} # If there is a local copy of the image use that instead COPY resources/ /tmp/ @@ -48,8 +48,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=25.0.0.8 -ARG LIBERTY_BUILD_LABEL=cl250420250407-1902 +ARG LIBERTY_VERSION=25.0.0.9 +ARG LIBERTY_BUILD_LABEL=cl250920250821-1629 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/25.0.0.8/kernel/Dockerfile.ubi.openjdk8 b/ga/25.0.0.9/kernel/Dockerfile.ubi.openjdk8 similarity index 97% rename from ga/25.0.0.8/kernel/Dockerfile.ubi.openjdk8 rename to ga/25.0.0.9/kernel/Dockerfile.ubi.openjdk8 index 51870a84c..722d1af6f 100644 --- a/ga/25.0.0.8/kernel/Dockerfile.ubi.openjdk8 +++ b/ga/25.0.0.9/kernel/Dockerfile.ubi.openjdk8 @@ -19,10 +19,10 @@ USER root ARG VERBOSE=false # Install WebSphere Liberty -ARG LIBERTY_VERSION=25.0.0.8 +ARG LIBERTY_VERSION=25.0.0.9 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" -ARG LIBERTY_SHA=27abac812660d4dba368044ba969b29c27e23f85 +ARG LIBERTY_SHA={replace_with_correct_sha} # If there is a local copy of the image use that instead COPY resources/ /tmp/ @@ -48,8 +48,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=25.0.0.8 -ARG LIBERTY_BUILD_LABEL=cl250420250407-1902 +ARG LIBERTY_VERSION=25.0.0.9 +ARG LIBERTY_BUILD_LABEL=cl250920250821-1629 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/25.0.0.8/kernel/Dockerfile.ubi9-minimal.ibmjava8 b/ga/25.0.0.9/kernel/Dockerfile.ubi9-minimal.ibmjava8 similarity index 98% rename from ga/25.0.0.8/kernel/Dockerfile.ubi9-minimal.ibmjava8 rename to ga/25.0.0.9/kernel/Dockerfile.ubi9-minimal.ibmjava8 index d73cb528d..b7c74cc1f 100644 --- a/ga/25.0.0.8/kernel/Dockerfile.ubi9-minimal.ibmjava8 +++ b/ga/25.0.0.9/kernel/Dockerfile.ubi9-minimal.ibmjava8 @@ -29,10 +29,10 @@ USER root ARG VERBOSE=false # Install WebSphere Liberty -ARG LIBERTY_VERSION=25.0.0.8 +ARG LIBERTY_VERSION=25.0.0.9 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" -ARG LIBERTY_SHA=27abac812660d4dba368044ba969b29c27e23f85 +ARG LIBERTY_SHA={replace_with_correct_sha} # If there is a local copy of the image use that instead COPY resources/ /tmp/ @@ -59,8 +59,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=25.0.0.8 -ARG LIBERTY_BUILD_LABEL=cl250420250407-1902 +ARG LIBERTY_VERSION=25.0.0.9 +ARG LIBERTY_BUILD_LABEL=cl250920250821-1629 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Iain Lewis, Melissa Lee, Kirby Chin" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/25.0.0.8/kernel/Dockerfile.ubi9-minimal.openjdk11 b/ga/25.0.0.9/kernel/Dockerfile.ubi9-minimal.openjdk11 similarity index 98% rename from ga/25.0.0.8/kernel/Dockerfile.ubi9-minimal.openjdk11 rename to ga/25.0.0.9/kernel/Dockerfile.ubi9-minimal.openjdk11 index ec5a7e9d9..5a1df1ee8 100644 --- a/ga/25.0.0.8/kernel/Dockerfile.ubi9-minimal.openjdk11 +++ b/ga/25.0.0.9/kernel/Dockerfile.ubi9-minimal.openjdk11 @@ -19,10 +19,10 @@ USER root ARG VERBOSE=false # Install WebSphere Liberty -ARG LIBERTY_VERSION=25.0.0.8 +ARG LIBERTY_VERSION=25.0.0.9 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" -ARG LIBERTY_SHA=27abac812660d4dba368044ba969b29c27e23f85 +ARG LIBERTY_SHA={replace_with_correct_sha} # If there is a local copy of the image use that instead COPY resources/ /tmp/ @@ -47,8 +47,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=25.0.0.8 -ARG LIBERTY_BUILD_LABEL=cl250420250407-1902 +ARG LIBERTY_VERSION=25.0.0.9 +ARG LIBERTY_BUILD_LABEL=cl250920250821-1629 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Iain Lewis, Melissa Lee, Kirby Chin" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/25.0.0.8/kernel/Dockerfile.ubi9-minimal.openjdk17 b/ga/25.0.0.9/kernel/Dockerfile.ubi9-minimal.openjdk17 similarity index 98% rename from ga/25.0.0.8/kernel/Dockerfile.ubi9-minimal.openjdk17 rename to ga/25.0.0.9/kernel/Dockerfile.ubi9-minimal.openjdk17 index b87ece593..35fd124b4 100644 --- a/ga/25.0.0.8/kernel/Dockerfile.ubi9-minimal.openjdk17 +++ b/ga/25.0.0.9/kernel/Dockerfile.ubi9-minimal.openjdk17 @@ -19,10 +19,10 @@ USER root ARG VERBOSE=false # Install WebSphere Liberty -ARG LIBERTY_VERSION=25.0.0.8 +ARG LIBERTY_VERSION=25.0.0.9 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" -ARG LIBERTY_SHA=27abac812660d4dba368044ba969b29c27e23f85 +ARG LIBERTY_SHA={replace_with_correct_sha} # If there is a local copy of the image use that instead COPY resources/ /tmp/ @@ -47,8 +47,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=25.0.0.8 -ARG LIBERTY_BUILD_LABEL=cl250420250407-1902 +ARG LIBERTY_VERSION=25.0.0.9 +ARG LIBERTY_BUILD_LABEL=cl250920250821-1629 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Iain Lewis, Melissa Lee, Kirby Chin" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/25.0.0.8/kernel/Dockerfile.ubi9-minimal.openjdk21 b/ga/25.0.0.9/kernel/Dockerfile.ubi9-minimal.openjdk21 similarity index 98% rename from ga/25.0.0.8/kernel/Dockerfile.ubi9-minimal.openjdk21 rename to ga/25.0.0.9/kernel/Dockerfile.ubi9-minimal.openjdk21 index 5679732a5..e5679c78b 100644 --- a/ga/25.0.0.8/kernel/Dockerfile.ubi9-minimal.openjdk21 +++ b/ga/25.0.0.9/kernel/Dockerfile.ubi9-minimal.openjdk21 @@ -19,10 +19,10 @@ USER root ARG VERBOSE=false # Install WebSphere Liberty -ARG LIBERTY_VERSION=25.0.0.8 +ARG LIBERTY_VERSION=25.0.0.9 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" -ARG LIBERTY_SHA=27abac812660d4dba368044ba969b29c27e23f85 +ARG LIBERTY_SHA={replace_with_correct_sha} # If there is a local copy of the image use that instead COPY resources/ /tmp/ @@ -47,8 +47,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=25.0.0.8 -ARG LIBERTY_BUILD_LABEL=cl250420250407-1902 +ARG LIBERTY_VERSION=25.0.0.9 +ARG LIBERTY_BUILD_LABEL=cl250920250821-1629 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/25.0.0.8/kernel/Dockerfile.ubi9-minimal.openjdk8 b/ga/25.0.0.9/kernel/Dockerfile.ubi9-minimal.openjdk8 similarity index 98% rename from ga/25.0.0.8/kernel/Dockerfile.ubi9-minimal.openjdk8 rename to ga/25.0.0.9/kernel/Dockerfile.ubi9-minimal.openjdk8 index 56e670119..50af66bfb 100644 --- a/ga/25.0.0.8/kernel/Dockerfile.ubi9-minimal.openjdk8 +++ b/ga/25.0.0.9/kernel/Dockerfile.ubi9-minimal.openjdk8 @@ -19,10 +19,10 @@ USER root ARG VERBOSE=false # Install WebSphere Liberty -ARG LIBERTY_VERSION=25.0.0.8 +ARG LIBERTY_VERSION=25.0.0.9 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" -ARG LIBERTY_SHA=27abac812660d4dba368044ba969b29c27e23f85 +ARG LIBERTY_SHA={replace_with_correct_sha} # If there is a local copy of the image use that instead COPY resources/ /tmp/ @@ -47,8 +47,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=25.0.0.8 -ARG LIBERTY_BUILD_LABEL=cl250420250407-1902 +ARG LIBERTY_VERSION=25.0.0.9 +ARG LIBERTY_BUILD_LABEL=cl250920250821-1629 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Iain Lewis, Melissa Lee, Kirby Chin" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/25.0.0.8/kernel/Dockerfile.ubuntu.ibmjava8 b/ga/25.0.0.9/kernel/Dockerfile.ubuntu.ibmjava8 similarity index 98% rename from ga/25.0.0.8/kernel/Dockerfile.ubuntu.ibmjava8 rename to ga/25.0.0.9/kernel/Dockerfile.ubuntu.ibmjava8 index 3d94fada1..7121f2d66 100644 --- a/ga/25.0.0.8/kernel/Dockerfile.ubuntu.ibmjava8 +++ b/ga/25.0.0.9/kernel/Dockerfile.ubuntu.ibmjava8 @@ -19,9 +19,9 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=25.0.0.8 -ARG LIBERTY_BUILD_LABEL=cl250420250407-1902 -ARG LIBERTY_SHA=27abac812660d4dba368044ba969b29c27e23f85 +ARG LIBERTY_VERSION=25.0.0.9 +ARG LIBERTY_BUILD_LABEL=cl250920250821-1629 +ARG LIBERTY_SHA={replace_with_correct_sha} LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/25.0.0.8/kernel/Dockerfile.ubuntu.openjdk11 b/ga/25.0.0.9/kernel/Dockerfile.ubuntu.openjdk11 similarity index 98% rename from ga/25.0.0.8/kernel/Dockerfile.ubuntu.openjdk11 rename to ga/25.0.0.9/kernel/Dockerfile.ubuntu.openjdk11 index 73c023c8c..bc4914ab0 100644 --- a/ga/25.0.0.8/kernel/Dockerfile.ubuntu.openjdk11 +++ b/ga/25.0.0.9/kernel/Dockerfile.ubuntu.openjdk11 @@ -19,9 +19,9 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=25.0.0.8 -ARG LIBERTY_BUILD_LABEL=cl250420250407-1902 -ARG LIBERTY_SHA=27abac812660d4dba368044ba969b29c27e23f85 +ARG LIBERTY_VERSION=25.0.0.9 +ARG LIBERTY_BUILD_LABEL=cl250920250821-1629 +ARG LIBERTY_SHA={replace_with_correct_sha} LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/25.0.0.8/kernel/Dockerfile.ubuntu.openjdk17 b/ga/25.0.0.9/kernel/Dockerfile.ubuntu.openjdk17 similarity index 98% rename from ga/25.0.0.8/kernel/Dockerfile.ubuntu.openjdk17 rename to ga/25.0.0.9/kernel/Dockerfile.ubuntu.openjdk17 index c3e260e87..d87770ed2 100644 --- a/ga/25.0.0.8/kernel/Dockerfile.ubuntu.openjdk17 +++ b/ga/25.0.0.9/kernel/Dockerfile.ubuntu.openjdk17 @@ -19,9 +19,9 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=25.0.0.8 -ARG LIBERTY_BUILD_LABEL=cl250420250407-1902 -ARG LIBERTY_SHA=27abac812660d4dba368044ba969b29c27e23f85 +ARG LIBERTY_VERSION=25.0.0.9 +ARG LIBERTY_BUILD_LABEL=cl250920250821-1629 +ARG LIBERTY_SHA={replace_with_correct_sha} LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/25.0.0.8/kernel/NOTICES b/ga/25.0.0.9/kernel/NOTICES similarity index 100% rename from ga/25.0.0.8/kernel/NOTICES rename to ga/25.0.0.9/kernel/NOTICES diff --git a/ga/25.0.0.8/kernel/README.md b/ga/25.0.0.9/kernel/README.md similarity index 100% rename from ga/25.0.0.8/kernel/README.md rename to ga/25.0.0.9/kernel/README.md diff --git a/ga/25.0.0.8/kernel/fixes/.gitkeep b/ga/25.0.0.9/kernel/fixes/.gitkeep similarity index 100% rename from ga/25.0.0.8/kernel/fixes/.gitkeep rename to ga/25.0.0.9/kernel/fixes/.gitkeep diff --git a/ga/25.0.0.8/kernel/helpers/build/checkpoint.sh b/ga/25.0.0.9/kernel/helpers/build/checkpoint.sh similarity index 100% rename from ga/25.0.0.8/kernel/helpers/build/checkpoint.sh rename to ga/25.0.0.9/kernel/helpers/build/checkpoint.sh diff --git a/ga/25.0.0.8/kernel/helpers/build/configuration_snippets/hazelcast-client.xml b/ga/25.0.0.9/kernel/helpers/build/configuration_snippets/hazelcast-client.xml similarity index 100% rename from ga/25.0.0.8/kernel/helpers/build/configuration_snippets/hazelcast-client.xml rename to ga/25.0.0.9/kernel/helpers/build/configuration_snippets/hazelcast-client.xml diff --git a/ga/25.0.0.8/kernel/helpers/build/configuration_snippets/hazelcast-embedded.xml b/ga/25.0.0.9/kernel/helpers/build/configuration_snippets/hazelcast-embedded.xml similarity index 100% rename from ga/25.0.0.8/kernel/helpers/build/configuration_snippets/hazelcast-embedded.xml rename to ga/25.0.0.9/kernel/helpers/build/configuration_snippets/hazelcast-embedded.xml diff --git a/ga/25.0.0.8/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache-config.xml b/ga/25.0.0.9/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache-config.xml similarity index 100% rename from ga/25.0.0.8/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache-config.xml rename to ga/25.0.0.9/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache-config.xml diff --git a/ga/25.0.0.8/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache.xml b/ga/25.0.0.9/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache.xml similarity index 100% rename from ga/25.0.0.8/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache.xml rename to ga/25.0.0.9/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache.xml diff --git a/ga/25.0.0.8/kernel/helpers/build/configuration_snippets/http-endpoint.xml b/ga/25.0.0.9/kernel/helpers/build/configuration_snippets/http-endpoint.xml similarity index 100% rename from ga/25.0.0.8/kernel/helpers/build/configuration_snippets/http-endpoint.xml rename to ga/25.0.0.9/kernel/helpers/build/configuration_snippets/http-endpoint.xml diff --git a/ga/25.0.0.8/kernel/helpers/build/configuration_snippets/http-ssl-endpoint.xml b/ga/25.0.0.9/kernel/helpers/build/configuration_snippets/http-ssl-endpoint.xml similarity index 100% rename from ga/25.0.0.8/kernel/helpers/build/configuration_snippets/http-ssl-endpoint.xml rename to ga/25.0.0.9/kernel/helpers/build/configuration_snippets/http-ssl-endpoint.xml diff --git a/ga/25.0.0.8/kernel/helpers/build/configuration_snippets/iiop-endpoint.xml b/ga/25.0.0.9/kernel/helpers/build/configuration_snippets/iiop-endpoint.xml similarity index 100% rename from ga/25.0.0.8/kernel/helpers/build/configuration_snippets/iiop-endpoint.xml rename to ga/25.0.0.9/kernel/helpers/build/configuration_snippets/iiop-endpoint.xml diff --git a/ga/25.0.0.8/kernel/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml b/ga/25.0.0.9/kernel/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml similarity index 100% rename from ga/25.0.0.8/kernel/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml rename to ga/25.0.0.9/kernel/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml diff --git a/ga/25.0.0.8/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache-config.xml b/ga/25.0.0.9/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache-config.xml similarity index 100% rename from ga/25.0.0.8/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache-config.xml rename to ga/25.0.0.9/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache-config.xml diff --git a/ga/25.0.0.8/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/ga/25.0.0.9/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml similarity index 100% rename from ga/25.0.0.8/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml rename to ga/25.0.0.9/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml diff --git a/ga/25.0.0.8/kernel/helpers/build/configuration_snippets/jms-endpoint.xml b/ga/25.0.0.9/kernel/helpers/build/configuration_snippets/jms-endpoint.xml similarity index 100% rename from ga/25.0.0.8/kernel/helpers/build/configuration_snippets/jms-endpoint.xml rename to ga/25.0.0.9/kernel/helpers/build/configuration_snippets/jms-endpoint.xml diff --git a/ga/25.0.0.8/kernel/helpers/build/configuration_snippets/jms-ssl-endpoint.xml b/ga/25.0.0.9/kernel/helpers/build/configuration_snippets/jms-ssl-endpoint.xml similarity index 100% rename from ga/25.0.0.8/kernel/helpers/build/configuration_snippets/jms-ssl-endpoint.xml rename to ga/25.0.0.9/kernel/helpers/build/configuration_snippets/jms-ssl-endpoint.xml diff --git a/ga/25.0.0.8/kernel/helpers/build/configuration_snippets/keystore.xml b/ga/25.0.0.9/kernel/helpers/build/configuration_snippets/keystore.xml similarity index 100% rename from ga/25.0.0.8/kernel/helpers/build/configuration_snippets/keystore.xml rename to ga/25.0.0.9/kernel/helpers/build/configuration_snippets/keystore.xml diff --git a/ga/25.0.0.8/kernel/helpers/build/configuration_snippets/mp-health-check.xml b/ga/25.0.0.9/kernel/helpers/build/configuration_snippets/mp-health-check.xml similarity index 100% rename from ga/25.0.0.8/kernel/helpers/build/configuration_snippets/mp-health-check.xml rename to ga/25.0.0.9/kernel/helpers/build/configuration_snippets/mp-health-check.xml diff --git a/ga/25.0.0.8/kernel/helpers/build/configuration_snippets/mp-monitoring.xml b/ga/25.0.0.9/kernel/helpers/build/configuration_snippets/mp-monitoring.xml similarity index 100% rename from ga/25.0.0.8/kernel/helpers/build/configuration_snippets/mp-monitoring.xml rename to ga/25.0.0.9/kernel/helpers/build/configuration_snippets/mp-monitoring.xml diff --git a/ga/25.0.0.8/kernel/helpers/build/configuration_snippets/oidc-config.xml b/ga/25.0.0.9/kernel/helpers/build/configuration_snippets/oidc-config.xml similarity index 100% rename from ga/25.0.0.8/kernel/helpers/build/configuration_snippets/oidc-config.xml rename to ga/25.0.0.9/kernel/helpers/build/configuration_snippets/oidc-config.xml diff --git a/ga/25.0.0.8/kernel/helpers/build/configuration_snippets/oidc.xml b/ga/25.0.0.9/kernel/helpers/build/configuration_snippets/oidc.xml similarity index 100% rename from ga/25.0.0.8/kernel/helpers/build/configuration_snippets/oidc.xml rename to ga/25.0.0.9/kernel/helpers/build/configuration_snippets/oidc.xml diff --git a/ga/25.0.0.8/kernel/helpers/build/configuration_snippets/sessioncache-features.xml b/ga/25.0.0.9/kernel/helpers/build/configuration_snippets/sessioncache-features.xml similarity index 100% rename from ga/25.0.0.8/kernel/helpers/build/configuration_snippets/sessioncache-features.xml rename to ga/25.0.0.9/kernel/helpers/build/configuration_snippets/sessioncache-features.xml diff --git a/ga/25.0.0.8/kernel/helpers/build/configuration_snippets/sso-facebook.xml b/ga/25.0.0.9/kernel/helpers/build/configuration_snippets/sso-facebook.xml similarity index 100% rename from ga/25.0.0.8/kernel/helpers/build/configuration_snippets/sso-facebook.xml rename to ga/25.0.0.9/kernel/helpers/build/configuration_snippets/sso-facebook.xml diff --git a/ga/25.0.0.8/kernel/helpers/build/configuration_snippets/sso-features.xml b/ga/25.0.0.9/kernel/helpers/build/configuration_snippets/sso-features.xml similarity index 100% rename from ga/25.0.0.8/kernel/helpers/build/configuration_snippets/sso-features.xml rename to ga/25.0.0.9/kernel/helpers/build/configuration_snippets/sso-features.xml diff --git a/ga/25.0.0.8/kernel/helpers/build/configuration_snippets/sso-github.xml b/ga/25.0.0.9/kernel/helpers/build/configuration_snippets/sso-github.xml similarity index 100% rename from ga/25.0.0.8/kernel/helpers/build/configuration_snippets/sso-github.xml rename to ga/25.0.0.9/kernel/helpers/build/configuration_snippets/sso-github.xml diff --git a/ga/25.0.0.8/kernel/helpers/build/configuration_snippets/sso-google.xml b/ga/25.0.0.9/kernel/helpers/build/configuration_snippets/sso-google.xml similarity index 100% rename from ga/25.0.0.8/kernel/helpers/build/configuration_snippets/sso-google.xml rename to ga/25.0.0.9/kernel/helpers/build/configuration_snippets/sso-google.xml diff --git a/ga/25.0.0.8/kernel/helpers/build/configuration_snippets/sso-linkedin.xml b/ga/25.0.0.9/kernel/helpers/build/configuration_snippets/sso-linkedin.xml similarity index 100% rename from ga/25.0.0.8/kernel/helpers/build/configuration_snippets/sso-linkedin.xml rename to ga/25.0.0.9/kernel/helpers/build/configuration_snippets/sso-linkedin.xml diff --git a/ga/25.0.0.8/kernel/helpers/build/configuration_snippets/sso-oauth2.xml b/ga/25.0.0.9/kernel/helpers/build/configuration_snippets/sso-oauth2.xml similarity index 100% rename from ga/25.0.0.8/kernel/helpers/build/configuration_snippets/sso-oauth2.xml rename to ga/25.0.0.9/kernel/helpers/build/configuration_snippets/sso-oauth2.xml diff --git a/ga/25.0.0.8/kernel/helpers/build/configuration_snippets/sso-oidc.xml b/ga/25.0.0.9/kernel/helpers/build/configuration_snippets/sso-oidc.xml similarity index 100% rename from ga/25.0.0.8/kernel/helpers/build/configuration_snippets/sso-oidc.xml rename to ga/25.0.0.9/kernel/helpers/build/configuration_snippets/sso-oidc.xml diff --git a/ga/25.0.0.8/kernel/helpers/build/configuration_snippets/sso-twitter.xml b/ga/25.0.0.9/kernel/helpers/build/configuration_snippets/sso-twitter.xml similarity index 100% rename from ga/25.0.0.8/kernel/helpers/build/configuration_snippets/sso-twitter.xml rename to ga/25.0.0.9/kernel/helpers/build/configuration_snippets/sso-twitter.xml diff --git a/ga/25.0.0.8/kernel/helpers/build/configuration_snippets/tls.xml b/ga/25.0.0.9/kernel/helpers/build/configuration_snippets/tls.xml similarity index 100% rename from ga/25.0.0.8/kernel/helpers/build/configuration_snippets/tls.xml rename to ga/25.0.0.9/kernel/helpers/build/configuration_snippets/tls.xml diff --git a/ga/25.0.0.8/kernel/helpers/build/configuration_snippets/trustDefault.xml b/ga/25.0.0.9/kernel/helpers/build/configuration_snippets/trustDefault.xml similarity index 100% rename from ga/25.0.0.8/kernel/helpers/build/configuration_snippets/trustDefault.xml rename to ga/25.0.0.9/kernel/helpers/build/configuration_snippets/trustDefault.xml diff --git a/ga/25.0.0.8/kernel/helpers/build/configuration_snippets/truststore.xml b/ga/25.0.0.9/kernel/helpers/build/configuration_snippets/truststore.xml similarity index 100% rename from ga/25.0.0.8/kernel/helpers/build/configuration_snippets/truststore.xml rename to ga/25.0.0.9/kernel/helpers/build/configuration_snippets/truststore.xml diff --git a/ga/25.0.0.8/kernel/helpers/build/configure.sh b/ga/25.0.0.9/kernel/helpers/build/configure.sh similarity index 100% rename from ga/25.0.0.8/kernel/helpers/build/configure.sh rename to ga/25.0.0.9/kernel/helpers/build/configure.sh diff --git a/ga/25.0.0.8/kernel/helpers/build/features.sh b/ga/25.0.0.9/kernel/helpers/build/features.sh similarity index 100% rename from ga/25.0.0.8/kernel/helpers/build/features.sh rename to ga/25.0.0.9/kernel/helpers/build/features.sh diff --git a/ga/25.0.0.8/kernel/helpers/build/infinispan-client-setup.sh b/ga/25.0.0.9/kernel/helpers/build/infinispan-client-setup.sh similarity index 100% rename from ga/25.0.0.8/kernel/helpers/build/infinispan-client-setup.sh rename to ga/25.0.0.9/kernel/helpers/build/infinispan-client-setup.sh diff --git a/ga/25.0.0.8/kernel/helpers/build/internal/features-installed.sh b/ga/25.0.0.9/kernel/helpers/build/internal/features-installed.sh similarity index 100% rename from ga/25.0.0.8/kernel/helpers/build/internal/features-installed.sh rename to ga/25.0.0.9/kernel/helpers/build/internal/features-installed.sh diff --git a/ga/25.0.0.8/kernel/helpers/build/internal/logger.sh b/ga/25.0.0.9/kernel/helpers/build/internal/logger.sh similarity index 100% rename from ga/25.0.0.8/kernel/helpers/build/internal/logger.sh rename to ga/25.0.0.9/kernel/helpers/build/internal/logger.sh diff --git a/ga/25.0.0.8/kernel/helpers/build/pidplus.sh b/ga/25.0.0.9/kernel/helpers/build/pidplus.sh similarity index 100% rename from ga/25.0.0.8/kernel/helpers/build/pidplus.sh rename to ga/25.0.0.9/kernel/helpers/build/pidplus.sh diff --git a/ga/25.0.0.8/kernel/helpers/build/populate_scc.sh b/ga/25.0.0.9/kernel/helpers/build/populate_scc.sh similarity index 100% rename from ga/25.0.0.8/kernel/helpers/build/populate_scc.sh rename to ga/25.0.0.9/kernel/helpers/build/populate_scc.sh diff --git a/ga/25.0.0.8/kernel/helpers/runtime/docker-server.sh b/ga/25.0.0.9/kernel/helpers/runtime/docker-server.sh similarity index 100% rename from ga/25.0.0.8/kernel/helpers/runtime/docker-server.sh rename to ga/25.0.0.9/kernel/helpers/runtime/docker-server.sh diff --git a/ga/25.0.0.8/kernel/helpers/runtime/livenessHealthCheck.sh b/ga/25.0.0.9/kernel/helpers/runtime/livenessHealthCheck.sh similarity index 100% rename from ga/25.0.0.8/kernel/helpers/runtime/livenessHealthCheck.sh rename to ga/25.0.0.9/kernel/helpers/runtime/livenessHealthCheck.sh diff --git a/ga/25.0.0.8/kernel/helpers/runtime/readinessHealthCheck.sh b/ga/25.0.0.9/kernel/helpers/runtime/readinessHealthCheck.sh similarity index 100% rename from ga/25.0.0.8/kernel/helpers/runtime/readinessHealthCheck.sh rename to ga/25.0.0.9/kernel/helpers/runtime/readinessHealthCheck.sh diff --git a/ga/25.0.0.8/kernel/helpers/runtime/restore-server.sh b/ga/25.0.0.9/kernel/helpers/runtime/restore-server.sh similarity index 100% rename from ga/25.0.0.8/kernel/helpers/runtime/restore-server.sh rename to ga/25.0.0.9/kernel/helpers/runtime/restore-server.sh diff --git a/ga/25.0.0.8/kernel/helpers/runtime/startupHealthCheck.sh b/ga/25.0.0.9/kernel/helpers/runtime/startupHealthCheck.sh similarity index 100% rename from ga/25.0.0.8/kernel/helpers/runtime/startupHealthCheck.sh rename to ga/25.0.0.9/kernel/helpers/runtime/startupHealthCheck.sh diff --git a/ga/25.0.0.8/kernel/resources/.gitkeep b/ga/25.0.0.9/kernel/resources/.gitkeep similarity index 100% rename from ga/25.0.0.8/kernel/resources/.gitkeep rename to ga/25.0.0.9/kernel/resources/.gitkeep diff --git a/ga/25.0.0.8/oidcProvider/Dockerfile b/ga/25.0.0.9/oidcProvider/Dockerfile similarity index 100% rename from ga/25.0.0.8/oidcProvider/Dockerfile rename to ga/25.0.0.9/oidcProvider/Dockerfile diff --git a/ga/25.0.0.8/oidcProvider/Dockerfile.java11 b/ga/25.0.0.9/oidcProvider/Dockerfile.java11 similarity index 100% rename from ga/25.0.0.8/oidcProvider/Dockerfile.java11 rename to ga/25.0.0.9/oidcProvider/Dockerfile.java11 diff --git a/ga/25.0.0.8/oidcProvider/README.md b/ga/25.0.0.9/oidcProvider/README.md similarity index 100% rename from ga/25.0.0.8/oidcProvider/README.md rename to ga/25.0.0.9/oidcProvider/README.md diff --git a/ga/25.0.0.8/oidcProvider/server.xml b/ga/25.0.0.9/oidcProvider/server.xml similarity index 100% rename from ga/25.0.0.8/oidcProvider/server.xml rename to ga/25.0.0.9/oidcProvider/server.xml diff --git a/ga/latest/kernel/Dockerfile.ubi.ibmjava8 b/ga/latest/kernel/Dockerfile.ubi.ibmjava8 index 737dc6db1..e85d7fb3c 100644 --- a/ga/latest/kernel/Dockerfile.ubi.ibmjava8 +++ b/ga/latest/kernel/Dockerfile.ubi.ibmjava8 @@ -19,10 +19,10 @@ USER root ARG VERBOSE=false # Install WebSphere Liberty -ARG LIBERTY_VERSION=25.0.0.8 +ARG LIBERTY_VERSION=25.0.0.9 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" -ARG LIBERTY_SHA=27abac812660d4dba368044ba969b29c27e23f85 +ARG LIBERTY_SHA={replace_with_correct_sha} # If there is a local copy of the image use that instead COPY resources/ /tmp/ @@ -48,8 +48,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=25.0.0.8 -ARG LIBERTY_BUILD_LABEL=cl250420250407-1902 +ARG LIBERTY_VERSION=25.0.0.9 +ARG LIBERTY_BUILD_LABEL=cl250920250821-1629 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk11 b/ga/latest/kernel/Dockerfile.ubi.openjdk11 index 6ecb08a4f..fa5c0d42c 100644 --- a/ga/latest/kernel/Dockerfile.ubi.openjdk11 +++ b/ga/latest/kernel/Dockerfile.ubi.openjdk11 @@ -19,10 +19,10 @@ USER root ARG VERBOSE=false # Install WebSphere Liberty -ARG LIBERTY_VERSION=25.0.0.8 +ARG LIBERTY_VERSION=25.0.0.9 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" -ARG LIBERTY_SHA=27abac812660d4dba368044ba969b29c27e23f85 +ARG LIBERTY_SHA={replace_with_correct_sha} # If there is a local copy of the image use that instead @@ -49,8 +49,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=25.0.0.8 -ARG LIBERTY_BUILD_LABEL=cl250420250407-1902 +ARG LIBERTY_VERSION=25.0.0.9 +ARG LIBERTY_BUILD_LABEL=cl250920250821-1629 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk17 b/ga/latest/kernel/Dockerfile.ubi.openjdk17 index 9908e6f4e..9d9373a88 100644 --- a/ga/latest/kernel/Dockerfile.ubi.openjdk17 +++ b/ga/latest/kernel/Dockerfile.ubi.openjdk17 @@ -19,10 +19,10 @@ USER root ARG VERBOSE=false # Install WebSphere Liberty -ARG LIBERTY_VERSION=25.0.0.8 +ARG LIBERTY_VERSION=25.0.0.9 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" -ARG LIBERTY_SHA=27abac812660d4dba368044ba969b29c27e23f85 +ARG LIBERTY_SHA={replace_with_correct_sha} # If there is a local copy of the image use that instead COPY resources/ /tmp/ @@ -48,8 +48,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=25.0.0.8 -ARG LIBERTY_BUILD_LABEL=cl250420250407-1902 +ARG LIBERTY_VERSION=25.0.0.9 +ARG LIBERTY_BUILD_LABEL=cl250920250821-1629 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk8 b/ga/latest/kernel/Dockerfile.ubi.openjdk8 index 51870a84c..722d1af6f 100644 --- a/ga/latest/kernel/Dockerfile.ubi.openjdk8 +++ b/ga/latest/kernel/Dockerfile.ubi.openjdk8 @@ -19,10 +19,10 @@ USER root ARG VERBOSE=false # Install WebSphere Liberty -ARG LIBERTY_VERSION=25.0.0.8 +ARG LIBERTY_VERSION=25.0.0.9 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" -ARG LIBERTY_SHA=27abac812660d4dba368044ba969b29c27e23f85 +ARG LIBERTY_SHA={replace_with_correct_sha} # If there is a local copy of the image use that instead COPY resources/ /tmp/ @@ -48,8 +48,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=25.0.0.8 -ARG LIBERTY_BUILD_LABEL=cl250420250407-1902 +ARG LIBERTY_VERSION=25.0.0.9 +ARG LIBERTY_BUILD_LABEL=cl250920250821-1629 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/latest/kernel/Dockerfile.ubi9-minimal.ibmjava8 b/ga/latest/kernel/Dockerfile.ubi9-minimal.ibmjava8 index d73cb528d..b7c74cc1f 100644 --- a/ga/latest/kernel/Dockerfile.ubi9-minimal.ibmjava8 +++ b/ga/latest/kernel/Dockerfile.ubi9-minimal.ibmjava8 @@ -29,10 +29,10 @@ USER root ARG VERBOSE=false # Install WebSphere Liberty -ARG LIBERTY_VERSION=25.0.0.8 +ARG LIBERTY_VERSION=25.0.0.9 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" -ARG LIBERTY_SHA=27abac812660d4dba368044ba969b29c27e23f85 +ARG LIBERTY_SHA={replace_with_correct_sha} # If there is a local copy of the image use that instead COPY resources/ /tmp/ @@ -59,8 +59,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=25.0.0.8 -ARG LIBERTY_BUILD_LABEL=cl250420250407-1902 +ARG LIBERTY_VERSION=25.0.0.9 +ARG LIBERTY_BUILD_LABEL=cl250920250821-1629 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Iain Lewis, Melissa Lee, Kirby Chin" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk11 b/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk11 index ec5a7e9d9..5a1df1ee8 100644 --- a/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk11 +++ b/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk11 @@ -19,10 +19,10 @@ USER root ARG VERBOSE=false # Install WebSphere Liberty -ARG LIBERTY_VERSION=25.0.0.8 +ARG LIBERTY_VERSION=25.0.0.9 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" -ARG LIBERTY_SHA=27abac812660d4dba368044ba969b29c27e23f85 +ARG LIBERTY_SHA={replace_with_correct_sha} # If there is a local copy of the image use that instead COPY resources/ /tmp/ @@ -47,8 +47,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=25.0.0.8 -ARG LIBERTY_BUILD_LABEL=cl250420250407-1902 +ARG LIBERTY_VERSION=25.0.0.9 +ARG LIBERTY_BUILD_LABEL=cl250920250821-1629 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Iain Lewis, Melissa Lee, Kirby Chin" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk17 b/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk17 index b87ece593..35fd124b4 100644 --- a/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk17 +++ b/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk17 @@ -19,10 +19,10 @@ USER root ARG VERBOSE=false # Install WebSphere Liberty -ARG LIBERTY_VERSION=25.0.0.8 +ARG LIBERTY_VERSION=25.0.0.9 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" -ARG LIBERTY_SHA=27abac812660d4dba368044ba969b29c27e23f85 +ARG LIBERTY_SHA={replace_with_correct_sha} # If there is a local copy of the image use that instead COPY resources/ /tmp/ @@ -47,8 +47,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=25.0.0.8 -ARG LIBERTY_BUILD_LABEL=cl250420250407-1902 +ARG LIBERTY_VERSION=25.0.0.9 +ARG LIBERTY_BUILD_LABEL=cl250920250821-1629 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Iain Lewis, Melissa Lee, Kirby Chin" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk21 b/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk21 index 5679732a5..e5679c78b 100644 --- a/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk21 +++ b/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk21 @@ -19,10 +19,10 @@ USER root ARG VERBOSE=false # Install WebSphere Liberty -ARG LIBERTY_VERSION=25.0.0.8 +ARG LIBERTY_VERSION=25.0.0.9 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" -ARG LIBERTY_SHA=27abac812660d4dba368044ba969b29c27e23f85 +ARG LIBERTY_SHA={replace_with_correct_sha} # If there is a local copy of the image use that instead COPY resources/ /tmp/ @@ -47,8 +47,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=25.0.0.8 -ARG LIBERTY_BUILD_LABEL=cl250420250407-1902 +ARG LIBERTY_VERSION=25.0.0.9 +ARG LIBERTY_BUILD_LABEL=cl250920250821-1629 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk8 b/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk8 index 56e670119..50af66bfb 100644 --- a/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk8 +++ b/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk8 @@ -19,10 +19,10 @@ USER root ARG VERBOSE=false # Install WebSphere Liberty -ARG LIBERTY_VERSION=25.0.0.8 +ARG LIBERTY_VERSION=25.0.0.9 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" -ARG LIBERTY_SHA=27abac812660d4dba368044ba969b29c27e23f85 +ARG LIBERTY_SHA={replace_with_correct_sha} # If there is a local copy of the image use that instead COPY resources/ /tmp/ @@ -47,8 +47,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=25.0.0.8 -ARG LIBERTY_BUILD_LABEL=cl250420250407-1902 +ARG LIBERTY_VERSION=25.0.0.9 +ARG LIBERTY_BUILD_LABEL=cl250920250821-1629 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Iain Lewis, Melissa Lee, Kirby Chin" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8 b/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8 index 3d94fada1..7121f2d66 100644 --- a/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8 +++ b/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8 @@ -19,9 +19,9 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=25.0.0.8 -ARG LIBERTY_BUILD_LABEL=cl250420250407-1902 -ARG LIBERTY_SHA=27abac812660d4dba368044ba969b29c27e23f85 +ARG LIBERTY_VERSION=25.0.0.9 +ARG LIBERTY_BUILD_LABEL=cl250920250821-1629 +ARG LIBERTY_SHA={replace_with_correct_sha} LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/latest/kernel/Dockerfile.ubuntu.openjdk11 b/ga/latest/kernel/Dockerfile.ubuntu.openjdk11 index 73c023c8c..bc4914ab0 100644 --- a/ga/latest/kernel/Dockerfile.ubuntu.openjdk11 +++ b/ga/latest/kernel/Dockerfile.ubuntu.openjdk11 @@ -19,9 +19,9 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=25.0.0.8 -ARG LIBERTY_BUILD_LABEL=cl250420250407-1902 -ARG LIBERTY_SHA=27abac812660d4dba368044ba969b29c27e23f85 +ARG LIBERTY_VERSION=25.0.0.9 +ARG LIBERTY_BUILD_LABEL=cl250920250821-1629 +ARG LIBERTY_SHA={replace_with_correct_sha} LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/latest/kernel/Dockerfile.ubuntu.openjdk17 b/ga/latest/kernel/Dockerfile.ubuntu.openjdk17 index c3e260e87..d87770ed2 100644 --- a/ga/latest/kernel/Dockerfile.ubuntu.openjdk17 +++ b/ga/latest/kernel/Dockerfile.ubuntu.openjdk17 @@ -19,9 +19,9 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=25.0.0.8 -ARG LIBERTY_BUILD_LABEL=cl250420250407-1902 -ARG LIBERTY_SHA=27abac812660d4dba368044ba969b29c27e23f85 +ARG LIBERTY_VERSION=25.0.0.9 +ARG LIBERTY_BUILD_LABEL=cl250920250821-1629 +ARG LIBERTY_SHA={replace_with_correct_sha} LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ From 0153be7383014690e05daa8e2ca38cd51d8116cd Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Fri, 22 Aug 2025 12:38:52 -0700 Subject: [PATCH 2/4] Replace placeholder text with actual checksum values --- ga/25.0.0.9/kernel/Dockerfile.ubi.ibmjava8 | 2 +- ga/25.0.0.9/kernel/Dockerfile.ubi.openjdk11 | 2 +- ga/25.0.0.9/kernel/Dockerfile.ubi.openjdk17 | 2 +- ga/25.0.0.9/kernel/Dockerfile.ubi.openjdk8 | 2 +- ga/25.0.0.9/kernel/Dockerfile.ubi9-minimal.ibmjava8 | 2 +- ga/25.0.0.9/kernel/Dockerfile.ubi9-minimal.openjdk11 | 2 +- ga/25.0.0.9/kernel/Dockerfile.ubi9-minimal.openjdk17 | 2 +- ga/25.0.0.9/kernel/Dockerfile.ubi9-minimal.openjdk21 | 2 +- ga/25.0.0.9/kernel/Dockerfile.ubi9-minimal.openjdk8 | 2 +- ga/25.0.0.9/kernel/Dockerfile.ubuntu.ibmjava8 | 2 +- ga/25.0.0.9/kernel/Dockerfile.ubuntu.openjdk11 | 2 +- ga/25.0.0.9/kernel/Dockerfile.ubuntu.openjdk17 | 2 +- ga/latest/kernel/Dockerfile.ubi.ibmjava8 | 2 +- ga/latest/kernel/Dockerfile.ubi.openjdk11 | 2 +- ga/latest/kernel/Dockerfile.ubi.openjdk17 | 2 +- ga/latest/kernel/Dockerfile.ubi.openjdk8 | 2 +- ga/latest/kernel/Dockerfile.ubi9-minimal.ibmjava8 | 2 +- ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk11 | 2 +- ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk17 | 2 +- ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk21 | 2 +- ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk8 | 2 +- ga/latest/kernel/Dockerfile.ubuntu.ibmjava8 | 2 +- ga/latest/kernel/Dockerfile.ubuntu.openjdk11 | 2 +- ga/latest/kernel/Dockerfile.ubuntu.openjdk17 | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/ga/25.0.0.9/kernel/Dockerfile.ubi.ibmjava8 b/ga/25.0.0.9/kernel/Dockerfile.ubi.ibmjava8 index e85d7fb3c..a4b926228 100644 --- a/ga/25.0.0.9/kernel/Dockerfile.ubi.ibmjava8 +++ b/ga/25.0.0.9/kernel/Dockerfile.ubi.ibmjava8 @@ -22,7 +22,7 @@ ARG VERBOSE=false ARG LIBERTY_VERSION=25.0.0.9 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" -ARG LIBERTY_SHA={replace_with_correct_sha} +ARG LIBERTY_SHA=7bfd3fb8cb8034df7e237e354af8da53892df731 # If there is a local copy of the image use that instead COPY resources/ /tmp/ diff --git a/ga/25.0.0.9/kernel/Dockerfile.ubi.openjdk11 b/ga/25.0.0.9/kernel/Dockerfile.ubi.openjdk11 index fa5c0d42c..9af32d61e 100644 --- a/ga/25.0.0.9/kernel/Dockerfile.ubi.openjdk11 +++ b/ga/25.0.0.9/kernel/Dockerfile.ubi.openjdk11 @@ -22,7 +22,7 @@ ARG VERBOSE=false ARG LIBERTY_VERSION=25.0.0.9 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" -ARG LIBERTY_SHA={replace_with_correct_sha} +ARG LIBERTY_SHA=7bfd3fb8cb8034df7e237e354af8da53892df731 # If there is a local copy of the image use that instead diff --git a/ga/25.0.0.9/kernel/Dockerfile.ubi.openjdk17 b/ga/25.0.0.9/kernel/Dockerfile.ubi.openjdk17 index 9d9373a88..453a99536 100644 --- a/ga/25.0.0.9/kernel/Dockerfile.ubi.openjdk17 +++ b/ga/25.0.0.9/kernel/Dockerfile.ubi.openjdk17 @@ -22,7 +22,7 @@ ARG VERBOSE=false ARG LIBERTY_VERSION=25.0.0.9 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" -ARG LIBERTY_SHA={replace_with_correct_sha} +ARG LIBERTY_SHA=7bfd3fb8cb8034df7e237e354af8da53892df731 # If there is a local copy of the image use that instead COPY resources/ /tmp/ diff --git a/ga/25.0.0.9/kernel/Dockerfile.ubi.openjdk8 b/ga/25.0.0.9/kernel/Dockerfile.ubi.openjdk8 index 722d1af6f..176320f90 100644 --- a/ga/25.0.0.9/kernel/Dockerfile.ubi.openjdk8 +++ b/ga/25.0.0.9/kernel/Dockerfile.ubi.openjdk8 @@ -22,7 +22,7 @@ ARG VERBOSE=false ARG LIBERTY_VERSION=25.0.0.9 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" -ARG LIBERTY_SHA={replace_with_correct_sha} +ARG LIBERTY_SHA=7bfd3fb8cb8034df7e237e354af8da53892df731 # If there is a local copy of the image use that instead COPY resources/ /tmp/ diff --git a/ga/25.0.0.9/kernel/Dockerfile.ubi9-minimal.ibmjava8 b/ga/25.0.0.9/kernel/Dockerfile.ubi9-minimal.ibmjava8 index b7c74cc1f..f19d7333b 100644 --- a/ga/25.0.0.9/kernel/Dockerfile.ubi9-minimal.ibmjava8 +++ b/ga/25.0.0.9/kernel/Dockerfile.ubi9-minimal.ibmjava8 @@ -32,7 +32,7 @@ ARG VERBOSE=false ARG LIBERTY_VERSION=25.0.0.9 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" -ARG LIBERTY_SHA={replace_with_correct_sha} +ARG LIBERTY_SHA=7bfd3fb8cb8034df7e237e354af8da53892df731 # If there is a local copy of the image use that instead COPY resources/ /tmp/ diff --git a/ga/25.0.0.9/kernel/Dockerfile.ubi9-minimal.openjdk11 b/ga/25.0.0.9/kernel/Dockerfile.ubi9-minimal.openjdk11 index 5a1df1ee8..e3525b4eb 100644 --- a/ga/25.0.0.9/kernel/Dockerfile.ubi9-minimal.openjdk11 +++ b/ga/25.0.0.9/kernel/Dockerfile.ubi9-minimal.openjdk11 @@ -22,7 +22,7 @@ ARG VERBOSE=false ARG LIBERTY_VERSION=25.0.0.9 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" -ARG LIBERTY_SHA={replace_with_correct_sha} +ARG LIBERTY_SHA=7bfd3fb8cb8034df7e237e354af8da53892df731 # If there is a local copy of the image use that instead COPY resources/ /tmp/ diff --git a/ga/25.0.0.9/kernel/Dockerfile.ubi9-minimal.openjdk17 b/ga/25.0.0.9/kernel/Dockerfile.ubi9-minimal.openjdk17 index 35fd124b4..c7721fc7f 100644 --- a/ga/25.0.0.9/kernel/Dockerfile.ubi9-minimal.openjdk17 +++ b/ga/25.0.0.9/kernel/Dockerfile.ubi9-minimal.openjdk17 @@ -22,7 +22,7 @@ ARG VERBOSE=false ARG LIBERTY_VERSION=25.0.0.9 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" -ARG LIBERTY_SHA={replace_with_correct_sha} +ARG LIBERTY_SHA=7bfd3fb8cb8034df7e237e354af8da53892df731 # If there is a local copy of the image use that instead COPY resources/ /tmp/ diff --git a/ga/25.0.0.9/kernel/Dockerfile.ubi9-minimal.openjdk21 b/ga/25.0.0.9/kernel/Dockerfile.ubi9-minimal.openjdk21 index e5679c78b..809a275da 100644 --- a/ga/25.0.0.9/kernel/Dockerfile.ubi9-minimal.openjdk21 +++ b/ga/25.0.0.9/kernel/Dockerfile.ubi9-minimal.openjdk21 @@ -22,7 +22,7 @@ ARG VERBOSE=false ARG LIBERTY_VERSION=25.0.0.9 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" -ARG LIBERTY_SHA={replace_with_correct_sha} +ARG LIBERTY_SHA=7bfd3fb8cb8034df7e237e354af8da53892df731 # If there is a local copy of the image use that instead COPY resources/ /tmp/ diff --git a/ga/25.0.0.9/kernel/Dockerfile.ubi9-minimal.openjdk8 b/ga/25.0.0.9/kernel/Dockerfile.ubi9-minimal.openjdk8 index 50af66bfb..86a31e8f8 100644 --- a/ga/25.0.0.9/kernel/Dockerfile.ubi9-minimal.openjdk8 +++ b/ga/25.0.0.9/kernel/Dockerfile.ubi9-minimal.openjdk8 @@ -22,7 +22,7 @@ ARG VERBOSE=false ARG LIBERTY_VERSION=25.0.0.9 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" -ARG LIBERTY_SHA={replace_with_correct_sha} +ARG LIBERTY_SHA=7bfd3fb8cb8034df7e237e354af8da53892df731 # If there is a local copy of the image use that instead COPY resources/ /tmp/ diff --git a/ga/25.0.0.9/kernel/Dockerfile.ubuntu.ibmjava8 b/ga/25.0.0.9/kernel/Dockerfile.ubuntu.ibmjava8 index 7121f2d66..5e5e4272f 100644 --- a/ga/25.0.0.9/kernel/Dockerfile.ubuntu.ibmjava8 +++ b/ga/25.0.0.9/kernel/Dockerfile.ubuntu.ibmjava8 @@ -21,7 +21,7 @@ ARG OPENJ9_SCC=true ARG LIBERTY_VERSION=25.0.0.9 ARG LIBERTY_BUILD_LABEL=cl250920250821-1629 -ARG LIBERTY_SHA={replace_with_correct_sha} +ARG LIBERTY_SHA=7bfd3fb8cb8034df7e237e354af8da53892df731 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/25.0.0.9/kernel/Dockerfile.ubuntu.openjdk11 b/ga/25.0.0.9/kernel/Dockerfile.ubuntu.openjdk11 index bc4914ab0..328311991 100644 --- a/ga/25.0.0.9/kernel/Dockerfile.ubuntu.openjdk11 +++ b/ga/25.0.0.9/kernel/Dockerfile.ubuntu.openjdk11 @@ -21,7 +21,7 @@ ARG OPENJ9_SCC=true ARG LIBERTY_VERSION=25.0.0.9 ARG LIBERTY_BUILD_LABEL=cl250920250821-1629 -ARG LIBERTY_SHA={replace_with_correct_sha} +ARG LIBERTY_SHA=7bfd3fb8cb8034df7e237e354af8da53892df731 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/25.0.0.9/kernel/Dockerfile.ubuntu.openjdk17 b/ga/25.0.0.9/kernel/Dockerfile.ubuntu.openjdk17 index d87770ed2..fba9d370a 100644 --- a/ga/25.0.0.9/kernel/Dockerfile.ubuntu.openjdk17 +++ b/ga/25.0.0.9/kernel/Dockerfile.ubuntu.openjdk17 @@ -21,7 +21,7 @@ ARG OPENJ9_SCC=true ARG LIBERTY_VERSION=25.0.0.9 ARG LIBERTY_BUILD_LABEL=cl250920250821-1629 -ARG LIBERTY_SHA={replace_with_correct_sha} +ARG LIBERTY_SHA=7bfd3fb8cb8034df7e237e354af8da53892df731 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/latest/kernel/Dockerfile.ubi.ibmjava8 b/ga/latest/kernel/Dockerfile.ubi.ibmjava8 index e85d7fb3c..a4b926228 100644 --- a/ga/latest/kernel/Dockerfile.ubi.ibmjava8 +++ b/ga/latest/kernel/Dockerfile.ubi.ibmjava8 @@ -22,7 +22,7 @@ ARG VERBOSE=false ARG LIBERTY_VERSION=25.0.0.9 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" -ARG LIBERTY_SHA={replace_with_correct_sha} +ARG LIBERTY_SHA=7bfd3fb8cb8034df7e237e354af8da53892df731 # If there is a local copy of the image use that instead COPY resources/ /tmp/ diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk11 b/ga/latest/kernel/Dockerfile.ubi.openjdk11 index fa5c0d42c..9af32d61e 100644 --- a/ga/latest/kernel/Dockerfile.ubi.openjdk11 +++ b/ga/latest/kernel/Dockerfile.ubi.openjdk11 @@ -22,7 +22,7 @@ ARG VERBOSE=false ARG LIBERTY_VERSION=25.0.0.9 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" -ARG LIBERTY_SHA={replace_with_correct_sha} +ARG LIBERTY_SHA=7bfd3fb8cb8034df7e237e354af8da53892df731 # If there is a local copy of the image use that instead diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk17 b/ga/latest/kernel/Dockerfile.ubi.openjdk17 index 9d9373a88..453a99536 100644 --- a/ga/latest/kernel/Dockerfile.ubi.openjdk17 +++ b/ga/latest/kernel/Dockerfile.ubi.openjdk17 @@ -22,7 +22,7 @@ ARG VERBOSE=false ARG LIBERTY_VERSION=25.0.0.9 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" -ARG LIBERTY_SHA={replace_with_correct_sha} +ARG LIBERTY_SHA=7bfd3fb8cb8034df7e237e354af8da53892df731 # If there is a local copy of the image use that instead COPY resources/ /tmp/ diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk8 b/ga/latest/kernel/Dockerfile.ubi.openjdk8 index 722d1af6f..176320f90 100644 --- a/ga/latest/kernel/Dockerfile.ubi.openjdk8 +++ b/ga/latest/kernel/Dockerfile.ubi.openjdk8 @@ -22,7 +22,7 @@ ARG VERBOSE=false ARG LIBERTY_VERSION=25.0.0.9 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" -ARG LIBERTY_SHA={replace_with_correct_sha} +ARG LIBERTY_SHA=7bfd3fb8cb8034df7e237e354af8da53892df731 # If there is a local copy of the image use that instead COPY resources/ /tmp/ diff --git a/ga/latest/kernel/Dockerfile.ubi9-minimal.ibmjava8 b/ga/latest/kernel/Dockerfile.ubi9-minimal.ibmjava8 index b7c74cc1f..f19d7333b 100644 --- a/ga/latest/kernel/Dockerfile.ubi9-minimal.ibmjava8 +++ b/ga/latest/kernel/Dockerfile.ubi9-minimal.ibmjava8 @@ -32,7 +32,7 @@ ARG VERBOSE=false ARG LIBERTY_VERSION=25.0.0.9 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" -ARG LIBERTY_SHA={replace_with_correct_sha} +ARG LIBERTY_SHA=7bfd3fb8cb8034df7e237e354af8da53892df731 # If there is a local copy of the image use that instead COPY resources/ /tmp/ diff --git a/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk11 b/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk11 index 5a1df1ee8..e3525b4eb 100644 --- a/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk11 +++ b/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk11 @@ -22,7 +22,7 @@ ARG VERBOSE=false ARG LIBERTY_VERSION=25.0.0.9 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" -ARG LIBERTY_SHA={replace_with_correct_sha} +ARG LIBERTY_SHA=7bfd3fb8cb8034df7e237e354af8da53892df731 # If there is a local copy of the image use that instead COPY resources/ /tmp/ diff --git a/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk17 b/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk17 index 35fd124b4..c7721fc7f 100644 --- a/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk17 +++ b/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk17 @@ -22,7 +22,7 @@ ARG VERBOSE=false ARG LIBERTY_VERSION=25.0.0.9 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" -ARG LIBERTY_SHA={replace_with_correct_sha} +ARG LIBERTY_SHA=7bfd3fb8cb8034df7e237e354af8da53892df731 # If there is a local copy of the image use that instead COPY resources/ /tmp/ diff --git a/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk21 b/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk21 index e5679c78b..809a275da 100644 --- a/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk21 +++ b/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk21 @@ -22,7 +22,7 @@ ARG VERBOSE=false ARG LIBERTY_VERSION=25.0.0.9 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" -ARG LIBERTY_SHA={replace_with_correct_sha} +ARG LIBERTY_SHA=7bfd3fb8cb8034df7e237e354af8da53892df731 # If there is a local copy of the image use that instead COPY resources/ /tmp/ diff --git a/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk8 b/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk8 index 50af66bfb..86a31e8f8 100644 --- a/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk8 +++ b/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk8 @@ -22,7 +22,7 @@ ARG VERBOSE=false ARG LIBERTY_VERSION=25.0.0.9 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" -ARG LIBERTY_SHA={replace_with_correct_sha} +ARG LIBERTY_SHA=7bfd3fb8cb8034df7e237e354af8da53892df731 # If there is a local copy of the image use that instead COPY resources/ /tmp/ diff --git a/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8 b/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8 index 7121f2d66..5e5e4272f 100644 --- a/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8 +++ b/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8 @@ -21,7 +21,7 @@ ARG OPENJ9_SCC=true ARG LIBERTY_VERSION=25.0.0.9 ARG LIBERTY_BUILD_LABEL=cl250920250821-1629 -ARG LIBERTY_SHA={replace_with_correct_sha} +ARG LIBERTY_SHA=7bfd3fb8cb8034df7e237e354af8da53892df731 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/latest/kernel/Dockerfile.ubuntu.openjdk11 b/ga/latest/kernel/Dockerfile.ubuntu.openjdk11 index bc4914ab0..328311991 100644 --- a/ga/latest/kernel/Dockerfile.ubuntu.openjdk11 +++ b/ga/latest/kernel/Dockerfile.ubuntu.openjdk11 @@ -21,7 +21,7 @@ ARG OPENJ9_SCC=true ARG LIBERTY_VERSION=25.0.0.9 ARG LIBERTY_BUILD_LABEL=cl250920250821-1629 -ARG LIBERTY_SHA={replace_with_correct_sha} +ARG LIBERTY_SHA=7bfd3fb8cb8034df7e237e354af8da53892df731 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/latest/kernel/Dockerfile.ubuntu.openjdk17 b/ga/latest/kernel/Dockerfile.ubuntu.openjdk17 index d87770ed2..fba9d370a 100644 --- a/ga/latest/kernel/Dockerfile.ubuntu.openjdk17 +++ b/ga/latest/kernel/Dockerfile.ubuntu.openjdk17 @@ -21,7 +21,7 @@ ARG OPENJ9_SCC=true ARG LIBERTY_VERSION=25.0.0.9 ARG LIBERTY_BUILD_LABEL=cl250920250821-1629 -ARG LIBERTY_SHA={replace_with_correct_sha} +ARG LIBERTY_SHA=7bfd3fb8cb8034df7e237e354af8da53892df731 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ From bbd1680972d043b8a5f5bca212c8f757a9064c8d Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Fri, 22 Aug 2025 12:45:55 -0700 Subject: [PATCH 3/4] Update secrets baseline for 25.0.0.9 --- .secrets.baseline | 700 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 699 insertions(+), 1 deletion(-) diff --git a/.secrets.baseline b/.secrets.baseline index 3f4433528..717990588 100644 --- a/.secrets.baseline +++ b/.secrets.baseline @@ -3,7 +3,7 @@ "files": "^.secrets.baseline$", "lines": "fbf6a96d49214c0abc6a3bc5da6e48cd|REPLACE|PWD_TRUST|SECRET|keyStore|secret|rootpwd|dbpassword" }, - "generated_at": "2025-08-01T17:14:01Z", + "generated_at": "2025-08-22T19:43:14Z", "plugins_used": [ { "name": "AWSKeyDetector" @@ -97,6 +97,678 @@ "verified_result": null } ], + "ga/25.0.0.3/full/server.xml": [ + { + "hashed_secret": "d1bbd0d69a08402e6c1fc2d1bc5a5ea5c3a7ea13", + "is_secret": false, + "is_verified": false, + "line_number": 16, + "type": "Secret Keyword", + "verified_result": null + } + ], + "ga/25.0.0.3/kernel/Dockerfile.ubi.ibmjava8": [ + { + "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", + "is_secret": false, + "is_verified": false, + "line_number": 73, + "type": "Hex High Entropy String", + "verified_result": null + } + ], + "ga/25.0.0.3/kernel/Dockerfile.ubi.openjdk11": [ + { + "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", + "is_secret": false, + "is_verified": false, + "line_number": 74, + "type": "Hex High Entropy String", + "verified_result": null + } + ], + "ga/25.0.0.3/kernel/Dockerfile.ubi.openjdk17": [ + { + "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", + "is_secret": false, + "is_verified": false, + "line_number": 73, + "type": "Hex High Entropy String", + "verified_result": null + } + ], + "ga/25.0.0.3/kernel/Dockerfile.ubi.openjdk21": [ + { + "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", + "is_secret": false, + "is_verified": false, + "line_number": 72, + "type": "Hex High Entropy String", + "verified_result": null + } + ], + "ga/25.0.0.3/kernel/Dockerfile.ubi.openjdk8": [ + { + "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", + "is_secret": false, + "is_verified": false, + "line_number": 73, + "type": "Hex High Entropy String", + "verified_result": null + } + ], + "ga/25.0.0.3/kernel/Dockerfile.ubuntu.ibmjava8": [ + { + "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", + "is_secret": false, + "is_verified": false, + "line_number": 40, + "type": "Hex High Entropy String", + "verified_result": null + } + ], + "ga/25.0.0.3/kernel/Dockerfile.ubuntu.openjdk11": [ + { + "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", + "is_secret": false, + "is_verified": false, + "line_number": 40, + "type": "Hex High Entropy String", + "verified_result": null + } + ], + "ga/25.0.0.3/kernel/Dockerfile.ubuntu.openjdk17": [ + { + "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", + "is_secret": false, + "is_verified": false, + "line_number": 40, + "type": "Hex High Entropy String", + "verified_result": null + } + ], + "ga/25.0.0.3/kernel/helpers/build/configuration_snippets/keystore.xml": [ + { + "hashed_secret": "3cacc7bfac0a382c669a884c953d0401a689785d", + "is_secret": false, + "is_verified": false, + "line_number": 2, + "type": "Secret Keyword", + "verified_result": null + } + ], + "ga/25.0.0.3/kernel/helpers/build/configuration_snippets/truststore.xml": [ + { + "hashed_secret": "662e721e5b6494888b2792ea3b8a1fa310f6ea45", + "is_secret": false, + "is_verified": false, + "line_number": 3, + "type": "Secret Keyword", + "verified_result": null + } + ], + "ga/25.0.0.3/kernel/helpers/runtime/docker-server.sh": [ + { + "hashed_secret": "ad321232b1e4e90a29208e1f70d06aad788caa16", + "is_secret": false, + "is_verified": false, + "line_number": 138, + "type": "Secret Keyword", + "verified_result": null + } + ], + "ga/25.0.0.3/oidcProvider/server.xml": [ + { + "hashed_secret": "1511e358bea6f50b2ddb2ca19c6422e871a0086f", + "is_secret": false, + "is_verified": false, + "line_number": 42, + "type": "Secret Keyword", + "verified_result": null + }, + { + "hashed_secret": "3c342e7cc23d90ad2c0193c561b80e87ae763fd0", + "is_secret": false, + "is_verified": false, + "line_number": 133, + "type": "Secret Keyword", + "verified_result": null + } + ], + "ga/25.0.0.6/full/server.xml": [ + { + "hashed_secret": "d1bbd0d69a08402e6c1fc2d1bc5a5ea5c3a7ea13", + "is_secret": false, + "is_verified": false, + "line_number": 16, + "type": "Secret Keyword", + "verified_result": null + } + ], + "ga/25.0.0.6/kernel/Dockerfile.ubi.ibmjava8": [ + { + "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", + "is_secret": false, + "is_verified": false, + "line_number": 73, + "type": "Hex High Entropy String", + "verified_result": null + } + ], + "ga/25.0.0.6/kernel/Dockerfile.ubi.openjdk11": [ + { + "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", + "is_secret": false, + "is_verified": false, + "line_number": 74, + "type": "Hex High Entropy String", + "verified_result": null + } + ], + "ga/25.0.0.6/kernel/Dockerfile.ubi.openjdk17": [ + { + "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", + "is_secret": false, + "is_verified": false, + "line_number": 73, + "type": "Hex High Entropy String", + "verified_result": null + } + ], + "ga/25.0.0.6/kernel/Dockerfile.ubi.openjdk8": [ + { + "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", + "is_secret": false, + "is_verified": false, + "line_number": 73, + "type": "Hex High Entropy String", + "verified_result": null + } + ], + "ga/25.0.0.6/kernel/Dockerfile.ubi9-minimal.ibmjava8": [ + { + "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", + "is_secret": false, + "is_verified": false, + "line_number": 84, + "type": "Hex High Entropy String", + "verified_result": null + } + ], + "ga/25.0.0.6/kernel/Dockerfile.ubi9-minimal.openjdk11": [ + { + "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", + "is_secret": false, + "is_verified": false, + "line_number": 72, + "type": "Hex High Entropy String", + "verified_result": null + } + ], + "ga/25.0.0.6/kernel/Dockerfile.ubi9-minimal.openjdk17": [ + { + "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", + "is_secret": false, + "is_verified": false, + "line_number": 72, + "type": "Hex High Entropy String", + "verified_result": null + } + ], + "ga/25.0.0.6/kernel/Dockerfile.ubi9-minimal.openjdk21": [ + { + "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", + "is_secret": false, + "is_verified": false, + "line_number": 72, + "type": "Hex High Entropy String", + "verified_result": null + } + ], + "ga/25.0.0.6/kernel/Dockerfile.ubi9-minimal.openjdk8": [ + { + "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", + "is_secret": false, + "is_verified": false, + "line_number": 72, + "type": "Hex High Entropy String", + "verified_result": null + } + ], + "ga/25.0.0.6/kernel/Dockerfile.ubuntu.ibmjava8": [ + { + "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", + "is_secret": false, + "is_verified": false, + "line_number": 40, + "type": "Hex High Entropy String", + "verified_result": null + } + ], + "ga/25.0.0.6/kernel/Dockerfile.ubuntu.openjdk11": [ + { + "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", + "is_secret": false, + "is_verified": false, + "line_number": 40, + "type": "Hex High Entropy String", + "verified_result": null + } + ], + "ga/25.0.0.6/kernel/Dockerfile.ubuntu.openjdk17": [ + { + "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", + "is_secret": false, + "is_verified": false, + "line_number": 40, + "type": "Hex High Entropy String", + "verified_result": null + } + ], + "ga/25.0.0.6/kernel/helpers/build/configuration_snippets/keystore.xml": [ + { + "hashed_secret": "3cacc7bfac0a382c669a884c953d0401a689785d", + "is_secret": false, + "is_verified": false, + "line_number": 2, + "type": "Secret Keyword", + "verified_result": null + } + ], + "ga/25.0.0.6/kernel/helpers/build/configuration_snippets/truststore.xml": [ + { + "hashed_secret": "662e721e5b6494888b2792ea3b8a1fa310f6ea45", + "is_secret": false, + "is_verified": false, + "line_number": 3, + "type": "Secret Keyword", + "verified_result": null + } + ], + "ga/25.0.0.6/kernel/helpers/runtime/docker-server.sh": [ + { + "hashed_secret": "ad321232b1e4e90a29208e1f70d06aad788caa16", + "is_secret": false, + "is_verified": false, + "line_number": 141, + "type": "Secret Keyword", + "verified_result": null + } + ], + "ga/25.0.0.6/oidcProvider/server.xml": [ + { + "hashed_secret": "1511e358bea6f50b2ddb2ca19c6422e871a0086f", + "is_secret": false, + "is_verified": false, + "line_number": 42, + "type": "Secret Keyword", + "verified_result": null + }, + { + "hashed_secret": "3c342e7cc23d90ad2c0193c561b80e87ae763fd0", + "is_secret": false, + "is_verified": false, + "line_number": 133, + "type": "Secret Keyword", + "verified_result": null + } + ], + "ga/25.0.0.9/full/server.xml": [ + { + "hashed_secret": "d1bbd0d69a08402e6c1fc2d1bc5a5ea5c3a7ea13", + "is_secret": false, + "is_verified": false, + "line_number": 16, + "type": "Secret Keyword", + "verified_result": null + } + ], + "ga/25.0.0.9/kernel/Dockerfile.ubi.ibmjava8": [ + { + "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", + "is_secret": false, + "is_verified": false, + "line_number": 73, + "type": "Hex High Entropy String", + "verified_result": null + } + ], + "ga/25.0.0.9/kernel/Dockerfile.ubi.openjdk11": [ + { + "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", + "is_secret": false, + "is_verified": false, + "line_number": 74, + "type": "Hex High Entropy String", + "verified_result": null + } + ], + "ga/25.0.0.9/kernel/Dockerfile.ubi.openjdk17": [ + { + "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", + "is_secret": false, + "is_verified": false, + "line_number": 73, + "type": "Hex High Entropy String", + "verified_result": null + } + ], + "ga/25.0.0.9/kernel/Dockerfile.ubi.openjdk8": [ + { + "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", + "is_secret": false, + "is_verified": false, + "line_number": 73, + "type": "Hex High Entropy String", + "verified_result": null + } + ], + "ga/25.0.0.9/kernel/Dockerfile.ubi9-minimal.ibmjava8": [ + { + "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", + "is_secret": false, + "is_verified": false, + "line_number": 84, + "type": "Hex High Entropy String", + "verified_result": null + } + ], + "ga/25.0.0.9/kernel/Dockerfile.ubi9-minimal.openjdk11": [ + { + "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", + "is_secret": false, + "is_verified": false, + "line_number": 72, + "type": "Hex High Entropy String", + "verified_result": null + } + ], + "ga/25.0.0.9/kernel/Dockerfile.ubi9-minimal.openjdk17": [ + { + "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", + "is_secret": false, + "is_verified": false, + "line_number": 72, + "type": "Hex High Entropy String", + "verified_result": null + } + ], + "ga/25.0.0.9/kernel/Dockerfile.ubi9-minimal.openjdk21": [ + { + "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", + "is_secret": false, + "is_verified": false, + "line_number": 72, + "type": "Hex High Entropy String", + "verified_result": null + } + ], + "ga/25.0.0.9/kernel/Dockerfile.ubi9-minimal.openjdk8": [ + { + "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", + "is_secret": false, + "is_verified": false, + "line_number": 72, + "type": "Hex High Entropy String", + "verified_result": null + } + ], + "ga/25.0.0.9/kernel/Dockerfile.ubuntu.ibmjava8": [ + { + "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", + "is_secret": false, + "is_verified": false, + "line_number": 40, + "type": "Hex High Entropy String", + "verified_result": null + } + ], + "ga/25.0.0.9/kernel/Dockerfile.ubuntu.openjdk11": [ + { + "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", + "is_secret": false, + "is_verified": false, + "line_number": 40, + "type": "Hex High Entropy String", + "verified_result": null + } + ], + "ga/25.0.0.9/kernel/Dockerfile.ubuntu.openjdk17": [ + { + "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", + "is_secret": false, + "is_verified": false, + "line_number": 40, + "type": "Hex High Entropy String", + "verified_result": null + } + ], + "ga/25.0.0.9/kernel/helpers/build/configuration_snippets/keystore.xml": [ + { + "hashed_secret": "3cacc7bfac0a382c669a884c953d0401a689785d", + "is_secret": false, + "is_verified": false, + "line_number": 2, + "type": "Secret Keyword", + "verified_result": null + } + ], + "ga/25.0.0.9/kernel/helpers/build/configuration_snippets/truststore.xml": [ + { + "hashed_secret": "662e721e5b6494888b2792ea3b8a1fa310f6ea45", + "is_secret": false, + "is_verified": false, + "line_number": 3, + "type": "Secret Keyword", + "verified_result": null + } + ], + "ga/25.0.0.9/kernel/helpers/runtime/docker-server.sh": [ + { + "hashed_secret": "ad321232b1e4e90a29208e1f70d06aad788caa16", + "is_secret": false, + "is_verified": false, + "line_number": 141, + "type": "Secret Keyword", + "verified_result": null + } + ], + "ga/25.0.0.9/oidcProvider/server.xml": [ + { + "hashed_secret": "1511e358bea6f50b2ddb2ca19c6422e871a0086f", + "is_secret": false, + "is_verified": false, + "line_number": 42, + "type": "Secret Keyword", + "verified_result": null + }, + { + "hashed_secret": "3c342e7cc23d90ad2c0193c561b80e87ae763fd0", + "is_secret": false, + "is_verified": false, + "line_number": 133, + "type": "Secret Keyword", + "verified_result": null + } + ], + "ga/latest/full/server.xml": [ + { + "hashed_secret": "d1bbd0d69a08402e6c1fc2d1bc5a5ea5c3a7ea13", + "is_secret": false, + "is_verified": false, + "line_number": 16, + "type": "Secret Keyword", + "verified_result": null + } + ], + "ga/latest/kernel/Dockerfile.ubi.ibmjava8": [ + { + "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", + "is_secret": false, + "is_verified": false, + "line_number": 73, + "type": "Hex High Entropy String", + "verified_result": null + } + ], + "ga/latest/kernel/Dockerfile.ubi.openjdk11": [ + { + "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", + "is_secret": false, + "is_verified": false, + "line_number": 74, + "type": "Hex High Entropy String", + "verified_result": null + } + ], + "ga/latest/kernel/Dockerfile.ubi.openjdk17": [ + { + "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", + "is_secret": false, + "is_verified": false, + "line_number": 73, + "type": "Hex High Entropy String", + "verified_result": null + } + ], + "ga/latest/kernel/Dockerfile.ubi.openjdk8": [ + { + "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", + "is_secret": false, + "is_verified": false, + "line_number": 73, + "type": "Hex High Entropy String", + "verified_result": null + } + ], + "ga/latest/kernel/Dockerfile.ubi9-minimal.ibmjava8": [ + { + "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", + "is_secret": false, + "is_verified": false, + "line_number": 84, + "type": "Hex High Entropy String", + "verified_result": null + } + ], + "ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk11": [ + { + "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", + "is_secret": false, + "is_verified": false, + "line_number": 72, + "type": "Hex High Entropy String", + "verified_result": null + } + ], + "ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk17": [ + { + "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", + "is_secret": false, + "is_verified": false, + "line_number": 72, + "type": "Hex High Entropy String", + "verified_result": null + } + ], + "ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk21": [ + { + "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", + "is_secret": false, + "is_verified": false, + "line_number": 72, + "type": "Hex High Entropy String", + "verified_result": null + } + ], + "ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk8": [ + { + "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", + "is_secret": false, + "is_verified": false, + "line_number": 72, + "type": "Hex High Entropy String", + "verified_result": null + } + ], + "ga/latest/kernel/Dockerfile.ubuntu.ibmjava8": [ + { + "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", + "is_secret": false, + "is_verified": false, + "line_number": 40, + "type": "Hex High Entropy String", + "verified_result": null + } + ], + "ga/latest/kernel/Dockerfile.ubuntu.openjdk11": [ + { + "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", + "is_secret": false, + "is_verified": false, + "line_number": 40, + "type": "Hex High Entropy String", + "verified_result": null + } + ], + "ga/latest/kernel/Dockerfile.ubuntu.openjdk17": [ + { + "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", + "is_secret": false, + "is_verified": false, + "line_number": 40, + "type": "Hex High Entropy String", + "verified_result": null + } + ], + "ga/latest/kernel/helpers/build/configuration_snippets/keystore.xml": [ + { + "hashed_secret": "3cacc7bfac0a382c669a884c953d0401a689785d", + "is_secret": false, + "is_verified": false, + "line_number": 2, + "type": "Secret Keyword", + "verified_result": null + } + ], + "ga/latest/kernel/helpers/build/configuration_snippets/truststore.xml": [ + { + "hashed_secret": "662e721e5b6494888b2792ea3b8a1fa310f6ea45", + "is_secret": false, + "is_verified": false, + "line_number": 3, + "type": "Secret Keyword", + "verified_result": null + } + ], + "ga/latest/kernel/helpers/runtime/docker-server.sh": [ + { + "hashed_secret": "ad321232b1e4e90a29208e1f70d06aad788caa16", + "is_secret": false, + "is_verified": false, + "line_number": 141, + "type": "Secret Keyword", + "verified_result": null + } + ], + "ga/latest/oidcProvider/server.xml": [ + { + "hashed_secret": "1511e358bea6f50b2ddb2ca19c6422e871a0086f", + "is_secret": false, + "is_verified": false, + "line_number": 42, + "type": "Secret Keyword", + "verified_result": null + }, + { + "hashed_secret": "3c342e7cc23d90ad2c0193c561b80e87ae763fd0", + "is_secret": false, + "is_verified": false, + "line_number": 133, + "type": "Secret Keyword", + "verified_result": null + } + ], "samples/security/sso-secret.yaml": [ { "hashed_secret": "efb4afcc74d267bdc169ba2d98ae84634cfdab5b", @@ -107,7 +779,25 @@ "verified_result": null } ], + "test/test-pet-clinic/server.xml": [ + { + "hashed_secret": "d1bbd0d69a08402e6c1fc2d1bc5a5ea5c3a7ea13", + "is_secret": false, + "is_verified": false, + "line_number": 19, + "type": "Secret Keyword", + "verified_result": null + } + ], "test/test-stock-quote/config/server.xml": [ + { + "hashed_secret": "7c6a61c68ef8b9b6b061b28c348bc1ed7921cb53", + "is_secret": false, + "is_verified": false, + "line_number": 27, + "type": "Secret Keyword", + "verified_result": null + }, { "hashed_secret": "d033e22ae348aeb5660fc2140aec35850c4da997", "is_secret": false, @@ -150,6 +840,14 @@ } ], "test/test-stock-trader/config/server.xml": [ + { + "hashed_secret": "7c6a61c68ef8b9b6b061b28c348bc1ed7921cb53", + "is_secret": false, + "is_verified": false, + "line_number": 33, + "type": "Secret Keyword", + "verified_result": null + }, { "hashed_secret": "d033e22ae348aeb5660fc2140aec35850c4da997", "is_secret": false, From 9f43d9415a3079b271b8bf8cddeb31f60ed348f2 Mon Sep 17 00:00:00 2001 From: Gkerta Seferi Date: Thu, 11 Sep 2025 14:25:21 +0100 Subject: [PATCH 4/4] Fixing conflicts --- .secrets.baseline | 74 +---------------------------------------------- 1 file changed, 1 insertion(+), 73 deletions(-) diff --git a/.secrets.baseline b/.secrets.baseline index b0d3d3210..db627701e 100644 --- a/.secrets.baseline +++ b/.secrets.baseline @@ -3,11 +3,7 @@ "files": "^.secrets.baseline$", "lines": "fbf6a96d49214c0abc6a3bc5da6e48cd|REPLACE|PWD_TRUST|SECRET|keyStore|secret|rootpwd|dbpassword" }, -<<<<<<< HEAD - "generated_at": "2025-08-22T19:43:14Z", -======= - "generated_at": "2025-08-13T18:55:02Z", ->>>>>>> main + "generated_at": "2025-09-11T13:25:02Z", "plugins_used": [ { "name": "AWSKeyDetector" @@ -417,11 +413,7 @@ "verified_result": null } ], -<<<<<<< HEAD "ga/25.0.0.9/full/server.xml": [ -======= - "ga/25.0.0.8/full/server.xml": [ ->>>>>>> main { "hashed_secret": "d1bbd0d69a08402e6c1fc2d1bc5a5ea5c3a7ea13", "is_secret": false, @@ -431,11 +423,7 @@ "verified_result": null } ], -<<<<<<< HEAD "ga/25.0.0.9/kernel/Dockerfile.ubi.ibmjava8": [ -======= - "ga/25.0.0.8/kernel/Dockerfile.ubi.ibmjava8": [ ->>>>>>> main { "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", "is_secret": false, @@ -445,11 +433,7 @@ "verified_result": null } ], -<<<<<<< HEAD "ga/25.0.0.9/kernel/Dockerfile.ubi.openjdk11": [ -======= - "ga/25.0.0.8/kernel/Dockerfile.ubi.openjdk11": [ ->>>>>>> main { "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", "is_secret": false, @@ -459,11 +443,7 @@ "verified_result": null } ], -<<<<<<< HEAD "ga/25.0.0.9/kernel/Dockerfile.ubi.openjdk17": [ -======= - "ga/25.0.0.8/kernel/Dockerfile.ubi.openjdk17": [ ->>>>>>> main { "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", "is_secret": false, @@ -473,11 +453,7 @@ "verified_result": null } ], -<<<<<<< HEAD "ga/25.0.0.9/kernel/Dockerfile.ubi.openjdk8": [ -======= - "ga/25.0.0.8/kernel/Dockerfile.ubi.openjdk8": [ ->>>>>>> main { "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", "is_secret": false, @@ -487,11 +463,7 @@ "verified_result": null } ], -<<<<<<< HEAD "ga/25.0.0.9/kernel/Dockerfile.ubi9-minimal.ibmjava8": [ -======= - "ga/25.0.0.8/kernel/Dockerfile.ubi9-minimal.ibmjava8": [ ->>>>>>> main { "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", "is_secret": false, @@ -501,11 +473,7 @@ "verified_result": null } ], -<<<<<<< HEAD "ga/25.0.0.9/kernel/Dockerfile.ubi9-minimal.openjdk11": [ -======= - "ga/25.0.0.8/kernel/Dockerfile.ubi9-minimal.openjdk11": [ ->>>>>>> main { "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", "is_secret": false, @@ -515,11 +483,7 @@ "verified_result": null } ], -<<<<<<< HEAD "ga/25.0.0.9/kernel/Dockerfile.ubi9-minimal.openjdk17": [ -======= - "ga/25.0.0.8/kernel/Dockerfile.ubi9-minimal.openjdk17": [ ->>>>>>> main { "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", "is_secret": false, @@ -529,11 +493,7 @@ "verified_result": null } ], -<<<<<<< HEAD "ga/25.0.0.9/kernel/Dockerfile.ubi9-minimal.openjdk21": [ -======= - "ga/25.0.0.8/kernel/Dockerfile.ubi9-minimal.openjdk21": [ ->>>>>>> main { "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", "is_secret": false, @@ -543,11 +503,7 @@ "verified_result": null } ], -<<<<<<< HEAD "ga/25.0.0.9/kernel/Dockerfile.ubi9-minimal.openjdk8": [ -======= - "ga/25.0.0.8/kernel/Dockerfile.ubi9-minimal.openjdk8": [ ->>>>>>> main { "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", "is_secret": false, @@ -557,11 +513,7 @@ "verified_result": null } ], -<<<<<<< HEAD "ga/25.0.0.9/kernel/Dockerfile.ubuntu.ibmjava8": [ -======= - "ga/25.0.0.8/kernel/Dockerfile.ubuntu.ibmjava8": [ ->>>>>>> main { "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", "is_secret": false, @@ -571,11 +523,7 @@ "verified_result": null } ], -<<<<<<< HEAD "ga/25.0.0.9/kernel/Dockerfile.ubuntu.openjdk11": [ -======= - "ga/25.0.0.8/kernel/Dockerfile.ubuntu.openjdk11": [ ->>>>>>> main { "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", "is_secret": false, @@ -585,11 +533,7 @@ "verified_result": null } ], -<<<<<<< HEAD "ga/25.0.0.9/kernel/Dockerfile.ubuntu.openjdk17": [ -======= - "ga/25.0.0.8/kernel/Dockerfile.ubuntu.openjdk17": [ ->>>>>>> main { "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", "is_secret": false, @@ -599,11 +543,7 @@ "verified_result": null } ], -<<<<<<< HEAD "ga/25.0.0.9/kernel/helpers/build/configuration_snippets/keystore.xml": [ -======= - "ga/25.0.0.8/kernel/helpers/build/configuration_snippets/keystore.xml": [ ->>>>>>> main { "hashed_secret": "3cacc7bfac0a382c669a884c953d0401a689785d", "is_secret": false, @@ -613,11 +553,7 @@ "verified_result": null } ], -<<<<<<< HEAD "ga/25.0.0.9/kernel/helpers/build/configuration_snippets/truststore.xml": [ -======= - "ga/25.0.0.8/kernel/helpers/build/configuration_snippets/truststore.xml": [ ->>>>>>> main { "hashed_secret": "662e721e5b6494888b2792ea3b8a1fa310f6ea45", "is_secret": false, @@ -627,11 +563,7 @@ "verified_result": null } ], -<<<<<<< HEAD "ga/25.0.0.9/kernel/helpers/runtime/docker-server.sh": [ -======= - "ga/25.0.0.8/kernel/helpers/runtime/docker-server.sh": [ ->>>>>>> main { "hashed_secret": "ad321232b1e4e90a29208e1f70d06aad788caa16", "is_secret": false, @@ -641,11 +573,7 @@ "verified_result": null } ], -<<<<<<< HEAD "ga/25.0.0.9/oidcProvider/server.xml": [ -======= - "ga/25.0.0.8/oidcProvider/server.xml": [ ->>>>>>> main { "hashed_secret": "1511e358bea6f50b2ddb2ca19c6422e871a0086f", "is_secret": false,