Skip to content

Commit 7e898c3

Browse files
leochrleochr
authored
Merge pull request #679 from OpenLiberty/vNext
Merge vNext to main
2 parents c746b8b + e187ee8 commit 7e898c3

140 files changed

Lines changed: 251 additions & 317 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.secrets.baseline‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"files": "^.secrets.baseline$",
44
"lines": "REPLACE|PWD_TRUST|SECRET|keyStore|secret"
55
},
6-
"generated_at": "2025-09-24T15:25:06Z",
6+
"generated_at": "2025-10-21T15:32:15Z",
77
"plugins_used": [
88
{
99
"name": "AWSKeyDetector"
@@ -187,7 +187,7 @@
187187
"verified_result": null
188188
}
189189
],
190-
"releases/25.0.0.10/full/helpers/build/configuration_snippets/keystore.xml": [
190+
"releases/25.0.0.11/full/helpers/build/configuration_snippets/keystore.xml": [
191191
{
192192
"hashed_secret": "3cacc7bfac0a382c669a884c953d0401a689785d",
193193
"is_secret": false,
@@ -197,7 +197,7 @@
197197
"verified_result": null
198198
}
199199
],
200-
"releases/25.0.0.10/full/helpers/build/configuration_snippets/truststore.xml": [
200+
"releases/25.0.0.11/full/helpers/build/configuration_snippets/truststore.xml": [
201201
{
202202
"hashed_secret": "662e721e5b6494888b2792ea3b8a1fa310f6ea45",
203203
"is_secret": false,
@@ -207,7 +207,7 @@
207207
"verified_result": null
208208
}
209209
],
210-
"releases/25.0.0.10/full/helpers/runtime/docker-server.sh": [
210+
"releases/25.0.0.11/full/helpers/runtime/docker-server.sh": [
211211
{
212212
"hashed_secret": "ad321232b1e4e90a29208e1f70d06aad788caa16",
213213
"is_secret": false,
@@ -217,7 +217,7 @@
217217
"verified_result": null
218218
}
219219
],
220-
"releases/25.0.0.10/full/server.xml": [
220+
"releases/25.0.0.11/full/server.xml": [
221221
{
222222
"hashed_secret": "d1bbd0d69a08402e6c1fc2d1bc5a5ea5c3a7ea13",
223223
"is_secret": false,
@@ -227,7 +227,7 @@
227227
"verified_result": null
228228
}
229229
],
230-
"releases/25.0.0.10/kernel-slim/helpers/build/configuration_snippets/keystore.xml": [
230+
"releases/25.0.0.11/kernel-slim/helpers/build/configuration_snippets/keystore.xml": [
231231
{
232232
"hashed_secret": "3cacc7bfac0a382c669a884c953d0401a689785d",
233233
"is_secret": false,
@@ -237,7 +237,7 @@
237237
"verified_result": null
238238
}
239239
],
240-
"releases/25.0.0.10/kernel-slim/helpers/build/configuration_snippets/truststore.xml": [
240+
"releases/25.0.0.11/kernel-slim/helpers/build/configuration_snippets/truststore.xml": [
241241
{
242242
"hashed_secret": "662e721e5b6494888b2792ea3b8a1fa310f6ea45",
243243
"is_secret": false,
@@ -247,7 +247,7 @@
247247
"verified_result": null
248248
}
249249
],
250-
"releases/25.0.0.10/kernel-slim/helpers/runtime/docker-server.sh": [
250+
"releases/25.0.0.11/kernel-slim/helpers/runtime/docker-server.sh": [
251251
{
252252
"hashed_secret": "ad321232b1e4e90a29208e1f70d06aad788caa16",
253253
"is_secret": false,

‎releases/25.0.0.10/full/helpers/build/internal/logger.sh‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎releases/25.0.0.10/kernel-slim/helpers/build/internal/logger.sh‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

releases/25.0.0.10/full/Dockerfile.ubi.ibmjava8 renamed to releases/25.0.0.11/full/Dockerfile.ubi.ibmjava8

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ FROM ibmjava:8-ubi AS getRuntime
22

33
USER root
44

5-
ARG LIBERTY_VERSION=25.0.0.10
6-
ARG LIBERTY_SHA=728ce77fbfbaebb26fa857db332ad03241a0d52d
5+
ARG LIBERTY_VERSION=25.0.0.11
6+
ARG LIBERTY_SHA=baf4c6a66207ec55f69aebc17e300067351e479f
77
ARG LIBERTY_DOWNLOAD_URL=https://repo1.maven.org/maven2/io/openliberty/openliberty-runtime/$LIBERTY_VERSION/openliberty-runtime-$LIBERTY_VERSION.zip
88

99
ARG VERBOSE=false
@@ -28,8 +28,8 @@ FROM ibmjava:8-ubi
2828

2929
USER root
3030

31-
ARG LIBERTY_VERSION=25.0.0.10
32-
ARG LIBERTY_BUILD_LABEL=cl251020250923-1355
31+
ARG LIBERTY_VERSION=25.0.0.11
32+
ARG LIBERTY_BUILD_LABEL=cl251120251020-0302
3333

3434
ARG OPENJ9_SCC=true
3535
ARG VERBOSE=false

releases/25.0.0.10/full/Dockerfile.ubi.openjdk11 renamed to releases/25.0.0.11/full/Dockerfile.ubi.openjdk11

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ FROM icr.io/appcafe/ibm-semeru-runtimes:open-11-jdk-ubi AS getRuntime
22

33
USER root
44

5-
ARG LIBERTY_VERSION=25.0.0.10
6-
ARG LIBERTY_SHA=728ce77fbfbaebb26fa857db332ad03241a0d52d
5+
ARG LIBERTY_VERSION=25.0.0.11
6+
ARG LIBERTY_SHA=baf4c6a66207ec55f69aebc17e300067351e479f
77
ARG LIBERTY_DOWNLOAD_URL=https://repo1.maven.org/maven2/io/openliberty/openliberty-runtime/$LIBERTY_VERSION/openliberty-runtime-$LIBERTY_VERSION.zip
88

99
ARG VERBOSE=false
@@ -28,8 +28,8 @@ FROM icr.io/appcafe/ibm-semeru-runtimes:open-11-jdk-ubi
2828

2929
USER root
3030

31-
ARG LIBERTY_VERSION=25.0.0.10
32-
ARG LIBERTY_BUILD_LABEL=cl251020250923-1355
31+
ARG LIBERTY_VERSION=25.0.0.11
32+
ARG LIBERTY_BUILD_LABEL=cl251120251020-0302
3333

3434
ARG OPENJ9_SCC=true
3535
ARG VERBOSE=false

releases/25.0.0.10/full/Dockerfile.ubi.openjdk17 renamed to releases/25.0.0.11/full/Dockerfile.ubi.openjdk17

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ FROM icr.io/appcafe/ibm-semeru-runtimes:open-17-jdk-ubi AS getRuntime
22

33
USER root
44

5-
ARG LIBERTY_VERSION=25.0.0.10
6-
ARG LIBERTY_SHA=728ce77fbfbaebb26fa857db332ad03241a0d52d
5+
ARG LIBERTY_VERSION=25.0.0.11
6+
ARG LIBERTY_SHA=baf4c6a66207ec55f69aebc17e300067351e479f
77
ARG LIBERTY_DOWNLOAD_URL=https://repo1.maven.org/maven2/io/openliberty/openliberty-runtime/$LIBERTY_VERSION/openliberty-runtime-$LIBERTY_VERSION.zip
88

99
ARG VERBOSE=false
@@ -28,8 +28,8 @@ FROM icr.io/appcafe/ibm-semeru-runtimes:open-17-jdk-ubi
2828

2929
USER root
3030

31-
ARG LIBERTY_VERSION=25.0.0.10
32-
ARG LIBERTY_BUILD_LABEL=cl251020250923-1355
31+
ARG LIBERTY_VERSION=25.0.0.11
32+
ARG LIBERTY_BUILD_LABEL=cl251120251020-0302
3333

3434
ARG OPENJ9_SCC=true
3535
ARG VERBOSE=false

releases/25.0.0.10/full/Dockerfile.ubi.openjdk8 renamed to releases/25.0.0.11/full/Dockerfile.ubi.openjdk8

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ FROM icr.io/appcafe/ibm-semeru-runtimes:open-8-jdk-ubi AS getRuntime
22

33
USER root
44

5-
ARG LIBERTY_VERSION=25.0.0.10
6-
ARG LIBERTY_SHA=728ce77fbfbaebb26fa857db332ad03241a0d52d
5+
ARG LIBERTY_VERSION=25.0.0.11
6+
ARG LIBERTY_SHA=baf4c6a66207ec55f69aebc17e300067351e479f
77
ARG LIBERTY_DOWNLOAD_URL=https://repo1.maven.org/maven2/io/openliberty/openliberty-runtime/$LIBERTY_VERSION/openliberty-runtime-$LIBERTY_VERSION.zip
88

99
ARG VERBOSE=false
@@ -28,8 +28,8 @@ FROM icr.io/appcafe/ibm-semeru-runtimes:open-8-jdk-ubi
2828

2929
USER root
3030

31-
ARG LIBERTY_VERSION=25.0.0.10
32-
ARG LIBERTY_BUILD_LABEL=cl251020250923-1355
31+
ARG LIBERTY_VERSION=25.0.0.11
32+
ARG LIBERTY_BUILD_LABEL=cl251120251020-0302
3333

3434
ARG OPENJ9_SCC=true
3535
ARG VERBOSE=false

releases/25.0.0.10/full/Dockerfile.ubi9-minimal.ibmjava8 renamed to releases/25.0.0.11/full/Dockerfile.ubi9-minimal.ibmjava8

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
ARG PARENT_IMAGE=icr.io/appcafe/open-liberty:25.0.0.10-kernel-slim-java8-ibmjava-ubi-minimal
1+
ARG PARENT_IMAGE=icr.io/appcafe/open-liberty:25.0.0.11-kernel-slim-java8-ibmjava-ubi-minimal
22

33
FROM $PARENT_IMAGE AS installBundle
44

55
ARG VERBOSE=false
6-
ARG LIBERTY_VERSION=25.0.0.10
7-
ARG FEATURES_SHA=672dfa674ae6a668ebb7876ac7461e91dbe03dce
6+
ARG LIBERTY_VERSION=25.0.0.11
7+
ARG FEATURES_SHA=076c720223f70052a3aecce41e621d45bfc880f9
88

99
# If there is a local copy of the repository use that instead
1010
COPY resources/ /tmp/
@@ -33,7 +33,7 @@ RUN set -eux; \
3333
rm -rf /output/workarea /output/logs; \
3434
find /opt/ol/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;
3535

36-
ARG PARENT_IMAGE=icr.io/appcafe/open-liberty:25.0.0.10-kernel-slim-java8-ibmjava-ubi-minimal
36+
ARG PARENT_IMAGE=icr.io/appcafe/open-liberty:25.0.0.11-kernel-slim-java8-ibmjava-ubi-minimal
3737
FROM $PARENT_IMAGE
3838
ARG VERBOSE=false
3939

releases/25.0.0.10/full/Dockerfile.ubi9-minimal.openjdk11 renamed to releases/25.0.0.11/full/Dockerfile.ubi9-minimal.openjdk11

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
ARG PARENT_IMAGE=icr.io/appcafe/open-liberty:25.0.0.10-kernel-slim-java11-openj9-ubi-minimal
1+
ARG PARENT_IMAGE=icr.io/appcafe/open-liberty:25.0.0.11-kernel-slim-java11-openj9-ubi-minimal
22

33
FROM $PARENT_IMAGE AS installBundle
44

55
ARG VERBOSE=false
6-
ARG LIBERTY_VERSION=25.0.0.10
7-
ARG FEATURES_SHA=672dfa674ae6a668ebb7876ac7461e91dbe03dce
6+
ARG LIBERTY_VERSION=25.0.0.11
7+
ARG FEATURES_SHA=076c720223f70052a3aecce41e621d45bfc880f9
88

99
# If there is a local copy of the repository use that instead
1010
COPY resources/ /tmp/
@@ -33,7 +33,7 @@ RUN set -eux; \
3333
rm -rf /output/workarea /output/logs; \
3434
find /opt/ol/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;
3535

36-
ARG PARENT_IMAGE=icr.io/appcafe/open-liberty:25.0.0.10-kernel-slim-java11-openj9-ubi-minimal
36+
ARG PARENT_IMAGE=icr.io/appcafe/open-liberty:25.0.0.11-kernel-slim-java11-openj9-ubi-minimal
3737
FROM $PARENT_IMAGE
3838
ARG VERBOSE=false
3939

releases/25.0.0.10/full/Dockerfile.ubi9-minimal.openjdk17 renamed to releases/25.0.0.11/full/Dockerfile.ubi9-minimal.openjdk17

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
ARG PARENT_IMAGE=icr.io/appcafe/open-liberty:25.0.0.10-kernel-slim-java17-openj9-ubi-minimal
1+
ARG PARENT_IMAGE=icr.io/appcafe/open-liberty:25.0.0.11-kernel-slim-java17-openj9-ubi-minimal
22

33
FROM $PARENT_IMAGE AS installBundle
44

55
ARG VERBOSE=false
6-
ARG LIBERTY_VERSION=25.0.0.10
7-
ARG FEATURES_SHA=672dfa674ae6a668ebb7876ac7461e91dbe03dce
6+
ARG LIBERTY_VERSION=25.0.0.11
7+
ARG FEATURES_SHA=076c720223f70052a3aecce41e621d45bfc880f9
88

99
# If there is a local copy of the repository use that instead
1010
COPY resources/ /tmp/
@@ -33,7 +33,7 @@ RUN set -eux; \
3333
rm -rf /output/workarea /output/logs; \
3434
find /opt/ol/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;
3535

36-
ARG PARENT_IMAGE=icr.io/appcafe/open-liberty:25.0.0.10-kernel-slim-java17-openj9-ubi-minimal
36+
ARG PARENT_IMAGE=icr.io/appcafe/open-liberty:25.0.0.11-kernel-slim-java17-openj9-ubi-minimal
3737
FROM $PARENT_IMAGE
3838
ARG VERBOSE=false
3939

0 commit comments

Comments
 (0)