Skip to content

Commit addfe53

Browse files
authored
Merge pull request #650 from WASdev/vNext
Merge vNext commits into main
2 parents 35c07ae + 120f859 commit addfe53

File tree

79 files changed

+104
-104
lines changed

Some content is hidden

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

79 files changed

+104
-104
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# Ignore .DS_Store
22
.DS_Store
3-
ga/*/*/resources/*
3+
#ga/*/*/resources/*

.secrets.baseline

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"files": "^.secrets.baseline$",
44
"lines": null
55
},
6-
"generated_at": "2024-10-17T10:46:47Z",
6+
"generated_at": "2024-10-23T12:31:11Z",
77
"plugins_used": [
88
{
99
"name": "AWSKeyDetector"
@@ -97,7 +97,7 @@
9797
"verified_result": null
9898
}
9999
],
100-
"ga/24.0.0.10/full/server.xml": [
100+
"ga/24.0.0.11/full/server.xml": [
101101
{
102102
"hashed_secret": "d1bbd0d69a08402e6c1fc2d1bc5a5ea5c3a7ea13",
103103
"is_secret": false,
@@ -107,7 +107,7 @@
107107
"verified_result": null
108108
}
109109
],
110-
"ga/24.0.0.10/kernel/Dockerfile.ubi.ibmjava8": [
110+
"ga/24.0.0.11/kernel/Dockerfile.ubi.ibmjava8": [
111111
{
112112
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
113113
"is_secret": false,
@@ -117,7 +117,7 @@
117117
"verified_result": null
118118
}
119119
],
120-
"ga/24.0.0.10/kernel/Dockerfile.ubi.openjdk11": [
120+
"ga/24.0.0.11/kernel/Dockerfile.ubi.openjdk11": [
121121
{
122122
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
123123
"is_secret": false,
@@ -127,7 +127,7 @@
127127
"verified_result": null
128128
}
129129
],
130-
"ga/24.0.0.10/kernel/Dockerfile.ubi.openjdk17": [
130+
"ga/24.0.0.11/kernel/Dockerfile.ubi.openjdk17": [
131131
{
132132
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
133133
"is_secret": false,
@@ -137,7 +137,7 @@
137137
"verified_result": null
138138
}
139139
],
140-
"ga/24.0.0.10/kernel/Dockerfile.ubi.openjdk21": [
140+
"ga/24.0.0.11/kernel/Dockerfile.ubi.openjdk21": [
141141
{
142142
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
143143
"is_secret": false,
@@ -147,7 +147,7 @@
147147
"verified_result": null
148148
}
149149
],
150-
"ga/24.0.0.10/kernel/Dockerfile.ubi.openjdk8": [
150+
"ga/24.0.0.11/kernel/Dockerfile.ubi.openjdk8": [
151151
{
152152
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
153153
"is_secret": false,
@@ -157,7 +157,7 @@
157157
"verified_result": null
158158
}
159159
],
160-
"ga/24.0.0.10/kernel/Dockerfile.ubuntu.ibmjava8": [
160+
"ga/24.0.0.11/kernel/Dockerfile.ubuntu.ibmjava8": [
161161
{
162162
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
163163
"is_secret": false,
@@ -167,7 +167,7 @@
167167
"verified_result": null
168168
}
169169
],
170-
"ga/24.0.0.10/kernel/Dockerfile.ubuntu.openjdk11": [
170+
"ga/24.0.0.11/kernel/Dockerfile.ubuntu.openjdk11": [
171171
{
172172
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
173173
"is_secret": false,
@@ -177,7 +177,7 @@
177177
"verified_result": null
178178
}
179179
],
180-
"ga/24.0.0.10/kernel/Dockerfile.ubuntu.openjdk17": [
180+
"ga/24.0.0.11/kernel/Dockerfile.ubuntu.openjdk17": [
181181
{
182182
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
183183
"is_secret": false,
@@ -187,7 +187,7 @@
187187
"verified_result": null
188188
}
189189
],
190-
"ga/24.0.0.10/kernel/helpers/build/configuration_snippets/keystore.xml": [
190+
"ga/24.0.0.11/kernel/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-
"ga/24.0.0.10/kernel/helpers/build/configuration_snippets/truststore.xml": [
200+
"ga/24.0.0.11/kernel/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-
"ga/24.0.0.10/kernel/helpers/runtime/docker-server.sh": [
210+
"ga/24.0.0.11/kernel/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-
"ga/24.0.0.10/oidcProvider/server.xml": [
220+
"ga/24.0.0.11/oidcProvider/server.xml": [
221221
{
222222
"hashed_secret": "1511e358bea6f50b2ddb2ca19c6422e871a0086f",
223223
"is_secret": false,

create-new-release.sh

100644100755
File mode changed.

ga/24.0.0.10/images.txt

Lines changed: 0 additions & 18 deletions
This file was deleted.
File renamed without changes.

ga/24.0.0.10/full/Dockerfile.ubi.ibmjava8 renamed to ga/24.0.0.11/full/Dockerfile.ubi.ibmjava8

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.10-kernel-java8-ibmjava-ubi
15+
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.11-kernel-java8-ibmjava-ubi
1616
FROM $PARENT_IMAGE AS installBundle
1717

1818
ARG VERBOSE=false
@@ -36,7 +36,7 @@ RUN set -eux; \
3636
rm -rf /output/workarea /output/logs; \
3737
find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;
3838

39-
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.10-kernel-java8-ibmjava-ubi
39+
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.11-kernel-java8-ibmjava-ubi
4040
FROM $PARENT_IMAGE
4141
ARG VERBOSE=false
4242

ga/24.0.0.10/full/Dockerfile.ubi.openjdk11 renamed to ga/24.0.0.11/full/Dockerfile.ubi.openjdk11

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.10-kernel-java11-openj9-ubi
15+
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.11-kernel-java11-openj9-ubi
1616
FROM $PARENT_IMAGE AS installBundle
1717

1818
ARG VERBOSE=false
@@ -36,7 +36,7 @@ RUN set -eux; \
3636
rm -rf /output/workarea /output/logs; \
3737
find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;
3838

39-
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.10-kernel-java11-openj9-ubi
39+
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.11-kernel-java11-openj9-ubi
4040
FROM $PARENT_IMAGE
4141
ARG VERBOSE=false
4242

ga/24.0.0.10/full/Dockerfile.ubi.openjdk17 renamed to ga/24.0.0.11/full/Dockerfile.ubi.openjdk17

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.10-kernel-java17-openj9-ubi
15+
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.11-kernel-java17-openj9-ubi
1616
FROM $PARENT_IMAGE AS installBundle
1717

1818
ARG VERBOSE=false
@@ -36,7 +36,7 @@ RUN set -eux; \
3636
rm -rf /output/workarea /output/logs; \
3737
find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;
3838

39-
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.10-kernel-java17-openj9-ubi
39+
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.11-kernel-java17-openj9-ubi
4040
FROM $PARENT_IMAGE
4141
ARG VERBOSE=false
4242

ga/24.0.0.10/full/Dockerfile.ubi.openjdk21 renamed to ga/24.0.0.11/full/Dockerfile.ubi.openjdk21

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.10-kernel-java21-openj9-ubi9-minimal
15+
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.11-kernel-java21-openj9-ubi9-minimal
1616
FROM $PARENT_IMAGE AS installBundle
1717

1818
ARG VERBOSE=false
@@ -36,7 +36,7 @@ RUN set -eux; \
3636
rm -rf /output/workarea /output/logs; \
3737
find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;
3838

39-
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.10-kernel-java21-openj9-ubi9-minimal
39+
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.11-kernel-java21-openj9-ubi9-minimal
4040
FROM $PARENT_IMAGE
4141
ARG VERBOSE=false
4242

ga/24.0.0.10/full/Dockerfile.ubi.openjdk8 renamed to ga/24.0.0.11/full/Dockerfile.ubi.openjdk8

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.10-kernel-java8-openj9-ubi
15+
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.11-kernel-java8-openj9-ubi
1616
FROM $PARENT_IMAGE AS installBundle
1717

1818
ARG VERBOSE=false
@@ -36,7 +36,7 @@ RUN set -eux; \
3636
rm -rf /output/workarea /output/logs; \
3737
find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;
3838

39-
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.10-kernel-java8-openj9-ubi
39+
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.11-kernel-java8-openj9-ubi
4040
FROM $PARENT_IMAGE
4141
ARG VERBOSE=false
4242

0 commit comments

Comments
 (0)