Update WebSphere Liberty to 19.0.0.6 #6152
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Diff:diff --git a/_bashbrew-arches b/_bashbrew-arches
index c844935..e779a12 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -1,39 +1,3 @@
-websphere-liberty:18.0.0.4-javaee7 @ amd64
-websphere-liberty:18.0.0.4-javaee7 @ i386
-websphere-liberty:18.0.0.4-javaee7 @ ppc64le
-websphere-liberty:18.0.0.4-javaee7 @ s390x
-websphere-liberty:18.0.0.4-javaee8 @ amd64
-websphere-liberty:18.0.0.4-javaee8 @ i386
-websphere-liberty:18.0.0.4-javaee8 @ ppc64le
-websphere-liberty:18.0.0.4-javaee8 @ s390x
-websphere-liberty:18.0.0.4-kernel @ amd64
-websphere-liberty:18.0.0.4-kernel @ i386
-websphere-liberty:18.0.0.4-kernel @ ppc64le
-websphere-liberty:18.0.0.4-kernel @ s390x
-websphere-liberty:18.0.0.4-microProfile1 @ amd64
-websphere-liberty:18.0.0.4-microProfile1 @ i386
-websphere-liberty:18.0.0.4-microProfile1 @ ppc64le
-websphere-liberty:18.0.0.4-microProfile1 @ s390x
-websphere-liberty:18.0.0.4-microProfile2 @ amd64
-websphere-liberty:18.0.0.4-microProfile2 @ i386
-websphere-liberty:18.0.0.4-microProfile2 @ ppc64le
-websphere-liberty:18.0.0.4-microProfile2 @ s390x
-websphere-liberty:18.0.0.4-springBoot1 @ amd64
-websphere-liberty:18.0.0.4-springBoot1 @ i386
-websphere-liberty:18.0.0.4-springBoot1 @ ppc64le
-websphere-liberty:18.0.0.4-springBoot1 @ s390x
-websphere-liberty:18.0.0.4-springBoot2 @ amd64
-websphere-liberty:18.0.0.4-springBoot2 @ i386
-websphere-liberty:18.0.0.4-springBoot2 @ ppc64le
-websphere-liberty:18.0.0.4-springBoot2 @ s390x
-websphere-liberty:18.0.0.4-webProfile7 @ amd64
-websphere-liberty:18.0.0.4-webProfile7 @ i386
-websphere-liberty:18.0.0.4-webProfile7 @ ppc64le
-websphere-liberty:18.0.0.4-webProfile7 @ s390x
-websphere-liberty:18.0.0.4-webProfile8 @ amd64
-websphere-liberty:18.0.0.4-webProfile8 @ i386
-websphere-liberty:18.0.0.4-webProfile8 @ ppc64le
-websphere-liberty:18.0.0.4-webProfile8 @ s390x
websphere-liberty:19.0.0.3-javaee7 @ amd64
websphere-liberty:19.0.0.3-javaee7 @ i386
websphere-liberty:19.0.0.3-javaee7 @ ppc64le
@@ -70,6 +34,42 @@ websphere-liberty:19.0.0.3-webProfile8 @ amd64
websphere-liberty:19.0.0.3-webProfile8 @ i386
websphere-liberty:19.0.0.3-webProfile8 @ ppc64le
websphere-liberty:19.0.0.3-webProfile8 @ s390x
+websphere-liberty:19.0.0.6-javaee7 @ amd64
+websphere-liberty:19.0.0.6-javaee7 @ i386
+websphere-liberty:19.0.0.6-javaee7 @ ppc64le
+websphere-liberty:19.0.0.6-javaee7 @ s390x
+websphere-liberty:19.0.0.6-javaee8 @ amd64
+websphere-liberty:19.0.0.6-javaee8 @ i386
+websphere-liberty:19.0.0.6-javaee8 @ ppc64le
+websphere-liberty:19.0.0.6-javaee8 @ s390x
+websphere-liberty:19.0.0.6-kernel @ amd64
+websphere-liberty:19.0.0.6-kernel @ i386
+websphere-liberty:19.0.0.6-kernel @ ppc64le
+websphere-liberty:19.0.0.6-kernel @ s390x
+websphere-liberty:19.0.0.6-microProfile1 @ amd64
+websphere-liberty:19.0.0.6-microProfile1 @ i386
+websphere-liberty:19.0.0.6-microProfile1 @ ppc64le
+websphere-liberty:19.0.0.6-microProfile1 @ s390x
+websphere-liberty:19.0.0.6-microProfile2 @ amd64
+websphere-liberty:19.0.0.6-microProfile2 @ i386
+websphere-liberty:19.0.0.6-microProfile2 @ ppc64le
+websphere-liberty:19.0.0.6-microProfile2 @ s390x
+websphere-liberty:19.0.0.6-springBoot1 @ amd64
+websphere-liberty:19.0.0.6-springBoot1 @ i386
+websphere-liberty:19.0.0.6-springBoot1 @ ppc64le
+websphere-liberty:19.0.0.6-springBoot1 @ s390x
+websphere-liberty:19.0.0.6-springBoot2 @ amd64
+websphere-liberty:19.0.0.6-springBoot2 @ i386
+websphere-liberty:19.0.0.6-springBoot2 @ ppc64le
+websphere-liberty:19.0.0.6-springBoot2 @ s390x
+websphere-liberty:19.0.0.6-webProfile7 @ amd64
+websphere-liberty:19.0.0.6-webProfile7 @ i386
+websphere-liberty:19.0.0.6-webProfile7 @ ppc64le
+websphere-liberty:19.0.0.6-webProfile7 @ s390x
+websphere-liberty:19.0.0.6-webProfile8 @ amd64
+websphere-liberty:19.0.0.6-webProfile8 @ i386
+websphere-liberty:19.0.0.6-webProfile8 @ ppc64le
+websphere-liberty:19.0.0.6-webProfile8 @ s390x
websphere-liberty:beta @ amd64
websphere-liberty:beta @ i386
websphere-liberty:beta @ ppc64le
diff --git a/_bashbrew-list b/_bashbrew-list
index 885b09f..df22b6c 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,12 +1,3 @@
-websphere-liberty:18.0.0.4-javaee7
-websphere-liberty:18.0.0.4-javaee8
-websphere-liberty:18.0.0.4-kernel
-websphere-liberty:18.0.0.4-microProfile1
-websphere-liberty:18.0.0.4-microProfile2
-websphere-liberty:18.0.0.4-springBoot1
-websphere-liberty:18.0.0.4-springBoot2
-websphere-liberty:18.0.0.4-webProfile7
-websphere-liberty:18.0.0.4-webProfile8
websphere-liberty:19.0.0.3-javaee7
websphere-liberty:19.0.0.3-javaee8
websphere-liberty:19.0.0.3-kernel
@@ -16,15 +7,15 @@ websphere-liberty:19.0.0.3-springBoot1
websphere-liberty:19.0.0.3-springBoot2
websphere-liberty:19.0.0.3-webProfile7
websphere-liberty:19.0.0.3-webProfile8
-websphere-liberty:19.0.0.5-javaee7
-websphere-liberty:19.0.0.5-javaee8
-websphere-liberty:19.0.0.5-kernel
-websphere-liberty:19.0.0.5-microProfile1
-websphere-liberty:19.0.0.5-microProfile2
-websphere-liberty:19.0.0.5-springBoot1
-websphere-liberty:19.0.0.5-springBoot2
-websphere-liberty:19.0.0.5-webProfile7
-websphere-liberty:19.0.0.5-webProfile8
+websphere-liberty:19.0.0.6-javaee7
+websphere-liberty:19.0.0.6-javaee8
+websphere-liberty:19.0.0.6-kernel
+websphere-liberty:19.0.0.6-microProfile1
+websphere-liberty:19.0.0.6-microProfile2
+websphere-liberty:19.0.0.6-springBoot1
+websphere-liberty:19.0.0.6-springBoot2
+websphere-liberty:19.0.0.6-webProfile7
+websphere-liberty:19.0.0.6-webProfile8
websphere-liberty:beta
websphere-liberty:javaee7
websphere-liberty:javaee8
diff --git a/websphere-liberty_18.0.0.4-kernel/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml b/websphere-liberty_18.0.0.4-kernel/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
deleted file mode 100644
index 851f724..0000000
diff --git a/websphere-liberty_18.0.0.4-kernel/helpers/build/configuration_snippets/oidc-config.xml b/websphere-liberty_18.0.0.4-kernel/helpers/build/configuration_snippets/oidc-config.xml
deleted file mode 100644
index 60ce41a..0000000
diff --git a/websphere-liberty_18.0.0.4-kernel/helpers/build/configure.sh b/websphere-liberty_18.0.0.4-kernel/helpers/build/configure.sh
deleted file mode 100755
index a559d5c..0000000
diff --git a/websphere-liberty_18.0.0.4-microProfile2/server.xml b/websphere-liberty_18.0.0.4-microProfile2/server.xml
deleted file mode 100644
index 5272d6b..0000000
diff --git a/websphere-liberty_19.0.0.3-kernel/helpers/build/configuration_snippets/http-endpoint.xml b/websphere-liberty_19.0.0.3-kernel/helpers/build/configuration_snippets/http-endpoint.xml
index 06dc97e..5f6c605 100644
--- a/websphere-liberty_19.0.0.3-kernel/helpers/build/configuration_snippets/http-endpoint.xml
+++ b/websphere-liberty_19.0.0.3-kernel/helpers/build/configuration_snippets/http-endpoint.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<server>
- <httpEndpoint id="defaultHttpEndpoint" host="*" httpPort="9080" />
+ <variable name="HTTP_PORT" defaultValue="9080" />
+ <httpEndpoint id="defaultHttpEndpoint" host="*" httpPort="${HTTP_PORT}"/>
</server>
diff --git a/websphere-liberty_19.0.0.3-kernel/helpers/build/configuration_snippets/http-ssl-endpoint.xml b/websphere-liberty_19.0.0.3-kernel/helpers/build/configuration_snippets/http-ssl-endpoint.xml
index 0f5691d..2a2388a 100644
--- a/websphere-liberty_19.0.0.3-kernel/helpers/build/configuration_snippets/http-ssl-endpoint.xml
+++ b/websphere-liberty_19.0.0.3-kernel/helpers/build/configuration_snippets/http-ssl-endpoint.xml
@@ -1,4 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<server>
- <httpEndpoint id="defaultHttpEndpoint" host="*" httpsPort="9443" httpPort="9080" />
+ <variable name="HTTP_PORT" defaultValue="9080" />
+ <variable name="HTTPS_PORT" defaultValue="9443" />
+ <httpEndpoint id="defaultHttpEndpoint" host="*" httpsPort="${HTTPS_PORT}" httpPort="${HTTP_PORT}" />
</server>
diff --git a/websphere-liberty_19.0.0.3-kernel/helpers/build/configuration_snippets/iiop-endpoint.xml b/websphere-liberty_19.0.0.3-kernel/helpers/build/configuration_snippets/iiop-endpoint.xml
index 016c833..a5b7d8a 100644
--- a/websphere-liberty_19.0.0.3-kernel/helpers/build/configuration_snippets/iiop-endpoint.xml
+++ b/websphere-liberty_19.0.0.3-kernel/helpers/build/configuration_snippets/iiop-endpoint.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<server>
- <iiopEndpoint id="defaultIiopEndpoint" host="${env.IIOP_ENDPOINT_HOST}" iiopPort="2809" />
+ <variable name="IIOP_PORT" defaultValue="2809" />
+ <iiopEndpoint id="defaultIiopEndpoint" host="${IIOP_ENDPOINT_HOST}" iiopPort="${IIOP_PORT}" />
</server>
\ No newline at end of file
diff --git a/websphere-liberty_19.0.0.3-kernel/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml b/websphere-liberty_19.0.0.3-kernel/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
index 851f724..f8fea3c 100644
--- a/websphere-liberty_19.0.0.3-kernel/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
+++ b/websphere-liberty_19.0.0.3-kernel/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<server>
- <iiopEndpoint id="defaultIiopEndpoint" host="${env.IIOP_ENDPOINT_HOST}" iiopPort="2809">
- <iiopsOptions iiopsPort="9402" sslRef="defaultSSLConfig" />
+ <variable name="IIOP_PORT" defaultValue="2809" />
+ <variable name="IIOPS_PORT" defaultValue="9402" />
+ <iiopEndpoint id="defaultIiopEndpoint" host="${IIOP_ENDPOINT_HOST}" iiopPort="${IIOP_PORT}">
+ <iiopsOptions iiopsPort="${IIOPS_PORT}" sslRef="defaultSSLConfig" />
</iiopEndpoint>
</server>
\ No newline at end of file
diff --git a/websphere-liberty_19.0.0.3-kernel/helpers/build/configuration_snippets/jms-endpoint.xml b/websphere-liberty_19.0.0.3-kernel/helpers/build/configuration_snippets/jms-endpoint.xml
index 6de151b..a99b071 100644
--- a/websphere-liberty_19.0.0.3-kernel/helpers/build/configuration_snippets/jms-endpoint.xml
+++ b/websphere-liberty_19.0.0.3-kernel/helpers/build/configuration_snippets/jms-endpoint.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<server>
- <wasJmsEndpoint id="InboundJmsEndpoint" host="*" wasJmsPort="7276" />
+ <variable name="JMS_PORT" defaultValue="7276" />
+ <wasJmsEndpoint id="InboundJmsEndpoint" host="*" wasJmsPort="${JMS_PORT}" />
</server>
\ No newline at end of file
diff --git a/websphere-liberty_19.0.0.3-kernel/helpers/build/configuration_snippets/jms-ssl-endpoint.xml b/websphere-liberty_19.0.0.3-kernel/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
index f43e068..d32a77c 100644
--- a/websphere-liberty_19.0.0.3-kernel/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
+++ b/websphere-liberty_19.0.0.3-kernel/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<server>
- <wasJmsEndpoint id="InboundJmsEndpoint" host="*" wasJmsSSLPort="7286" />
+ <variable name="JMSS_PORT" defaultValue="7286" />
+ <wasJmsEndpoint id="InboundJmsEndpoint" host="*" wasJmsSSLPort="${JMSS_PORT}" />
</server>
\ No newline at end of file
diff --git a/websphere-liberty_18.0.0.4-javaee7/Dockerfile b/websphere-liberty_19.0.0.6-javaee7/Dockerfile
similarity index 94%
rename from websphere-liberty_18.0.0.4-javaee7/Dockerfile
rename to websphere-liberty_19.0.0.6-javaee7/Dockerfile
index f1f7ca2..8db3447 100644
--- a/websphere-liberty_18.0.0.4-javaee7/Dockerfile
+++ b/websphere-liberty_19.0.0.6-javaee7/Dockerfile
@@ -1,4 +1,4 @@
-# (C) Copyright IBM Corporation 2015,2019.
+# (C) Copyright IBM Corporation 2019.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM websphere-liberty:18.0.0.4-kernel
+FROM websphere-liberty:19.0.0.6-kernel
ARG REPOSITORIES_PROPERTIES=""
diff --git a/websphere-liberty_18.0.0.4-javaee7/server.xml b/websphere-liberty_19.0.0.6-javaee7/server.xml
similarity index 100%
rename from websphere-liberty_18.0.0.4-javaee7/server.xml
rename to websphere-liberty_19.0.0.6-javaee7/server.xml
diff --git a/websphere-liberty_18.0.0.4-javaee8/Dockerfile b/websphere-liberty_19.0.0.6-javaee8/Dockerfile
similarity index 89%
rename from websphere-liberty_18.0.0.4-javaee8/Dockerfile
rename to websphere-liberty_19.0.0.6-javaee8/Dockerfile
index 646689d..90a2d44 100644
--- a/websphere-liberty_18.0.0.4-javaee8/Dockerfile
+++ b/websphere-liberty_19.0.0.6-javaee8/Dockerfile
@@ -1,4 +1,4 @@
-# (C) Copyright IBM Corporation 2018,2019.
+# (C) Copyright IBM Corporation 2019.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM websphere-liberty:18.0.0.4-kernel
+FROM websphere-liberty:19.0.0.6-kernel
ARG REPOSITORIES_PROPERTIES=""
@@ -22,7 +22,7 @@ RUN if [ ! -z $REPOSITORIES_PROPERTIES ]; then mkdir /opt/ibm/wlp/etc/ \
appSecurity-2.0 ldapRegistry-3.0 \
localConnector-1.0 monitor-1.0 requestTiming-1.0 restConnector-2.0 sessionCache-1.0 \
sessionDatabase-1.0 ssl-1.0 transportSecurity-1.0 webCache-1.0 webProfile-8.0 \
- appSecurityClient-1.0 javaee-8.0 javaeeClient-8.0 openidConnectClient-1.0 monitor-1.0 microProfile-2.1 \
+ appSecurityClient-1.0 javaee-8.0 javaeeClient-8.0 openidConnectClient-1.0 monitor-1.0 microProfile-2.0 microProfile-2.1 microProfile-2.2 \
&& if [ ! -z $REPOSITORIES_PROPERTIES ]; then rm /opt/ibm/wlp/etc/repositories.properties; fi \
&& rm -rf /output/workarea /output/logs \
&& chmod -R g+rwx /opt/ibm/wlp/output/*
diff --git a/websphere-liberty_18.0.0.4-javaee8/server.xml b/websphere-liberty_19.0.0.6-javaee8/server.xml
similarity index 100%
rename from websphere-liberty_18.0.0.4-javaee8/server.xml
rename to websphere-liberty_19.0.0.6-javaee8/server.xml
diff --git a/websphere-liberty_18.0.0.4-kernel/Dockerfile b/websphere-liberty_19.0.0.6-kernel/Dockerfile
similarity index 77%
rename from websphere-liberty_18.0.0.4-kernel/Dockerfile
rename to websphere-liberty_19.0.0.6-kernel/Dockerfile
index ec5c6d7..88f8945 100644
--- a/websphere-liberty_18.0.0.4-kernel/Dockerfile
+++ b/websphere-liberty_19.0.0.6-kernel/Dockerfile
@@ -1,4 +1,4 @@
-# (C) Copyright IBM Corporation 2015,2019.
+# (C) Copyright IBM Corporation 2019.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -18,32 +18,37 @@ LABEL org.opencontainers.image.authors="Arthur De Magalhaes, Andy Naumann" \
org.opencontainers.image.vendor="IBM" \
org.opencontainers.image.url="http://wasdev.net" \
org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \
- org.opencontainers.image.version="18.0.0.4" \
- org.opencontainers.image.revision="cl180420181121-0300"
-
-RUN apt-get update \
- && apt-get install -y --no-install-recommends unzip \
- && rm -rf /var/lib/apt/lists/* \
- && mkdir /licenses/ \
- && useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default
+ org.opencontainers.image.version="19.0.0.6" \
+ org.opencontainers.image.revision="cl190620190617-1530"
# Install WebSphere Liberty
-ENV LIBERTY_VERSION 18.0.0_04
+ENV LIBERTY_VERSION 19.0.0_06
+
ARG LIBERTY_URL
ARG DOWNLOAD_OPTIONS=""
-RUN LIBERTY_URL=${LIBERTY_URL:-$(wget -q -O - https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/downloads/wlp/index.yml | grep $LIBERTY_VERSION -A 6 | sed -n 's/\s*kernel:\s//p' | tr -d '\r' )} \
+
+RUN apt-get update \
+ && apt-get install -y --no-install-recommends unzip wget openssl \
+ && rm -rf /var/lib/apt/lists/* \
+ && mkdir /licenses/ \
+ && useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
+ && LIBERTY_URL=${LIBERTY_URL:-$(wget -q -O - https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/downloads/wlp/index.yml | grep $LIBERTY_VERSION -A 6 | sed -n 's/\s*kernel:\s//p' | tr -d '\r' )} \
&& wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip \
&& unzip -q /tmp/wlp.zip -d /opt/ibm \
&& rm /tmp/wlp.zip \
&& chown -R 1001:0 /opt/ibm/wlp \
- && chmod -R g+rw /opt/ibm/wlp
+ && chmod -R g+rw /opt/ibm/wlp \
+ && apt-get purge --auto-remove -y unzip \
+ && apt-get purge --auto-remove -y wget \
+ && rm -rf /var/lib/apt/lists/*
+
ENV PATH=/opt/ibm/wlp/bin:/opt/ibm/helpers/build:$PATH
# Add labels for consumption by IBM Product Insights
LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \
"ProductName"="WebSphere Application Server Liberty" \
- "ProductVersion"="18.0.0.4" \
- "BuildLabel"="cl180420181121-0300"
+ "ProductVersion"="19.0.0.6" \
+ "BuildLabel"="cl190620190617-1530"
# Set Path Shortcuts
ENV LOG_DIR=/logs \
@@ -54,6 +59,7 @@ RUN /opt/ibm/wlp/bin/server create \
&& rm -rf $WLP_OUTPUT_DIR/.classCache /output/workarea
COPY helpers/ /opt/ibm/helpers/
+COPY fixes/ /opt/ibm/fixes/
COPY licenses/ /licenses/
# Create symlinks && set permissions for non-root user
@@ -74,6 +80,8 @@ RUN mkdir /logs \
&& chmod -R g+rw /config \
&& chown -R 1001:0 /opt/ibm/helpers \
&& chmod -R g+rwx /opt/ibm/helpers \
+ && chown -R 1001:0 /opt/ibm/fixes \
+ && chmod -R g+rwx /opt/ibm/fixes \
&& chown -R 1001:0 /opt/ibm/wlp/usr \
&& chmod -R g+rw /opt/ibm/wlp/usr \
&& chown -R 1001:0 /opt/ibm/wlp/output \
diff --git a/websphere-liberty_kernel/fixes/.gitkeep b/websphere-liberty_19.0.0.6-kernel/fixes/.gitkeep
similarity index 100%
copy from websphere-liberty_kernel/fixes/.gitkeep
copy to websphere-liberty_19.0.0.6-kernel/fixes/.gitkeep
diff --git a/websphere-liberty_18.0.0.4-kernel/helpers/build/configuration_snippets/hazelcast-client.xml b/websphere-liberty_19.0.0.6-kernel/helpers/build/configuration_snippets/hazelcast-client.xml
similarity index 100%
rename from websphere-liberty_18.0.0.4-kernel/helpers/build/configuration_snippets/hazelcast-client.xml
rename to websphere-liberty_19.0.0.6-kernel/helpers/build/configuration_snippets/hazelcast-client.xml
diff --git a/websphere-liberty_18.0.0.4-kernel/helpers/build/configuration_snippets/hazelcast-embedded.xml b/websphere-liberty_19.0.0.6-kernel/helpers/build/configuration_snippets/hazelcast-embedded.xml
similarity index 100%
rename from websphere-liberty_18.0.0.4-kernel/helpers/build/configuration_snippets/hazelcast-embedded.xml
rename to websphere-liberty_19.0.0.6-kernel/helpers/build/configuration_snippets/hazelcast-embedded.xml
diff --git a/websphere-liberty_18.0.0.4-kernel/helpers/build/configuration_snippets/hazelcast-sessioncache.xml b/websphere-liberty_19.0.0.6-kernel/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
similarity index 100%
rename from websphere-liberty_18.0.0.4-kernel/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
rename to websphere-liberty_19.0.0.6-kernel/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
diff --git a/websphere-liberty_18.0.0.4-kernel/helpers/build/configuration_snippets/http-endpoint.xml b/websphere-liberty_19.0.0.6-kernel/helpers/build/configuration_snippets/http-endpoint.xml
similarity index 30%
rename from websphere-liberty_18.0.0.4-kernel/helpers/build/configuration_snippets/http-endpoint.xml
rename to websphere-liberty_19.0.0.6-kernel/helpers/build/configuration_snippets/http-endpoint.xml
index 06dc97e..5f6c605 100644
--- a/websphere-liberty_18.0.0.4-kernel/helpers/build/configuration_snippets/http-endpoint.xml
+++ b/websphere-liberty_19.0.0.6-kernel/helpers/build/configuration_snippets/http-endpoint.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<server>
- <httpEndpoint id="defaultHttpEndpoint" host="*" httpPort="9080" />
+ <variable name="HTTP_PORT" defaultValue="9080" />
+ <httpEndpoint id="defaultHttpEndpoint" host="*" httpPort="${HTTP_PORT}"/>
</server>
diff --git a/websphere-liberty_18.0.0.4-kernel/helpers/build/configuration_snippets/http-ssl-endpoint.xml b/websphere-liberty_19.0.0.6-kernel/helpers/build/configuration_snippets/http-ssl-endpoint.xml
similarity index 21%
rename from websphere-liberty_18.0.0.4-kernel/helpers/build/configuration_snippets/http-ssl-endpoint.xml
rename to websphere-liberty_19.0.0.6-kernel/helpers/build/configuration_snippets/http-ssl-endpoint.xml
index 0f5691d..2a2388a 100644
--- a/websphere-liberty_18.0.0.4-kernel/helpers/build/configuration_snippets/http-ssl-endpoint.xml
+++ b/websphere-liberty_19.0.0.6-kernel/helpers/build/configuration_snippets/http-ssl-endpoint.xml
@@ -1,4 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<server>
- <httpEndpoint id="defaultHttpEndpoint" host="*" httpsPort="9443" httpPort="9080" />
+ <variable name="HTTP_PORT" defaultValue="9080" />
+ <variable name="HTTPS_PORT" defaultValue="9443" />
+ <httpEndpoint id="defaultHttpEndpoint" host="*" httpsPort="${HTTPS_PORT}" httpPort="${HTTP_PORT}" />
</server>
diff --git a/websphere-liberty_18.0.0.4-kernel/helpers/build/configuration_snippets/iiop-endpoint.xml b/websphere-liberty_19.0.0.6-kernel/helpers/build/configuration_snippets/iiop-endpoint.xml
similarity index 22%
rename from websphere-liberty_18.0.0.4-kernel/helpers/build/configuration_snippets/iiop-endpoint.xml
rename to websphere-liberty_19.0.0.6-kernel/helpers/build/configuration_snippets/iiop-endpoint.xml
index 016c833..a5b7d8a 100644
--- a/websphere-liberty_18.0.0.4-kernel/helpers/build/configuration_snippets/iiop-endpoint.xml
+++ b/websphere-liberty_19.0.0.6-kernel/helpers/build/configuration_snippets/iiop-endpoint.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<server>
- <iiopEndpoint id="defaultIiopEndpoint" host="${env.IIOP_ENDPOINT_HOST}" iiopPort="2809" />
+ <variable name="IIOP_PORT" defaultValue="2809" />
+ <iiopEndpoint id="defaultIiopEndpoint" host="${IIOP_ENDPOINT_HOST}" iiopPort="${IIOP_PORT}" />
</server>
\ No newline at end of file
diff --git a/websphere-liberty_19.0.0.6-kernel/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml b/websphere-liberty_19.0.0.6-kernel/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
new file mode 100644
index 0000000..f8fea3c
--- /dev/null
+++ b/websphere-liberty_19.0.0.6-kernel/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+ <variable name="IIOP_PORT" defaultValue="2809" />
+ <variable name="IIOPS_PORT" defaultValue="9402" />
+ <iiopEndpoint id="defaultIiopEndpoint" host="${IIOP_ENDPOINT_HOST}" iiopPort="${IIOP_PORT}">
+ <iiopsOptions iiopsPort="${IIOPS_PORT}" sslRef="defaultSSLConfig" />
+ </iiopEndpoint>
+</server>
\ No newline at end of file
diff --git a/websphere-liberty_18.0.0.4-kernel/helpers/build/configuration_snippets/jms-endpoint.xml b/websphere-liberty_19.0.0.6-kernel/helpers/build/configuration_snippets/jms-endpoint.xml
similarity index 58%
rename from websphere-liberty_18.0.0.4-kernel/helpers/build/configuration_snippets/jms-endpoint.xml
rename to websphere-liberty_19.0.0.6-kernel/helpers/build/configuration_snippets/jms-endpoint.xml
index 6de151b..a99b071 100644
--- a/websphere-liberty_18.0.0.4-kernel/helpers/build/configuration_snippets/jms-endpoint.xml
+++ b/websphere-liberty_19.0.0.6-kernel/helpers/build/configuration_snippets/jms-endpoint.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<server>
- <wasJmsEndpoint id="InboundJmsEndpoint" host="*" wasJmsPort="7276" />
+ <variable name="JMS_PORT" defaultValue="7276" />
+ <wasJmsEndpoint id="InboundJmsEndpoint" host="*" wasJmsPort="${JMS_PORT}" />
</server>
\ No newline at end of file
diff --git a/websphere-liberty_18.0.0.4-kernel/helpers/build/configuration_snippets/jms-ssl-endpoint.xml b/websphere-liberty_19.0.0.6-kernel/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
similarity index 57%
rename from websphere-liberty_18.0.0.4-kernel/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
rename to websphere-liberty_19.0.0.6-kernel/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
index f43e068..d32a77c 100644
--- a/websphere-liberty_18.0.0.4-kernel/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
+++ b/websphere-liberty_19.0.0.6-kernel/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<server>
- <wasJmsEndpoint id="InboundJmsEndpoint" host="*" wasJmsSSLPort="7286" />
+ <variable name="JMSS_PORT" defaultValue="7286" />
+ <wasJmsEndpoint id="InboundJmsEndpoint" host="*" wasJmsSSLPort="${JMSS_PORT}" />
</server>
\ No newline at end of file
diff --git a/websphere-liberty_18.0.0.4-kernel/helpers/build/configuration_snippets/mp-health-check.xml b/websphere-liberty_19.0.0.6-kernel/helpers/build/configuration_snippets/mp-health-check.xml
similarity index 100%
rename from websphere-liberty_18.0.0.4-kernel/helpers/build/configuration_snippets/mp-health-check.xml
rename to websphere-liberty_19.0.0.6-kernel/helpers/build/configuration_snippets/mp-health-check.xml
diff --git a/websphere-liberty_18.0.0.4-kernel/helpers/build/configuration_snippets/mp-monitoring.xml b/websphere-liberty_19.0.0.6-kernel/helpers/build/configuration_snippets/mp-monitoring.xml
similarity index 100%
rename from websphere-liberty_18.0.0.4-kernel/helpers/build/configuration_snippets/mp-monitoring.xml
rename to websphere-liberty_19.0.0.6-kernel/helpers/build/configuration_snippets/mp-monitoring.xml
diff --git a/websphere-liberty_19.0.0.3-kernel/helpers/build/configuration_snippets/oidc-config.xml b/websphere-liberty_19.0.0.6-kernel/helpers/build/configuration_snippets/oidc-config.xml
similarity index 100%
copy from websphere-liberty_19.0.0.3-kernel/helpers/build/configuration_snippets/oidc-config.xml
copy to websphere-liberty_19.0.0.6-kernel/helpers/build/configuration_snippets/oidc-config.xml
diff --git a/websphere-liberty_18.0.0.4-kernel/helpers/build/configuration_snippets/oidc.xml b/websphere-liberty_19.0.0.6-kernel/helpers/build/configuration_snippets/oidc.xml
similarity index 100%
rename from websphere-liberty_18.0.0.4-kernel/helpers/build/configuration_snippets/oidc.xml
rename to websphere-liberty_19.0.0.6-kernel/helpers/build/configuration_snippets/oidc.xml
diff --git a/websphere-liberty_18.0.0.4-kernel/helpers/build/configuration_snippets/ssl.xml b/websphere-liberty_19.0.0.6-kernel/helpers/build/configuration_snippets/ssl.xml
similarity index 100%
rename from websphere-liberty_18.0.0.4-kernel/helpers/build/configuration_snippets/ssl.xml
rename to websphere-liberty_19.0.0.6-kernel/helpers/build/configuration_snippets/ssl.xml
diff --git a/websphere-liberty_19.0.0.3-kernel/helpers/build/configure.sh b/websphere-liberty_19.0.0.6-kernel/helpers/build/configure.sh
similarity index 100%
copy from websphere-liberty_19.0.0.3-kernel/helpers/build/configure.sh
copy to websphere-liberty_19.0.0.6-kernel/helpers/build/configure.sh
diff --git a/websphere-liberty_18.0.0.4-kernel/helpers/runtime/docker-server.sh b/websphere-liberty_19.0.0.6-kernel/helpers/runtime/docker-server.sh
similarity index 100%
rename from websphere-liberty_18.0.0.4-kernel/helpers/runtime/docker-server.sh
rename to websphere-liberty_19.0.0.6-kernel/helpers/runtime/docker-server.sh
diff --git a/websphere-liberty_18.0.0.4-kernel/licenses/en.html b/websphere-liberty_19.0.0.6-kernel/licenses/en.html
similarity index 97%
rename from websphere-liberty_18.0.0.4-kernel/licenses/en.html
rename to websphere-liberty_19.0.0.6-kernel/licenses/en.html
index 5b2e80a..2888b6d 100644
--- a/websphere-liberty_18.0.0.4-kernel/licenses/en.html
+++ b/websphere-liberty_19.0.0.6-kernel/licenses/en.html
@@ -14,21 +14,17 @@ the Program, the International License Agreement for Non-
Warranted Programs (Z125-5589-05) applies.<br>
<br>
Program Name (Program Number):<br>
-IBM WebSphere Application Server Liberty 18.0.0.4 (5724-J08)<br>
+IBM WebSphere Application Server Liberty 19.0.0.6
+(Component)<br>
<br>
The following standard terms apply to Licensee's use of the
Program.<br>
<br>
Prohibited Uses<br>
<br>
-Licensee may not use or authorize others to use the
-Program, alone or in combination with other services or products, in
-support of any of the following high risk activities: design,
-construction, control, or maintenance of nuclear facilities, mass transit
-systems, air traffic control systems, automotive control systems,
-weapons systems, or aircraft navigation or communications, or any
-other activity where program failure could give rise to a
-material threat of death or serious personal injury.<br>
+Licensee may not use or authorize others to use the Program
+if failure of the Program could lead to death, bodily injury,
+or property or environmental damage.<br>
<br>
Separately Licensed Code<br>
<br>
@@ -92,6 +88,7 @@ License Information document.<br>
<br>
The following are Separately Licensed Code:<br>
Ubuntu<br>
+Red Hat Universal Base Image<br>
<br>
Source Components and Sample Materials<br>
<br>
@@ -157,9 +154,9 @@ change, and distribute the software to anyone and for any purpose. <br>
An "Install" is an installed copy of the Program on a
physical or virtual disk made available to be executed on a computer.<br>
<br>
-L/N: L-CTUR-B4WNHE<br>
-D/N: L-CTUR-B4WNHE<br>
-P/N: L-CTUR-B4WNHE<br>
+L/N: L-ARON-BD57N4<br>
+D/N: L-ARON-BD57N4<br>
+P/N: L-ARON-BD57N4<br>
<br>
<br>
International License Agreement for Non-Warranted Programs<br>
diff --git a/websphere-liberty_18.0.0.4-kernel/licenses/non_ibm_license.html b/websphere-liberty_19.0.0.6-kernel/licenses/non_ibm_license.html
similarity index 72%
rename from websphere-liberty_18.0.0.4-kernel/licenses/non_ibm_license.html
rename to websphere-liberty_19.0.0.6-kernel/licenses/non_ibm_license.html
index b3f90c2..3786554 100644
--- a/websphere-liberty_18.0.0.4-kernel/licenses/non_ibm_license.html
+++ b/websphere-liberty_19.0.0.6-kernel/licenses/non_ibm_license.html
@@ -6,7 +6,7 @@
<BODY>
TERMS AND CONDITIONS FOR SEPARATELY LICENSED CODE<br>
<br>
-IBM WebSphere Application Server Liberty 18.0.0.4<br>
+IBM WebSphere Application Server Liberty 19.0.0.6<br>
<br>
The IBM license agreement and any applicable information on
the web<br>
@@ -38,6 +38,7 @@ shipped with, the Program as Licensee installed it.<br>
<br>
The following are Separately Licensed Code:<br>
Ubuntu<br>
+Red Hat Universal Base Image<br>
<br>
<br>
==================================================================================<br>
@@ -48,9 +49,18 @@ container format, license information for Ubuntu packages may be
found in /usr/share/doc/${package}/copyright<br>
-------------------------------------------------------------------------------------------------------------------------------<br>
==================================================================================<br>
+Red Hat Universal Base Image Operating System<br>
+--------------------------------------------------------------------------------------------------------------------------------------<br>
+When IBM WebSphere Application Server Liberty is provided
+in a container format, license information for Red Hat
+Universal Base Image packages may be found in
+/usr/share/doc/${package} or /usr/share/licenses/${package}<br>
+==================================================================================<br>
+<br>
+<br>
<br>
-L/N: L-CTUR-B4WNHE<br>
-D/N: L-CTUR-B4WNHE<br>
-P/N: L-CTUR-B4WNHE<br>
+L/N: L-ARON-BD57N4<br>
+D/N: L-ARON-BD57N4<br>
+P/N: L-ARON-BD57N4<br>
</BODY>
</HTML>
\ No newline at end of file
diff --git a/websphere-liberty_18.0.0.4-kernel/licenses/notices.html b/websphere-liberty_19.0.0.6-kernel/licenses/notices.html
similarity index 94%
rename from websphere-liberty_18.0.0.4-kernel/licenses/notices.html
rename to websphere-liberty_19.0.0.6-kernel/licenses/notices.html
index 1388334..059ea4d 100644
--- a/websphere-liberty_18.0.0.4-kernel/licenses/notices.html
+++ b/websphere-liberty_19.0.0.6-kernel/licenses/notices.html
@@ -6,7 +6,7 @@
<BODY>
NOTICES AND INFORMATION<br>
<br>
-IBM WebSphere Application Server Liberty 18.0.0.4<br>
+IBM WebSphere Application Server Liberty 19.0.0.6<br>
<br>
The IBM license agreement and any applicable information on
the web<br>
@@ -125,7 +125,10 @@ Apache XML-Commons Resolver<br>
Apache XML Schema <br>
Apache XML Security<br>
Apache Yoko<br>
-Backport-util-concurrent <br>
+Backport-util-concurrent<br>
+biz aQute bnd annotation<br>
+biz aQute bnd gradle<br>
+biz aQute bnd <br>
CGLib <br>
ClassMate<br>
Eclipse MicroProfile Config API<br>
@@ -139,6 +142,9 @@ Eclipse MicroProfile Opentracing<br>
Ehcache<br>
Ektorp<br>
Elasticsearch<br>
+GeAnTyRef<br>
+GraphQL Java Servlet<br>
+Greenmail<br>
Groovy<br>
Google Closure Compiler<br>
Google Gson<br>
@@ -151,9 +157,14 @@ Jackson Annotations<br>
Jackson Core<br>
Jackson Databind<br>
Jackson Dataformat XML<br>
+Jackson Datatype: JDK8<br>
+Jackson Datatype: JSR310<br>
Jackson JsonToken<br>
+Jackson Module Parameter Names<br>
Jandex<br>
Jasper EL<br>
+Javassist<br>
+Java Dataloader<br>
JavaMail<br>
Javax Inject<br>
Jakarta RegExp <br>
@@ -164,8 +175,11 @@ JCache<br>
Jettison<br>
Joda-Time<br>
JSONToken<br>
-JSTL <br>
-Log4J <br>
+JSTL<br>
+kafka clients <br>
+Log4J<br>
+Microprofile-context-propagation-api<br>
+Microprofile-reactive-streams-operators <br>
OKHttp<br>
OpenID4Java<br>
OpenSAML2<br>
@@ -179,7 +193,13 @@ OpenWS<br>
OSGi Materials <br>
OSGi Core<br>
OSGi Compendium<br>
+OSGi Utilities Function<br>
+OSGi Utilities Promise<br>
rxJava<br>
+smallrye-converter-api<br>
+smallrye-reactive-messaging-provider<br>
+smallrye-reactive-streams-operators<br>
+smallrye-reactive-streams-operators-cdi<br>
Spatial4j<br>
Swagger Annotations<br>
Swagger Models<br>
@@ -188,6 +208,7 @@ Swagger UI<br>
XML-APIs <br>
XML Beans <br>
XML4J <br>
+vertex core<br>
Weld OSGi Bundle<br>
Weld Servlet<br>
Xalan-J<br>
@@ -462,10 +483,44 @@ The Program includes all or portions of the following
software which was obtained under the terms and conditions of the
MIT License:<br>
<br>
+Bootstrap<br>
+ Copyright (c) 2011-2019 Twitter, Inc.<br>
+ Copyright (c) 2011-2019 The Bootstrap Authors<br>
+ All rights reserved.<br>
+<br>
+Ember js<br>
+ Copyright 2011-2018 Tilde Inc. and contributors<br>
+ Portions Copyright 2006-2011 Strobe Inc.<br>
+ Portions Copyright 2008-2011 Apple Inc. All rights
+reserved.<br>
+<br>
+FontAwesome<br>
+ https://fontawesome.com/license/free<br>
+ (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)<br>
+ All rights reserved<br>
+<br>
+Handlebars js<br>
+ Copyright (c) 2011-2017 by Yehuda Katz<br>
+ All rights reserved.<br>
+<br>
+Moment js<br>
+ Copyright (c)JS Foundation and other contributors<br>
+ All rights reserved.<br>
+<br>
+<br>
+ClassGraph<br>
+ Copyright (c) 2015 Luke Hutchison<br>
+ All rights reserved. <br>
+<br>
+<br>
Globalize<br>
Copyright Software Freedom Conservancy, Inc.<br>
http://jquery.org/license<br>
<br>
+GraphQL Java<br>
+ Copyright (c) 2015 Andreas Marek and Contributors<br>
+ All rights reserved.<br>
+<br>
JQuery<br>
Copyright 2014 jQuery Foundation and other contributors<br>
http://jquery.com/<br>
@@ -509,6 +564,11 @@ The Program includes all or portions of the following
software which was obtained under the terms and conditions of the
BSD License.<br>
<br>
+ANTLR 4 Runtime<br>
+ Copyright (c) 2012-2017 The ANTLR Project. <br>
+ All rights reserved.<br>
+<br>
+<br>
ASM<br>
Copyright (c) 2000-2005 INRIA, France Telecom<br>
All rights reserved.<br>
@@ -519,6 +579,10 @@ CryptoJS <br>
D3<br>
Copyright 2013 Mike Bostock<br>
<br>
+Highlight js<br>
+Copyright (c) 2006, Ivan Sagalaev<br>
+All rights reserved.<br>
+<br>
Owasp Esapi for Java<br>
<br>
SERP<br>
@@ -629,9 +693,13 @@ OSGi Framework, OSGi Materials, pixman, XHTML DTDs, MXJ4, <br>
AspectJ Runtime, AsjectJ Tools, IBM Eclipse SDK, IBM
Eclipse Help System, 3.4.3 components, <br>
Higgens Token Server, TPTP , EMF, Eclipse Equinox (OSGi
-Services), Eclipselink, EclipseLink ANTLR, EclipseLink Hermes JPQL
-Parser, Eclipse JDT Core Batch Compiler, PAHO Client, ECJ, Yasson,
-Open Liberty<br>
+Services),Eclipse Equinox metatype, Eclipselink, EclipseLink ANTLR,
+EclipseLink ASM, EclipseLink Core, EclipseLink DBWS, EclipseLink DBWS
+Builder, EclipseLink JPA RS, EclipseLink JPA Modelgen (non OSGi),
+EclipseLink Moxy, EclipseLink NoSQL Database Extensions, EclipseLink
+Hermes JPQL Parser, Eclipse JDT Core Batch Compiler, EclipseLink
+JPA, Eclipse OSGi, EclipseLink OracleDDL Parser, EclipseLink
+SDO, jakarta mail, PAHO Client, ECJ, Yasson, Open Liberty <br>
<br>
(herein collectively referred to as "Eclipse Code").
Notices and important information, including instructions for
@@ -1375,6 +1443,7 @@ Interceptor API<br>
JACC API<br>
JASPIC API<br>
JAX-RS<br>
+JAX WS API<br>
Java API for WebSocket <br>
Java Mail API <br>
Java Servlet API<br>
@@ -1389,6 +1458,7 @@ Java Server Pages (JSP) API<br>
Java Server Pages Standard Tag Library (JSTL) <br>
Java Transaction API (JTA) <br>
Java Transaction API (JTA) Javadoc<br>
+javax.mail-api<br>
javax.xml.soap-api<br>
JBoss Jdeparser<br>
JSON <br>
@@ -1767,8 +1837,8 @@ streams-tck NOTICES AND INFORMATION<br>
END OF NOTICES AND INFORMATION<br>
==============================================================================<br>
<br>
-L/N: L-CTUR-B4WNHE<br>
-D/N: L-CTUR-B4WNHE<br>
-P/N: L-CTUR-B4WNHE<br>
+L/N: L-ARON-BD57N4<br>
+D/N: L-ARON-BD57N4<br>
+P/N: L-ARON-BD57N4<br>
</BODY>
</HTML>
\ No newline at end of file
diff --git a/websphere-liberty_18.0.0.4-microProfile1/Dockerfile b/websphere-liberty_19.0.0.6-microProfile1/Dockerfile
similarity index 94%
rename from websphere-liberty_18.0.0.4-microProfile1/Dockerfile
rename to websphere-liberty_19.0.0.6-microProfile1/Dockerfile
index 772415a..0e01503 100644
--- a/websphere-liberty_18.0.0.4-microProfile1/Dockerfile
+++ b/websphere-liberty_19.0.0.6-microProfile1/Dockerfile
@@ -1,4 +1,4 @@
-# (C) Copyright IBM Corporation 2018,2019.
+# (C) Copyright IBM Corporation 2019.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM websphere-liberty:18.0.0.4-kernel
+FROM websphere-liberty:19.0.0.6-kernel
ARG REPOSITORIES_PROPERTIES=""
diff --git a/websphere-liberty_18.0.0.4-microProfile1/server.xml b/websphere-liberty_19.0.0.6-microProfile1/server.xml
similarity index 100%
rename from websphere-liberty_18.0.0.4-microProfile1/server.xml
rename to websphere-liberty_19.0.0.6-microProfile1/server.xml
diff --git a/websphere-liberty_18.0.0.4-microProfile2/Dockerfile b/websphere-liberty_19.0.0.6-microProfile2/Dockerfile
similarity index 91%
rename from websphere-liberty_18.0.0.4-microProfile2/Dockerfile
rename to websphere-liberty_19.0.0.6-microProfile2/Dockerfile
index 597e58d..574de86 100644
--- a/websphere-liberty_18.0.0.4-microProfile2/Dockerfile
+++ b/websphere-liberty_19.0.0.6-microProfile2/Dockerfile
@@ -1,4 +1,4 @@
-# (C) Copyright IBM Corporation 2018,2019.
+# (C) Copyright IBM Corporation 2019.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -12,14 +12,14 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM websphere-liberty:18.0.0.4-kernel
+FROM websphere-liberty:19.0.0.6-kernel
ARG REPOSITORIES_PROPERTIES=""
RUN if [ ! -z $REPOSITORIES_PROPERTIES ]; then mkdir /opt/ibm/wlp/etc/ \
&& echo $REPOSITORIES_PROPERTIES > /opt/ibm/wlp/etc/repositories.properties; fi \
&& installUtility install --acceptLicense \
- appSecurity-2.0 ldapRegistry-3.0 localConnector-1.0 microProfile-2.1 \
+ appSecurity-2.0 ldapRegistry-3.0 localConnector-1.0 microProfile-2.0 microProfile-2.1 microProfile-2.2 \
monitor-1.0 requestTiming-1.0 restConnector-2.0 sessionCache-1.0 \
sessionDatabase-1.0 ssl-1.0 transportSecurity-1.0 webCache-1.0 \
webProfile-8.0 \
diff --git a/websphere-liberty_19.0.0.3-microProfile2/server.xml b/websphere-liberty_19.0.0.6-microProfile2/server.xml
similarity index 100%
copy from websphere-liberty_19.0.0.3-microProfile2/server.xml
copy to websphere-liberty_19.0.0.6-microProfile2/server.xml
diff --git a/websphere-liberty_18.0.0.4-springBoot1/Dockerfile b/websphere-liberty_19.0.0.6-springBoot1/Dockerfile
similarity index 92%
rename from websphere-liberty_18.0.0.4-springBoot1/Dockerfile
rename to websphere-liberty_19.0.0.6-springBoot1/Dockerfile
index 277a799..8806a1c 100644
--- a/websphere-liberty_18.0.0.4-springBoot1/Dockerfile
+++ b/websphere-liberty_19.0.0.6-springBoot1/Dockerfile
@@ -1,4 +1,4 @@
-# (C) Copyright IBM Corporation 2018,2019.
+# (C) Copyright IBM Corporation 2019.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM websphere-liberty:18.0.0.4-kernel
+FROM websphere-liberty:19.0.0.6-kernel
ARG REPOSITORIES_PROPERTIES=""
diff --git a/websphere-liberty_18.0.0.4-springBoot1/server.xml b/websphere-liberty_19.0.0.6-springBoot1/server.xml
similarity index 100%
rename from websphere-liberty_18.0.0.4-springBoot1/server.xml
rename to websphere-liberty_19.0.0.6-springBoot1/server.xml
diff --git a/websphere-liberty_18.0.0.4-springBoot2/Dockerfile b/websphere-liberty_19.0.0.6-springBoot2/Dockerfile
similarity index 92%
rename from websphere-liberty_18.0.0.4-springBoot2/Dockerfile
rename to websphere-liberty_19.0.0.6-springBoot2/Dockerfile
index 71a7c8d..3f2954f 100644
--- a/websphere-liberty_18.0.0.4-springBoot2/Dockerfile
+++ b/websphere-liberty_19.0.0.6-springBoot2/Dockerfile
@@ -1,4 +1,4 @@
-# (C) Copyright IBM Corporation 2018,2019.
+# (C) Copyright IBM Corporation 2019.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM websphere-liberty:18.0.0.4-kernel
+FROM websphere-liberty:19.0.0.6-kernel
ARG REPOSITORIES_PROPERTIES=""
diff --git a/websphere-liberty_18.0.0.4-springBoot2/server.xml b/websphere-liberty_19.0.0.6-springBoot2/server.xml
similarity index 100%
rename from websphere-liberty_18.0.0.4-springBoot2/server.xml
rename to websphere-liberty_19.0.0.6-springBoot2/server.xml
diff --git a/websphere-liberty_18.0.0.4-webProfile7/Dockerfile b/websphere-liberty_19.0.0.6-webProfile7/Dockerfile
similarity index 94%
rename from websphere-liberty_18.0.0.4-webProfile7/Dockerfile
rename to websphere-liberty_19.0.0.6-webProfile7/Dockerfile
index 12e3c70..3d2fd84 100644
--- a/websphere-liberty_18.0.0.4-webProfile7/Dockerfile
+++ b/websphere-liberty_19.0.0.6-webProfile7/Dockerfile
@@ -1,4 +1,4 @@
-# (C) Copyright IBM Corporation 2015,2019.
+# (C) Copyright IBM Corporation 2019.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM websphere-liberty:18.0.0.4-kernel
+FROM websphere-liberty:19.0.0.6-kernel
ARG REPOSITORIES_PROPERTIES=""
diff --git a/websphere-liberty_18.0.0.4-webProfile7/server.xml b/websphere-liberty_19.0.0.6-webProfile7/server.xml
similarity index 100%
rename from websphere-liberty_18.0.0.4-webProfile7/server.xml
rename to websphere-liberty_19.0.0.6-webProfile7/server.xml
diff --git a/websphere-liberty_18.0.0.4-webProfile8/Dockerfile b/websphere-liberty_19.0.0.6-webProfile8/Dockerfile
similarity index 93%
rename from websphere-liberty_18.0.0.4-webProfile8/Dockerfile
rename to websphere-liberty_19.0.0.6-webProfile8/Dockerfile
index a10c382..f576d95 100644
--- a/websphere-liberty_18.0.0.4-webProfile8/Dockerfile
+++ b/websphere-liberty_19.0.0.6-webProfile8/Dockerfile
@@ -1,4 +1,4 @@
-# (C) Copyright IBM Corporation 2018,2019.
+# (C) Copyright IBM Corporation 2019.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM websphere-liberty:18.0.0.4-kernel
+FROM websphere-liberty:19.0.0.6-kernel
ARG REPOSITORIES_PROPERTIES=""
diff --git a/websphere-liberty_18.0.0.4-webProfile8/server.xml b/websphere-liberty_19.0.0.6-webProfile8/server.xml
similarity index 100%
rename from websphere-liberty_18.0.0.4-webProfile8/server.xml
rename to websphere-liberty_19.0.0.6-webProfile8/server.xml
diff --git a/websphere-liberty_beta/Dockerfile b/websphere-liberty_beta/Dockerfile
index e9b3786..c368900 100644
--- a/websphere-liberty_beta/Dockerfile
+++ b/websphere-liberty_beta/Dockerfile
@@ -18,7 +18,8 @@ LABEL org.opencontainers.image.authors="Arthur De Magalhaes, Andy Naumann" \
org.opencontainers.image.vendor="IBM" \
org.opencontainers.image.url="http://wasdev.net" \
org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \
- org.opencontainers.image.revision="cl190520190522-2227"
+ org.opencontainers.image.version="2019.6.0.0" \
+ org.opencontainers.image.revision="cl190620190617-1530"
RUN apt-get update \
&& apt-get install -y --no-install-recommends unzip \
@@ -26,7 +27,7 @@ RUN apt-get update \
&& useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default
# Install WebSphere Liberty
-ENV LIBERTY_VERSION 2019.4.0_0
+ENV LIBERTY_VERSION 2019.6.0_0
RUN LIBERTY_URL=$(wget -q -O - https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/downloads/wlp/index.yml | grep $LIBERTY_VERSION -A 3 | sed -n 's/\s*webProfile7:\s//p' | tr -d '\r') \
&& echo $LIBERTY_URL \
&& wget -q $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp-beta.zip \
diff --git a/websphere-liberty_javaee7/Dockerfile b/websphere-liberty_javaee7/Dockerfile
index c7dd7b4..95ac9d8 100644
--- a/websphere-liberty_javaee7/Dockerfile
+++ b/websphere-liberty_javaee7/Dockerfile
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM websphere-liberty:19.0.0.5-kernel
+FROM websphere-liberty:kernel
ARG REPOSITORIES_PROPERTIES=""
diff --git a/websphere-liberty_kernel/Dockerfile b/websphere-liberty_kernel/Dockerfile
index 688b704..88f8945 100644
--- a/websphere-liberty_kernel/Dockerfile
+++ b/websphere-liberty_kernel/Dockerfile
@@ -18,11 +18,11 @@ LABEL org.opencontainers.image.authors="Arthur De Magalhaes, Andy Naumann" \
org.opencontainers.image.vendor="IBM" \
org.opencontainers.image.url="http://wasdev.net" \
org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \
- org.opencontainers.image.version="19.0.0.5" \
- org.opencontainers.image.revision="cl190520190522-2227"
+ org.opencontainers.image.version="19.0.0.6" \
+ org.opencontainers.image.revision="cl190620190617-1530"
# Install WebSphere Liberty
-ENV LIBERTY_VERSION 19.0.0_05
+ENV LIBERTY_VERSION 19.0.0_06
ARG LIBERTY_URL
ARG DOWNLOAD_OPTIONS=""
@@ -47,8 +47,8 @@ ENV PATH=/opt/ibm/wlp/bin:/opt/ibm/helpers/build:$PATH
# Add labels for consumption by IBM Product Insights
LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \
"ProductName"="WebSphere Application Server Liberty" \
- "ProductVersion"="19.0.0.5" \
- "BuildLabel"="cl190520190522-2227"
+ "ProductVersion"="19.0.0.6" \
+ "BuildLabel"="cl190620190617-1530"
# Set Path Shortcuts
ENV LOG_DIR=/logs \
diff --git a/websphere-liberty_kernel/helpers/build/configuration_snippets/http-endpoint.xml b/websphere-liberty_kernel/helpers/build/configuration_snippets/http-endpoint.xml
index 06dc97e..5f6c605 100644
--- a/websphere-liberty_kernel/helpers/build/configuration_snippets/http-endpoint.xml
+++ b/websphere-liberty_kernel/helpers/build/configuration_snippets/http-endpoint.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<server>
- <httpEndpoint id="defaultHttpEndpoint" host="*" httpPort="9080" />
+ <variable name="HTTP_PORT" defaultValue="9080" />
+ <httpEndpoint id="defaultHttpEndpoint" host="*" httpPort="${HTTP_PORT}"/>
</server>
diff --git a/websphere-liberty_kernel/helpers/build/configuration_snippets/http-ssl-endpoint.xml b/websphere-liberty_kernel/helpers/build/configuration_snippets/http-ssl-endpoint.xml
index 0f5691d..2a2388a 100644
--- a/websphere-liberty_kernel/helpers/build/configuration_snippets/http-ssl-endpoint.xml
+++ b/websphere-liberty_kernel/helpers/build/configuration_snippets/http-ssl-endpoint.xml
@@ -1,4 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<server>
- <httpEndpoint id="defaultHttpEndpoint" host="*" httpsPort="9443" httpPort="9080" />
+ <variable name="HTTP_PORT" defaultValue="9080" />
+ <variable name="HTTPS_PORT" defaultValue="9443" />
+ <httpEndpoint id="defaultHttpEndpoint" host="*" httpsPort="${HTTPS_PORT}" httpPort="${HTTP_PORT}" />
</server>
diff --git a/websphere-liberty_kernel/helpers/build/configuration_snippets/iiop-endpoint.xml b/websphere-liberty_kernel/helpers/build/configuration_snippets/iiop-endpoint.xml
index 016c833..a5b7d8a 100644
--- a/websphere-liberty_kernel/helpers/build/configuration_snippets/iiop-endpoint.xml
+++ b/websphere-liberty_kernel/helpers/build/configuration_snippets/iiop-endpoint.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<server>
- <iiopEndpoint id="defaultIiopEndpoint" host="${env.IIOP_ENDPOINT_HOST}" iiopPort="2809" />
+ <variable name="IIOP_PORT" defaultValue="2809" />
+ <iiopEndpoint id="defaultIiopEndpoint" host="${IIOP_ENDPOINT_HOST}" iiopPort="${IIOP_PORT}" />
</server>
\ No newline at end of file
diff --git a/websphere-liberty_kernel/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml b/websphere-liberty_kernel/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
index 851f724..f8fea3c 100644
--- a/websphere-liberty_kernel/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
+++ b/websphere-liberty_kernel/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<server>
- <iiopEndpoint id="defaultIiopEndpoint" host="${env.IIOP_ENDPOINT_HOST}" iiopPort="2809">
- <iiopsOptions iiopsPort="9402" sslRef="defaultSSLConfig" />
+ <variable name="IIOP_PORT" defaultValue="2809" />
+ <variable name="IIOPS_PORT" defaultValue="9402" />
+ <iiopEndpoint id="defaultIiopEndpoint" host="${IIOP_ENDPOINT_HOST}" iiopPort="${IIOP_PORT}">
+ <iiopsOptions iiopsPort="${IIOPS_PORT}" sslRef="defaultSSLConfig" />
</iiopEndpoint>
</server>
\ No newline at end of file
diff --git a/websphere-liberty_kernel/helpers/build/configuration_snippets/jms-endpoint.xml b/websphere-liberty_kernel/helpers/build/configuration_snippets/jms-endpoint.xml
index 6de151b..a99b071 100644
--- a/websphere-liberty_kernel/helpers/build/configuration_snippets/jms-endpoint.xml
+++ b/websphere-liberty_kernel/helpers/build/configuration_snippets/jms-endpoint.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<server>
- <wasJmsEndpoint id="InboundJmsEndpoint" host="*" wasJmsPort="7276" />
+ <variable name="JMS_PORT" defaultValue="7276" />
+ <wasJmsEndpoint id="InboundJmsEndpoint" host="*" wasJmsPort="${JMS_PORT}" />
</server>
\ No newline at end of file
diff --git a/websphere-liberty_kernel/helpers/build/configuration_snippets/jms-ssl-endpoint.xml b/websphere-liberty_kernel/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
index f43e068..d32a77c 100644
--- a/websphere-liberty_kernel/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
+++ b/websphere-liberty_kernel/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<server>
- <wasJmsEndpoint id="InboundJmsEndpoint" host="*" wasJmsSSLPort="7286" />
+ <variable name="JMSS_PORT" defaultValue="7286" />
+ <wasJmsEndpoint id="InboundJmsEndpoint" host="*" wasJmsSSLPort="${JMSS_PORT}" />
</server>
\ No newline at end of file
diff --git a/websphere-liberty_kernel/licenses/en.html b/websphere-liberty_kernel/licenses/en.html
index b108187..2888b6d 100644
--- a/websphere-liberty_kernel/licenses/en.html
+++ b/websphere-liberty_kernel/licenses/en.html
@@ -14,7 +14,7 @@ the Program, the International License Agreement for Non-
Warranted Programs (Z125-5589-05) applies.<br>
<br>
Program Name (Program Number):<br>
-IBM WebSphere Application Server Liberty 19.0.0.5
+IBM WebSphere Application Server Liberty 19.0.0.6
(Component)<br>
<br>
The following standard terms apply to Licensee's use of the
@@ -88,6 +88,7 @@ License Information document.<br>
<br>
The following are Separately Licensed Code:<br>
Ubuntu<br>
+Red Hat Universal Base Image<br>
<br>
Source Components and Sample Materials<br>
<br>
@@ -153,9 +154,9 @@ change, and distribute the software to anyone and for any purpose. <br>
An "Install" is an installed copy of the Program on a
physical or virtual disk made available to be executed on a computer.<br>
<br>
-L/N: L-CTUR-BBXVDY<br>
-D/N: L-CTUR-BBXVDY<br>
-P/N: L-CTUR-BBXVDY<br>
+L/N: L-ARON-BD57N4<br>
+D/N: L-ARON-BD57N4<br>
+P/N: L-ARON-BD57N4<br>
<br>
<br>
International License Agreement for Non-Warranted Programs<br>
diff --git a/websphere-liberty_kernel/licenses/non_ibm_license.html b/websphere-liberty_kernel/licenses/non_ibm_license.html
index a67c4ba..3786554 100644
--- a/websphere-liberty_kernel/licenses/non_ibm_license.html
+++ b/websphere-liberty_kernel/licenses/non_ibm_license.html
@@ -6,7 +6,7 @@
<BODY>
TERMS AND CONDITIONS FOR SEPARATELY LICENSED CODE<br>
<br>
-IBM WebSphere Application Server Liberty 19.0.0.5<br>
+IBM WebSphere Application Server Liberty 19.0.0.6<br>
<br>
The IBM license agreement and any applicable information on
the web<br>
@@ -38,6 +38,7 @@ shipped with, the Program as Licensee installed it.<br>
<br>
The following are Separately Licensed Code:<br>
Ubuntu<br>
+Red Hat Universal Base Image<br>
<br>
<br>
==================================================================================<br>
@@ -48,9 +49,18 @@ container format, license information for Ubuntu packages may be
found in /usr/share/doc/${package}/copyright<br>
-------------------------------------------------------------------------------------------------------------------------------<br>
==================================================================================<br>
+Red Hat Universal Base Image Operating System<br>
+--------------------------------------------------------------------------------------------------------------------------------------<br>
+When IBM WebSphere Application Server Liberty is provided
+in a container format, license information for Red Hat
+Universal Base Image packages may be found in
+/usr/share/doc/${package} or /usr/share/licenses/${package}<br>
+==================================================================================<br>
+<br>
+<br>
<br>
-L/N: L-CTUR-BBXVDY<br>
-D/N: L-CTUR-BBXVDY<br>
-P/N: L-CTUR-BBXVDY<br>
+L/N: L-ARON-BD57N4<br>
+D/N: L-ARON-BD57N4<br>
+P/N: L-ARON-BD57N4<br>
</BODY>
</HTML>
\ No newline at end of file
diff --git a/websphere-liberty_kernel/licenses/notices.html b/websphere-liberty_kernel/licenses/notices.html
index 617dd36..059ea4d 100644
--- a/websphere-liberty_kernel/licenses/notices.html
+++ b/websphere-liberty_kernel/licenses/notices.html
@@ -6,7 +6,7 @@
<BODY>
NOTICES AND INFORMATION<br>
<br>
-IBM WebSphere Application Server Liberty 19.0.0.5<br>
+IBM WebSphere Application Server Liberty 19.0.0.6<br>
<br>
The IBM license agreement and any applicable information on
the web<br>
@@ -63,15 +63,6 @@ Apache Bean Validation <br>
Apache BCEL<br>
Apache CDI<br>
Apache CXF<br>
-Apache CXF Command Line Tools Common<br>
-Apache CXF Command Line Tools WADLTo JAXRS Frontend<br>
-Apache CXF JAX RS Client<br>
-Apache CXF JAX RS Server Side Events Support<br>
-Apache CXF JAX RS Service Description<br>
-Apache CXF MicroProfile Client<br>
-Apache CXF Runtime HTTP Async Transport<br>
-Apache CXF Runtime HTTP Transport<br>
-Apache CXF Runtime JAX RS Frontend<br>
Apache Commons Beanutil <br>
Apache Commons Codec <br>
Apache Commons Collection<br>
@@ -1846,8 +1837,8 @@ streams-tck NOTICES AND INFORMATION<br>
END OF NOTICES AND INFORMATION<br>
==============================================================================<br>
<br>
-L/N: L-CTUR-BBXVDY<br>
-D/N: L-CTUR-BBXVDY<br>
-P/N: L-CTUR-BBXVDY<br>
+L/N: L-ARON-BD57N4<br>
+D/N: L-ARON-BD57N4<br>
+P/N: L-ARON-BD57N4<br>
</BODY>
</HTML>
\ No newline at end of file
diff --git a/websphere-liberty_latest/Dockerfile b/websphere-liberty_latest/Dockerfile
index 219fe45..6febd66 100644
--- a/websphere-liberty_latest/Dockerfile
+++ b/websphere-liberty_latest/Dockerfile
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM websphere-liberty:19.0.0.5-kernel
+FROM websphere-liberty:kernel
ARG REPOSITORIES_PROPERTIES=""
diff --git a/websphere-liberty_microProfile1/Dockerfile b/websphere-liberty_microProfile1/Dockerfile
index 8f7d58c..597e885 100644
--- a/websphere-liberty_microProfile1/Dockerfile
+++ b/websphere-liberty_microProfile1/Dockerfile
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM websphere-liberty:19.0.0.5-kernel
+FROM websphere-liberty:kernel
ARG REPOSITORIES_PROPERTIES=""
diff --git a/websphere-liberty_microProfile2/Dockerfile b/websphere-liberty_microProfile2/Dockerfile
index 3a9388a..e11ae2a 100644
--- a/websphere-liberty_microProfile2/Dockerfile
+++ b/websphere-liberty_microProfile2/Dockerfile
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM websphere-liberty:19.0.0.5-kernel
+FROM websphere-liberty:kernel
ARG REPOSITORIES_PROPERTIES=""
diff --git a/websphere-liberty_springBoot1/Dockerfile b/websphere-liberty_springBoot1/Dockerfile
index a131e75..227f270 100644
--- a/websphere-liberty_springBoot1/Dockerfile
+++ b/websphere-liberty_springBoot1/Dockerfile
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM websphere-liberty:19.0.0.5-kernel
+FROM websphere-liberty:kernel
ARG REPOSITORIES_PROPERTIES=""
diff --git a/websphere-liberty_springBoot2/Dockerfile b/websphere-liberty_springBoot2/Dockerfile
index fd72436..63c8e78 100644
--- a/websphere-liberty_springBoot2/Dockerfile
+++ b/websphere-liberty_springBoot2/Dockerfile
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM websphere-liberty:19.0.0.5-kernel
+FROM websphere-liberty:kernel
ARG REPOSITORIES_PROPERTIES=""
diff --git a/websphere-liberty_webProfile7/Dockerfile b/websphere-liberty_webProfile7/Dockerfile
index e8ad899..f8fec7a 100644
--- a/websphere-liberty_webProfile7/Dockerfile
+++ b/websphere-liberty_webProfile7/Dockerfile
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM websphere-liberty:19.0.0.5-kernel
+FROM websphere-liberty:kernel
ARG REPOSITORIES_PROPERTIES=""
diff --git a/websphere-liberty_webProfile8/Dockerfile b/websphere-liberty_webProfile8/Dockerfile
index 046d3a5..f72e8be 100644
--- a/websphere-liberty_webProfile8/Dockerfile
+++ b/websphere-liberty_webProfile8/Dockerfile
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM websphere-liberty:19.0.0.5-kernel
+FROM websphere-liberty:kernel
ARG REPOSITORIES_PROPERTIES=""
|
|
LGTM Build test of #6152; de65a16; $ bashbrew build websphere-liberty:beta
Using bashbrew/cache:107c78f556728e49090513ba107d67e1c6dce9636238a5760b54c75ccec8dc72 (websphere-liberty:beta)
Tagging websphere-liberty:beta
$ test/run.sh websphere-liberty:beta
testing websphere-liberty:beta
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build websphere-liberty:kernel
Using bashbrew/cache:417b272b7f318f7633eeadac64f82263421bad78cb8c5447b16047bed486c50d (websphere-liberty:kernel)
Tagging websphere-liberty:kernel
$ test/run.sh websphere-liberty:kernel
testing websphere-liberty:kernel
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build websphere-liberty:javaee8
Using bashbrew/cache:396523a210218f84b34fbd10be0fa36efbfaafbbd67bf39b617fa66c65752b35 (websphere-liberty:javaee8)
Tagging websphere-liberty:javaee8
Tagging websphere-liberty:latest
$ test/run.sh websphere-liberty:javaee8
testing websphere-liberty:javaee8
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build websphere-liberty:webProfile8
Using bashbrew/cache:e9dd95b4e50bbbce59a49d07609e1f361008b63ff139f8156d4ac1ad8a25d4bc (websphere-liberty:webProfile8)
Tagging websphere-liberty:webProfile8
$ test/run.sh websphere-liberty:webProfile8
testing websphere-liberty:webProfile8
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build websphere-liberty:microProfile1
Using bashbrew/cache:89cc0b94bade64bbb74bcd6e7d7ff5a83a784e9bd92f94141c07fbba53ae7002 (websphere-liberty:microProfile1)
Tagging websphere-liberty:microProfile1
$ test/run.sh websphere-liberty:microProfile1
testing websphere-liberty:microProfile1
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build websphere-liberty:microProfile2
Using bashbrew/cache:7e7a1b5432ef32801326bd918261ebf0e502b4591f7b7fccb41b925705c98ee0 (websphere-liberty:microProfile2)
Tagging websphere-liberty:microProfile2
$ test/run.sh websphere-liberty:microProfile2
testing websphere-liberty:microProfile2
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build websphere-liberty:springBoot2
Using bashbrew/cache:6e84638cd685885e40060f5382b2fc5891e8267a03d61e6d30b849c9085e79ce (websphere-liberty:springBoot2)
Tagging websphere-liberty:springBoot2
$ test/run.sh websphere-liberty:springBoot2
testing websphere-liberty:springBoot2
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build websphere-liberty:springBoot1
Using bashbrew/cache:8f10779ab6a06bf8a6d182e1c0af1c6421ad4d2b7529460104e8c73dab6ef3f3 (websphere-liberty:springBoot1)
Tagging websphere-liberty:springBoot1
$ test/run.sh websphere-liberty:springBoot1
testing websphere-liberty:springBoot1
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build websphere-liberty:webProfile7
Using bashbrew/cache:db630263c7816ad03903e5ccc4d2448878a311d648b26306455d29a50ce12334 (websphere-liberty:webProfile7)
Tagging websphere-liberty:webProfile7
$ test/run.sh websphere-liberty:webProfile7
testing websphere-liberty:webProfile7
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build websphere-liberty:javaee7
Building bashbrew/cache:1bffa5e2c78d1113aec785ff1c5ecfc31efe932d8dbe6945b06b598d54e53d13 (websphere-liberty:javaee7)
Tagging websphere-liberty:javaee7
$ test/run.sh websphere-liberty:javaee7
testing websphere-liberty:javaee7
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build websphere-liberty:19.0.0.6-kernel
Building bashbrew/cache:603be71c66c4354e05ab1d5dce670a6f465c6dd15e415c79b4a527fcc8ad8ac3 (websphere-liberty:19.0.0.6-kernel)
Tagging websphere-liberty:19.0.0.6-kernel
$ test/run.sh websphere-liberty:19.0.0.6-kernel
testing websphere-liberty:19.0.0.6-kernel
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build websphere-liberty:19.0.0.6-javaee8
Building bashbrew/cache:faabfaa785b9b1498f3bafcef1b99aa6882ab8c2d73cf11303eda71c015f91bf (websphere-liberty:19.0.0.6-javaee8)
Tagging websphere-liberty:19.0.0.6-javaee8
$ test/run.sh websphere-liberty:19.0.0.6-javaee8
testing websphere-liberty:19.0.0.6-javaee8
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build websphere-liberty:19.0.0.6-webProfile8
Building bashbrew/cache:48577bdf0e89d593bef6db3c08306df6331a2e39221325aaca907aa26fee3600 (websphere-liberty:19.0.0.6-webProfile8)
Tagging websphere-liberty:19.0.0.6-webProfile8
$ test/run.sh websphere-liberty:19.0.0.6-webProfile8
testing websphere-liberty:19.0.0.6-webProfile8
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build websphere-liberty:19.0.0.6-microProfile1
Building bashbrew/cache:8d71bd86c362419775e55e770177a5a02a33331a7f29fc9e83794b4505910073 (websphere-liberty:19.0.0.6-microProfile1)
Tagging websphere-liberty:19.0.0.6-microProfile1
$ test/run.sh websphere-liberty:19.0.0.6-microProfile1
testing websphere-liberty:19.0.0.6-microProfile1
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build websphere-liberty:19.0.0.6-microProfile2
Building bashbrew/cache:dd24c4ead9546ddf195a4e1e8722b53752be1f4294bd42c6c747d6ce0fa012e5 (websphere-liberty:19.0.0.6-microProfile2)
Tagging websphere-liberty:19.0.0.6-microProfile2
$ test/run.sh websphere-liberty:19.0.0.6-microProfile2
testing websphere-liberty:19.0.0.6-microProfile2
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build websphere-liberty:19.0.0.6-springBoot2
Building bashbrew/cache:7a40dcee4525cc83173aff7524926a2a262d8b86dbbb62a3028f6ef97d60cd6c (websphere-liberty:19.0.0.6-springBoot2)
Tagging websphere-liberty:19.0.0.6-springBoot2
$ test/run.sh websphere-liberty:19.0.0.6-springBoot2
testing websphere-liberty:19.0.0.6-springBoot2
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build websphere-liberty:19.0.0.6-springBoot1
Building bashbrew/cache:a6b47e905df887e3c971832fb14855e14520704784946483da6ae85716711fd8 (websphere-liberty:19.0.0.6-springBoot1)
Tagging websphere-liberty:19.0.0.6-springBoot1
$ test/run.sh websphere-liberty:19.0.0.6-springBoot1
testing websphere-liberty:19.0.0.6-springBoot1
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build websphere-liberty:19.0.0.6-webProfile7
Building bashbrew/cache:a0a79849b1defcb62e82efeb408f5b4e9bba13474d758ccd12e5dc4cf8996576 (websphere-liberty:19.0.0.6-webProfile7)
Tagging websphere-liberty:19.0.0.6-webProfile7
$ test/run.sh websphere-liberty:19.0.0.6-webProfile7
testing websphere-liberty:19.0.0.6-webProfile7
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build websphere-liberty:19.0.0.6-javaee7
Building bashbrew/cache:773ad8066f6f23cf4ed831e8d0aac137b94fc2e3049cec640547154fa0921139 (websphere-liberty:19.0.0.6-javaee7)
Tagging websphere-liberty:19.0.0.6-javaee7
$ test/run.sh websphere-liberty:19.0.0.6-javaee7
testing websphere-liberty:19.0.0.6-javaee7
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build websphere-liberty:19.0.0.3-kernel
Building bashbrew/cache:14a4b00b7615e97661075d36e7ddfa269714e60da675d53433d2f34d97dd7c53 (websphere-liberty:19.0.0.3-kernel)
Tagging websphere-liberty:19.0.0.3-kernel
$ test/run.sh websphere-liberty:19.0.0.3-kernel
testing websphere-liberty:19.0.0.3-kernel
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build websphere-liberty:19.0.0.3-javaee8
Building bashbrew/cache:dfa81043e6628a771ad77d9ca4cc7a342098756fc0711fd77a33bea46745a057 (websphere-liberty:19.0.0.3-javaee8)
Tagging websphere-liberty:19.0.0.3-javaee8
$ test/run.sh websphere-liberty:19.0.0.3-javaee8
testing websphere-liberty:19.0.0.3-javaee8
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build websphere-liberty:19.0.0.3-webProfile8
Building bashbrew/cache:d4bcdd10bfd5b7e94bc4c30719a2c9c86574d680583abfa40ba8ff176bdf4efc (websphere-liberty:19.0.0.3-webProfile8)
Tagging websphere-liberty:19.0.0.3-webProfile8
$ test/run.sh websphere-liberty:19.0.0.3-webProfile8
testing websphere-liberty:19.0.0.3-webProfile8
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build websphere-liberty:19.0.0.3-microProfile1
Building bashbrew/cache:178c2ec76e45c7592049791b476f87ecd2b4d20bf3642caa46ac78695e3f8221 (websphere-liberty:19.0.0.3-microProfile1)
Tagging websphere-liberty:19.0.0.3-microProfile1
$ test/run.sh websphere-liberty:19.0.0.3-microProfile1
testing websphere-liberty:19.0.0.3-microProfile1
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build websphere-liberty:19.0.0.3-microProfile2
Building bashbrew/cache:104bc394f944ab061a5d21c9fa8f049e190fa7623567164ced6e028a7b0f9d49 (websphere-liberty:19.0.0.3-microProfile2)
Tagging websphere-liberty:19.0.0.3-microProfile2
$ test/run.sh websphere-liberty:19.0.0.3-microProfile2
testing websphere-liberty:19.0.0.3-microProfile2
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build websphere-liberty:19.0.0.3-springBoot2
Building bashbrew/cache:b7aa3f93605aedf0dc7f31a248425cd1ba176103ffa38a1d52545dc2431a02f1 (websphere-liberty:19.0.0.3-springBoot2)
Tagging websphere-liberty:19.0.0.3-springBoot2
$ test/run.sh websphere-liberty:19.0.0.3-springBoot2
testing websphere-liberty:19.0.0.3-springBoot2
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build websphere-liberty:19.0.0.3-springBoot1
Building bashbrew/cache:953579ff1b7d5078ca4f17028834767aea2cc1714b412939f735081c6fbed9d0 (websphere-liberty:19.0.0.3-springBoot1)
Tagging websphere-liberty:19.0.0.3-springBoot1
$ test/run.sh websphere-liberty:19.0.0.3-springBoot1
testing websphere-liberty:19.0.0.3-springBoot1
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build websphere-liberty:19.0.0.3-webProfile7
Building bashbrew/cache:8c11500fae0c1fab3cf4dde08c3e9ac9f82f03f2db485c36f83fd3ddd5e95a5a (websphere-liberty:19.0.0.3-webProfile7)
Tagging websphere-liberty:19.0.0.3-webProfile7
$ test/run.sh websphere-liberty:19.0.0.3-webProfile7
testing websphere-liberty:19.0.0.3-webProfile7
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build websphere-liberty:19.0.0.3-javaee7
Building bashbrew/cache:f8e10d227d45970f6357cd8ec7e5e5b1fdb563eccc1901ce4f2695d12b521cbd (websphere-liberty:19.0.0.3-javaee7)
Tagging websphere-liberty:19.0.0.3-javaee7
$ test/run.sh websphere-liberty:19.0.0.3-javaee7
testing websphere-liberty:19.0.0.3-javaee7
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Updating WebSphere Liberty to 19.0.0.6. Now maintaining versioned images for 19.0.0.6 and 19.0.0.3.