20.0.0.5 open liberty #7973
Closed
20.0.0.5 open liberty #7973
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 for 81def16:diff --git a/_bashbrew-arches b/_bashbrew-arches
index 397aa60..dbea05f 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -16,6 +16,12 @@ open-liberty:20.0.0.4-full-java8-openj9 @ s390x
open-liberty:20.0.0.4-kernel-java8-openj9 @ amd64
open-liberty:20.0.0.4-kernel-java8-openj9 @ ppc64le
open-liberty:20.0.0.4-kernel-java8-openj9 @ s390x
+open-liberty:20.0.0.5-full-java8-openj9 @ amd64
+open-liberty:20.0.0.5-full-java8-openj9 @ ppc64le
+open-liberty:20.0.0.5-full-java8-openj9 @ s390x
+open-liberty:20.0.0.5-kernel-java8-openj9 @ amd64
+open-liberty:20.0.0.5-kernel-java8-openj9 @ ppc64le
+open-liberty:20.0.0.5-kernel-java8-openj9 @ s390x
open-liberty:kernel-java8-openj9 @ amd64
open-liberty:kernel-java8-openj9 @ ppc64le
open-liberty:kernel-java8-openj9 @ s390x
@@ -46,6 +52,14 @@ websphere-liberty:20.0.0.4-kernel-java8-ibmjava @ amd64
websphere-liberty:20.0.0.4-kernel-java8-ibmjava @ i386
websphere-liberty:20.0.0.4-kernel-java8-ibmjava @ ppc64le
websphere-liberty:20.0.0.4-kernel-java8-ibmjava @ s390x
+websphere-liberty:20.0.0.5-full-java8-ibmjava @ amd64
+websphere-liberty:20.0.0.5-full-java8-ibmjava @ i386
+websphere-liberty:20.0.0.5-full-java8-ibmjava @ ppc64le
+websphere-liberty:20.0.0.5-full-java8-ibmjava @ s390x
+websphere-liberty:20.0.0.5-kernel-java8-ibmjava @ amd64
+websphere-liberty:20.0.0.5-kernel-java8-ibmjava @ i386
+websphere-liberty:20.0.0.5-kernel-java8-ibmjava @ ppc64le
+websphere-liberty:20.0.0.5-kernel-java8-ibmjava @ s390x
websphere-liberty:beta @ amd64
websphere-liberty:beta @ i386
websphere-liberty:beta @ ppc64le
diff --git a/_bashbrew-list b/_bashbrew-list
index fe502ce..883dbf6 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -4,6 +4,8 @@ open-liberty:20.0.0.3-full-java8-openj9
open-liberty:20.0.0.3-kernel-java8-openj9
open-liberty:20.0.0.4-full-java8-openj9
open-liberty:20.0.0.4-kernel-java8-openj9
+open-liberty:20.0.0.5-full-java8-openj9
+open-liberty:20.0.0.5-kernel-java8-openj9
open-liberty:full
open-liberty:full-java8-openj9
open-liberty:kernel
@@ -15,6 +17,8 @@ websphere-liberty:20.0.0.3-full-java8-ibmjava
websphere-liberty:20.0.0.3-kernel-java8-ibmjava
websphere-liberty:20.0.0.4-full-java8-ibmjava
websphere-liberty:20.0.0.4-kernel-java8-ibmjava
+websphere-liberty:20.0.0.5-full-java8-ibmjava
+websphere-liberty:20.0.0.5-kernel-java8-ibmjava
websphere-liberty:beta
websphere-liberty:full
websphere-liberty:kernel
diff --git a/open-liberty_20.0.0.3-kernel-java8-openj9/helpers/build/configuration_snippets/trustDefault.xml b/open-liberty_20.0.0.3-kernel-java8-openj9/helpers/build/configuration_snippets/trustDefault.xml
index 2e9c2cd..cfda62e 100644
--- a/open-liberty_20.0.0.3-kernel-java8-openj9/helpers/build/configuration_snippets/trustDefault.xml
+++ b/open-liberty_20.0.0.3-kernel-java8-openj9/helpers/build/configuration_snippets/trustDefault.xml
@@ -1,4 +1,4 @@
<server description="Default Server">
<ssl id="defaultSSLConfig" trustDefaultCerts="${SEC_TLS_TRUSTDEFAULTCERTS}" />
- <variable name="SEC_TLS_TRUSTDEFAULTCERTS" defaultValue="false"/>
+ <variable name="SEC_TLS_TRUSTDEFAULTCERTS" defaultValue="true"/>
</server>
diff --git a/open-liberty_20.0.0.3-kernel-java8-openj9/helpers/build/configuration_snippets/truststore.xml b/open-liberty_20.0.0.3-kernel-java8-openj9/helpers/build/configuration_snippets/truststore.xml
index 88828eb..08c36e2 100644
--- a/open-liberty_20.0.0.3-kernel-java8-openj9/helpers/build/configuration_snippets/truststore.xml
+++ b/open-liberty_20.0.0.3-kernel-java8-openj9/helpers/build/configuration_snippets/truststore.xml
@@ -1,5 +1,5 @@
<server description="Default Server">
<ssl id="defaultSSLConfig" keyStoreRef="defaultKeyStore" trustStoreRef="defaultTrustStore" trustDefaultCerts="${SEC_TLS_TRUSTDEFAULTCERTS}" />
<keyStore id="defaultTrustStore" location="${server.output.dir}/resources/security/trust.p12" type="PKCS12" password="PWD_TRUST" />
- <variable name="SEC_TLS_TRUSTDEFAULTCERTS" defaultValue="false"/>
+ <variable name="SEC_TLS_TRUSTDEFAULTCERTS" defaultValue="true"/>
</server>
diff --git a/open-liberty_20.0.0.3-kernel-java8-openj9/helpers/runtime/docker-server.sh b/open-liberty_20.0.0.3-kernel-java8-openj9/helpers/runtime/docker-server.sh
index 0d145ed..6c14c31 100755
--- a/open-liberty_20.0.0.3-kernel-java8-openj9/helpers/runtime/docker-server.sh
+++ b/open-liberty_20.0.0.3-kernel-java8-openj9/helpers/runtime/docker-server.sh
@@ -56,7 +56,7 @@ function importKeyCert() {
fi
if [ -e $TRUSTSTORE_FILE ]; then
sed "s|PWD_TRUST|$TRUSTSTORE_PASSWORD|g" $SNIPPETS_SOURCE/truststore.xml > $SNIPPETS_TARGET_OVERRIDES/truststore.xml
- else
+ elif [ ! -z $SEC_TLS_TRUSTDEFAULTCERTS ]; then
cp $SNIPPETS_SOURCE/trustDefault.xml $SNIPPETS_TARGET_OVERRIDES/trustDefault.xml
fi
}
diff --git a/open-liberty_20.0.0.4-kernel-java8-openj9/helpers/build/configuration_snippets/trustDefault.xml b/open-liberty_20.0.0.4-kernel-java8-openj9/helpers/build/configuration_snippets/trustDefault.xml
index 2e9c2cd..cfda62e 100644
--- a/open-liberty_20.0.0.4-kernel-java8-openj9/helpers/build/configuration_snippets/trustDefault.xml
+++ b/open-liberty_20.0.0.4-kernel-java8-openj9/helpers/build/configuration_snippets/trustDefault.xml
@@ -1,4 +1,4 @@
<server description="Default Server">
<ssl id="defaultSSLConfig" trustDefaultCerts="${SEC_TLS_TRUSTDEFAULTCERTS}" />
- <variable name="SEC_TLS_TRUSTDEFAULTCERTS" defaultValue="false"/>
+ <variable name="SEC_TLS_TRUSTDEFAULTCERTS" defaultValue="true"/>
</server>
diff --git a/open-liberty_20.0.0.4-kernel-java8-openj9/helpers/build/configuration_snippets/truststore.xml b/open-liberty_20.0.0.4-kernel-java8-openj9/helpers/build/configuration_snippets/truststore.xml
index 88828eb..08c36e2 100644
--- a/open-liberty_20.0.0.4-kernel-java8-openj9/helpers/build/configuration_snippets/truststore.xml
+++ b/open-liberty_20.0.0.4-kernel-java8-openj9/helpers/build/configuration_snippets/truststore.xml
@@ -1,5 +1,5 @@
<server description="Default Server">
<ssl id="defaultSSLConfig" keyStoreRef="defaultKeyStore" trustStoreRef="defaultTrustStore" trustDefaultCerts="${SEC_TLS_TRUSTDEFAULTCERTS}" />
<keyStore id="defaultTrustStore" location="${server.output.dir}/resources/security/trust.p12" type="PKCS12" password="PWD_TRUST" />
- <variable name="SEC_TLS_TRUSTDEFAULTCERTS" defaultValue="false"/>
+ <variable name="SEC_TLS_TRUSTDEFAULTCERTS" defaultValue="true"/>
</server>
diff --git a/open-liberty_20.0.0.4-kernel-java8-openj9/helpers/runtime/docker-server.sh b/open-liberty_20.0.0.4-kernel-java8-openj9/helpers/runtime/docker-server.sh
index d4830b8..b3c69f5 100755
--- a/open-liberty_20.0.0.4-kernel-java8-openj9/helpers/runtime/docker-server.sh
+++ b/open-liberty_20.0.0.4-kernel-java8-openj9/helpers/runtime/docker-server.sh
@@ -56,7 +56,7 @@ function importKeyCert() {
fi
if [ -e $TRUSTSTORE_FILE ]; then
sed "s|PWD_TRUST|$TRUSTSTORE_PASSWORD|g" $SNIPPETS_SOURCE/truststore.xml > $SNIPPETS_TARGET_OVERRIDES/truststore.xml
- else
+ elif [ ! -z $SEC_TLS_TRUSTDEFAULTCERTS ]; then
cp $SNIPPETS_SOURCE/trustDefault.xml $SNIPPETS_TARGET_OVERRIDES/trustDefault.xml
fi
}
diff --git a/open-liberty_latest/Dockerfile.ubuntu.adoptopenjdk8 b/open-liberty_20.0.0.5-full-java8-openj9/Dockerfile.ubuntu.adoptopenjdk8
similarity index 100%
copy from open-liberty_latest/Dockerfile.ubuntu.adoptopenjdk8
copy to open-liberty_20.0.0.5-full-java8-openj9/Dockerfile.ubuntu.adoptopenjdk8
diff --git a/open-liberty_20.0.0.3-kernel-java8-openj9/Dockerfile.ubuntu.adoptopenjdk8 b/open-liberty_20.0.0.5-kernel-java8-openj9/Dockerfile.ubuntu.adoptopenjdk8
similarity index 96%
copy from open-liberty_20.0.0.3-kernel-java8-openj9/Dockerfile.ubuntu.adoptopenjdk8
copy to open-liberty_20.0.0.5-kernel-java8-openj9/Dockerfile.ubuntu.adoptopenjdk8
index 0f8770a..4491359 100644
--- a/open-liberty_20.0.0.3-kernel-java8-openj9/Dockerfile.ubuntu.adoptopenjdk8
+++ b/open-liberty_20.0.0.5-kernel-java8-openj9/Dockerfile.ubuntu.adoptopenjdk8
@@ -1,7 +1,7 @@
FROM adoptopenjdk:8-jre-openj9
-ARG LIBERTY_VERSION=20.0.0.3
-ARG LIBERTY_SHA=49180c2cd6ce23f863760d837a4b1663680084db
-ARG LIBERTY_BUILD_LABEL=cl200320200305-1433
+ARG LIBERTY_VERSION=20.0.0.5
+ARG LIBERTY_SHA=bd1909170f3ef9723e4ab9a7a3b6273b846b1974
+ARG LIBERTY_BUILD_LABEL=cl200520200429-1655
ARG LIBERTY_DOWNLOAD_URL=https://repo1.maven.org/maven2/io/openliberty/openliberty-runtime/$LIBERTY_VERSION/openliberty-runtime-$LIBERTY_VERSION.zip
ARG OPENJ9_SCC=true
diff --git a/open-liberty_19.0.0.12-kernel-java8-openj9/fixes/.gitkeep b/open-liberty_20.0.0.5-kernel-java8-openj9/fixes/.gitkeep
similarity index 100%
copy from open-liberty_19.0.0.12-kernel-java8-openj9/fixes/.gitkeep
copy to open-liberty_20.0.0.5-kernel-java8-openj9/fixes/.gitkeep
diff --git a/open-liberty_19.0.0.12-kernel-java8-openj9/helpers/build/configuration_snippets/hazelcast-client.xml b/open-liberty_20.0.0.5-kernel-java8-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
similarity index 100%
copy from open-liberty_19.0.0.12-kernel-java8-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
copy to open-liberty_20.0.0.5-kernel-java8-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
diff --git a/open-liberty_19.0.0.12-kernel-java8-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml b/open-liberty_20.0.0.5-kernel-java8-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
similarity index 100%
copy from open-liberty_19.0.0.12-kernel-java8-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
copy to open-liberty_20.0.0.5-kernel-java8-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
diff --git a/open-liberty_19.0.0.12-kernel-java8-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml b/open-liberty_20.0.0.5-kernel-java8-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
similarity index 100%
copy from open-liberty_19.0.0.12-kernel-java8-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
copy to open-liberty_20.0.0.5-kernel-java8-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
diff --git a/open-liberty_19.0.0.12-kernel-java8-openj9/helpers/build/configuration_snippets/http-endpoint.xml b/open-liberty_20.0.0.5-kernel-java8-openj9/helpers/build/configuration_snippets/http-endpoint.xml
similarity index 100%
copy from open-liberty_19.0.0.12-kernel-java8-openj9/helpers/build/configuration_snippets/http-endpoint.xml
copy to open-liberty_20.0.0.5-kernel-java8-openj9/helpers/build/configuration_snippets/http-endpoint.xml
diff --git a/open-liberty_19.0.0.12-kernel-java8-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml b/open-liberty_20.0.0.5-kernel-java8-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml
similarity index 100%
copy from open-liberty_19.0.0.12-kernel-java8-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml
copy to open-liberty_20.0.0.5-kernel-java8-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml
diff --git a/open-liberty_19.0.0.12-kernel-java8-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml b/open-liberty_20.0.0.5-kernel-java8-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml
similarity index 100%
copy from open-liberty_19.0.0.12-kernel-java8-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml
copy to open-liberty_20.0.0.5-kernel-java8-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml
diff --git a/open-liberty_19.0.0.12-kernel-java8-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml b/open-liberty_20.0.0.5-kernel-java8-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
similarity index 100%
copy from open-liberty_19.0.0.12-kernel-java8-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
copy to open-liberty_20.0.0.5-kernel-java8-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
diff --git a/open-liberty_20.0.0.4-kernel-java8-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/open-liberty_20.0.0.5-kernel-java8-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
similarity index 100%
copy from open-liberty_20.0.0.4-kernel-java8-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
copy to open-liberty_20.0.0.5-kernel-java8-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
diff --git a/open-liberty_19.0.0.12-kernel-java8-openj9/helpers/build/configuration_snippets/jms-endpoint.xml b/open-liberty_20.0.0.5-kernel-java8-openj9/helpers/build/configuration_snippets/jms-endpoint.xml
similarity index 100%
copy from open-liberty_19.0.0.12-kernel-java8-openj9/helpers/build/configuration_snippets/jms-endpoint.xml
copy to open-liberty_20.0.0.5-kernel-java8-openj9/helpers/build/configuration_snippets/jms-endpoint.xml
diff --git a/open-liberty_19.0.0.12-kernel-java8-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml b/open-liberty_20.0.0.5-kernel-java8-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
similarity index 100%
copy from open-liberty_19.0.0.12-kernel-java8-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
copy to open-liberty_20.0.0.5-kernel-java8-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
diff --git a/open-liberty_19.0.0.12-kernel-java8-openj9/helpers/build/configuration_snippets/keystore.xml b/open-liberty_20.0.0.5-kernel-java8-openj9/helpers/build/configuration_snippets/keystore.xml
similarity index 100%
copy from open-liberty_19.0.0.12-kernel-java8-openj9/helpers/build/configuration_snippets/keystore.xml
copy to open-liberty_20.0.0.5-kernel-java8-openj9/helpers/build/configuration_snippets/keystore.xml
diff --git a/open-liberty_19.0.0.12-kernel-java8-openj9/helpers/build/configuration_snippets/mp-health-check.xml b/open-liberty_20.0.0.5-kernel-java8-openj9/helpers/build/configuration_snippets/mp-health-check.xml
similarity index 100%
copy from open-liberty_19.0.0.12-kernel-java8-openj9/helpers/build/configuration_snippets/mp-health-check.xml
copy to open-liberty_20.0.0.5-kernel-java8-openj9/helpers/build/configuration_snippets/mp-health-check.xml
diff --git a/open-liberty_19.0.0.12-kernel-java8-openj9/helpers/build/configuration_snippets/mp-monitoring.xml b/open-liberty_20.0.0.5-kernel-java8-openj9/helpers/build/configuration_snippets/mp-monitoring.xml
similarity index 100%
copy from open-liberty_19.0.0.12-kernel-java8-openj9/helpers/build/configuration_snippets/mp-monitoring.xml
copy to open-liberty_20.0.0.5-kernel-java8-openj9/helpers/build/configuration_snippets/mp-monitoring.xml
diff --git a/open-liberty_20.0.0.3-kernel-java8-openj9/helpers/build/configuration_snippets/sso-facebook.xml b/open-liberty_20.0.0.5-kernel-java8-openj9/helpers/build/configuration_snippets/sso-facebook.xml
similarity index 100%
copy from open-liberty_20.0.0.3-kernel-java8-openj9/helpers/build/configuration_snippets/sso-facebook.xml
copy to open-liberty_20.0.0.5-kernel-java8-openj9/helpers/build/configuration_snippets/sso-facebook.xml
diff --git a/open-liberty_20.0.0.3-kernel-java8-openj9/helpers/build/configuration_snippets/sso-features.xml b/open-liberty_20.0.0.5-kernel-java8-openj9/helpers/build/configuration_snippets/sso-features.xml
similarity index 100%
copy from open-liberty_20.0.0.3-kernel-java8-openj9/helpers/build/configuration_snippets/sso-features.xml
copy to open-liberty_20.0.0.5-kernel-java8-openj9/helpers/build/configuration_snippets/sso-features.xml
diff --git a/open-liberty_20.0.0.3-kernel-java8-openj9/helpers/build/configuration_snippets/sso-github.xml b/open-liberty_20.0.0.5-kernel-java8-openj9/helpers/build/configuration_snippets/sso-github.xml
similarity index 100%
copy from open-liberty_20.0.0.3-kernel-java8-openj9/helpers/build/configuration_snippets/sso-github.xml
copy to open-liberty_20.0.0.5-kernel-java8-openj9/helpers/build/configuration_snippets/sso-github.xml
diff --git a/open-liberty_20.0.0.3-kernel-java8-openj9/helpers/build/configuration_snippets/sso-google.xml b/open-liberty_20.0.0.5-kernel-java8-openj9/helpers/build/configuration_snippets/sso-google.xml
similarity index 100%
copy from open-liberty_20.0.0.3-kernel-java8-openj9/helpers/build/configuration_snippets/sso-google.xml
copy to open-liberty_20.0.0.5-kernel-java8-openj9/helpers/build/configuration_snippets/sso-google.xml
diff --git a/open-liberty_20.0.0.3-kernel-java8-openj9/helpers/build/configuration_snippets/sso-linkedin.xml b/open-liberty_20.0.0.5-kernel-java8-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
similarity index 100%
copy from open-liberty_20.0.0.3-kernel-java8-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
copy to open-liberty_20.0.0.5-kernel-java8-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
diff --git a/open-liberty_20.0.0.3-kernel-java8-openj9/helpers/build/configuration_snippets/sso-oauth2.xml b/open-liberty_20.0.0.5-kernel-java8-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
similarity index 100%
copy from open-liberty_20.0.0.3-kernel-java8-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
copy to open-liberty_20.0.0.5-kernel-java8-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
diff --git a/open-liberty_20.0.0.3-kernel-java8-openj9/helpers/build/configuration_snippets/sso-oidc.xml b/open-liberty_20.0.0.5-kernel-java8-openj9/helpers/build/configuration_snippets/sso-oidc.xml
similarity index 100%
copy from open-liberty_20.0.0.3-kernel-java8-openj9/helpers/build/configuration_snippets/sso-oidc.xml
copy to open-liberty_20.0.0.5-kernel-java8-openj9/helpers/build/configuration_snippets/sso-oidc.xml
diff --git a/open-liberty_20.0.0.3-kernel-java8-openj9/helpers/build/configuration_snippets/sso-twitter.xml b/open-liberty_20.0.0.5-kernel-java8-openj9/helpers/build/configuration_snippets/sso-twitter.xml
similarity index 100%
copy from open-liberty_20.0.0.3-kernel-java8-openj9/helpers/build/configuration_snippets/sso-twitter.xml
copy to open-liberty_20.0.0.5-kernel-java8-openj9/helpers/build/configuration_snippets/sso-twitter.xml
diff --git a/open-liberty_19.0.0.12-kernel-java8-openj9/helpers/build/configuration_snippets/tls.xml b/open-liberty_20.0.0.5-kernel-java8-openj9/helpers/build/configuration_snippets/tls.xml
similarity index 100%
copy from open-liberty_19.0.0.12-kernel-java8-openj9/helpers/build/configuration_snippets/tls.xml
copy to open-liberty_20.0.0.5-kernel-java8-openj9/helpers/build/configuration_snippets/tls.xml
diff --git a/open-liberty_20.0.0.3-kernel-java8-openj9/helpers/build/configuration_snippets/trustDefault.xml b/open-liberty_20.0.0.5-kernel-java8-openj9/helpers/build/configuration_snippets/trustDefault.xml
similarity index 65%
copy from open-liberty_20.0.0.3-kernel-java8-openj9/helpers/build/configuration_snippets/trustDefault.xml
copy to open-liberty_20.0.0.5-kernel-java8-openj9/helpers/build/configuration_snippets/trustDefault.xml
index 2e9c2cd..cfda62e 100644
--- a/open-liberty_20.0.0.3-kernel-java8-openj9/helpers/build/configuration_snippets/trustDefault.xml
+++ b/open-liberty_20.0.0.5-kernel-java8-openj9/helpers/build/configuration_snippets/trustDefault.xml
@@ -1,4 +1,4 @@
<server description="Default Server">
<ssl id="defaultSSLConfig" trustDefaultCerts="${SEC_TLS_TRUSTDEFAULTCERTS}" />
- <variable name="SEC_TLS_TRUSTDEFAULTCERTS" defaultValue="false"/>
+ <variable name="SEC_TLS_TRUSTDEFAULTCERTS" defaultValue="true"/>
</server>
diff --git a/open-liberty_kernel-java8-openj9/helpers/build/configuration_snippets/truststore.xml b/open-liberty_20.0.0.5-kernel-java8-openj9/helpers/build/configuration_snippets/truststore.xml
similarity index 82%
copy from open-liberty_kernel-java8-openj9/helpers/build/configuration_snippets/truststore.xml
copy to open-liberty_20.0.0.5-kernel-java8-openj9/helpers/build/configuration_snippets/truststore.xml
index 88828eb..08c36e2 100644
--- a/open-liberty_kernel-java8-openj9/helpers/build/configuration_snippets/truststore.xml
+++ b/open-liberty_20.0.0.5-kernel-java8-openj9/helpers/build/configuration_snippets/truststore.xml
@@ -1,5 +1,5 @@
<server description="Default Server">
<ssl id="defaultSSLConfig" keyStoreRef="defaultKeyStore" trustStoreRef="defaultTrustStore" trustDefaultCerts="${SEC_TLS_TRUSTDEFAULTCERTS}" />
<keyStore id="defaultTrustStore" location="${server.output.dir}/resources/security/trust.p12" type="PKCS12" password="PWD_TRUST" />
- <variable name="SEC_TLS_TRUSTDEFAULTCERTS" defaultValue="false"/>
+ <variable name="SEC_TLS_TRUSTDEFAULTCERTS" defaultValue="true"/>
</server>
diff --git a/open-liberty_20.0.0.4-kernel-java8-openj9/helpers/build/configure.sh b/open-liberty_20.0.0.5-kernel-java8-openj9/helpers/build/configure.sh
similarity index 100%
copy from open-liberty_20.0.0.4-kernel-java8-openj9/helpers/build/configure.sh
copy to open-liberty_20.0.0.5-kernel-java8-openj9/helpers/build/configure.sh
diff --git a/open-liberty_20.0.0.4-kernel-java8-openj9/helpers/build/infinispan-client-setup.sh b/open-liberty_20.0.0.5-kernel-java8-openj9/helpers/build/infinispan-client-setup.sh
similarity index 100%
copy from open-liberty_20.0.0.4-kernel-java8-openj9/helpers/build/infinispan-client-setup.sh
copy to open-liberty_20.0.0.5-kernel-java8-openj9/helpers/build/infinispan-client-setup.sh
diff --git a/open-liberty_kernel-java8-openj9/helpers/build/populate_scc.sh b/open-liberty_20.0.0.5-kernel-java8-openj9/helpers/build/populate_scc.sh
similarity index 100%
copy from open-liberty_kernel-java8-openj9/helpers/build/populate_scc.sh
copy to open-liberty_20.0.0.5-kernel-java8-openj9/helpers/build/populate_scc.sh
diff --git a/open-liberty_kernel-java8-openj9/helpers/runtime/docker-server.sh b/open-liberty_20.0.0.5-kernel-java8-openj9/helpers/runtime/docker-server.sh
similarity index 98%
copy from open-liberty_kernel-java8-openj9/helpers/runtime/docker-server.sh
copy to open-liberty_20.0.0.5-kernel-java8-openj9/helpers/runtime/docker-server.sh
index d4830b8..b3c69f5 100755
--- a/open-liberty_kernel-java8-openj9/helpers/runtime/docker-server.sh
+++ b/open-liberty_20.0.0.5-kernel-java8-openj9/helpers/runtime/docker-server.sh
@@ -56,7 +56,7 @@ function importKeyCert() {
fi
if [ -e $TRUSTSTORE_FILE ]; then
sed "s|PWD_TRUST|$TRUSTSTORE_PASSWORD|g" $SNIPPETS_SOURCE/truststore.xml > $SNIPPETS_TARGET_OVERRIDES/truststore.xml
- else
+ elif [ ! -z $SEC_TLS_TRUSTDEFAULTCERTS ]; then
cp $SNIPPETS_SOURCE/trustDefault.xml $SNIPPETS_TARGET_OVERRIDES/trustDefault.xml
fi
}
diff --git a/open-liberty_kernel-java8-openj9/Dockerfile.ubuntu.adoptopenjdk8 b/open-liberty_kernel-java8-openj9/Dockerfile.ubuntu.adoptopenjdk8
index 35c66bb..4491359 100644
--- a/open-liberty_kernel-java8-openj9/Dockerfile.ubuntu.adoptopenjdk8
+++ b/open-liberty_kernel-java8-openj9/Dockerfile.ubuntu.adoptopenjdk8
@@ -1,7 +1,7 @@
FROM adoptopenjdk:8-jre-openj9
-ARG LIBERTY_VERSION=20.0.0.4
-ARG LIBERTY_SHA=bddb444a461e22d1e69b970916993fe3046a0f10
-ARG LIBERTY_BUILD_LABEL=cl200420200401-1714
+ARG LIBERTY_VERSION=20.0.0.5
+ARG LIBERTY_SHA=bd1909170f3ef9723e4ab9a7a3b6273b846b1974
+ARG LIBERTY_BUILD_LABEL=cl200520200429-1655
ARG LIBERTY_DOWNLOAD_URL=https://repo1.maven.org/maven2/io/openliberty/openliberty-runtime/$LIBERTY_VERSION/openliberty-runtime-$LIBERTY_VERSION.zip
ARG OPENJ9_SCC=true
diff --git a/open-liberty_kernel-java8-openj9/helpers/build/configuration_snippets/trustDefault.xml b/open-liberty_kernel-java8-openj9/helpers/build/configuration_snippets/trustDefault.xml
index 2e9c2cd..cfda62e 100644
--- a/open-liberty_kernel-java8-openj9/helpers/build/configuration_snippets/trustDefault.xml
+++ b/open-liberty_kernel-java8-openj9/helpers/build/configuration_snippets/trustDefault.xml
@@ -1,4 +1,4 @@
<server description="Default Server">
<ssl id="defaultSSLConfig" trustDefaultCerts="${SEC_TLS_TRUSTDEFAULTCERTS}" />
- <variable name="SEC_TLS_TRUSTDEFAULTCERTS" defaultValue="false"/>
+ <variable name="SEC_TLS_TRUSTDEFAULTCERTS" defaultValue="true"/>
</server>
diff --git a/open-liberty_kernel-java8-openj9/helpers/build/configuration_snippets/truststore.xml b/open-liberty_kernel-java8-openj9/helpers/build/configuration_snippets/truststore.xml
index 88828eb..08c36e2 100644
--- a/open-liberty_kernel-java8-openj9/helpers/build/configuration_snippets/truststore.xml
+++ b/open-liberty_kernel-java8-openj9/helpers/build/configuration_snippets/truststore.xml
@@ -1,5 +1,5 @@
<server description="Default Server">
<ssl id="defaultSSLConfig" keyStoreRef="defaultKeyStore" trustStoreRef="defaultTrustStore" trustDefaultCerts="${SEC_TLS_TRUSTDEFAULTCERTS}" />
<keyStore id="defaultTrustStore" location="${server.output.dir}/resources/security/trust.p12" type="PKCS12" password="PWD_TRUST" />
- <variable name="SEC_TLS_TRUSTDEFAULTCERTS" defaultValue="false"/>
+ <variable name="SEC_TLS_TRUSTDEFAULTCERTS" defaultValue="true"/>
</server>
diff --git a/open-liberty_kernel-java8-openj9/helpers/runtime/docker-server.sh b/open-liberty_kernel-java8-openj9/helpers/runtime/docker-server.sh
index d4830b8..b3c69f5 100755
--- a/open-liberty_kernel-java8-openj9/helpers/runtime/docker-server.sh
+++ b/open-liberty_kernel-java8-openj9/helpers/runtime/docker-server.sh
@@ -56,7 +56,7 @@ function importKeyCert() {
fi
if [ -e $TRUSTSTORE_FILE ]; then
sed "s|PWD_TRUST|$TRUSTSTORE_PASSWORD|g" $SNIPPETS_SOURCE/truststore.xml > $SNIPPETS_TARGET_OVERRIDES/truststore.xml
- else
+ elif [ ! -z $SEC_TLS_TRUSTDEFAULTCERTS ]; then
cp $SNIPPETS_SOURCE/trustDefault.xml $SNIPPETS_TARGET_OVERRIDES/trustDefault.xml
fi
}
diff --git a/websphere-liberty_20.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/trustDefault.xml b/websphere-liberty_20.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/trustDefault.xml
index f49104f..396987f 100644
--- a/websphere-liberty_20.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/trustDefault.xml
+++ b/websphere-liberty_20.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/trustDefault.xml
@@ -1,4 +1,4 @@
<server description="Default Server">
<ssl id="defaultSSLConfig" trustDefaultCerts="${SEC_TLS_TRUSTDEFAULTCERTS}"/>
- <variable name="SEC_TLS_TRUSTDEFAULTCERTS" defaultValue="false"/>
+ <variable name="SEC_TLS_TRUSTDEFAULTCERTS" defaultValue="true"/>
</server>
diff --git a/websphere-liberty_20.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/truststore.xml b/websphere-liberty_20.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/truststore.xml
index 980e8ea..3a32393 100644
--- a/websphere-liberty_20.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/truststore.xml
+++ b/websphere-liberty_20.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/truststore.xml
@@ -1,5 +1,5 @@
<server description="Default Server">
<ssl id="defaultSSLConfig" keyStoreRef="defaultKeyStore" trustStoreRef="defaultTrustStore" trustDefaultCerts="${SEC_TLS_TRUSTDEFAULTCERTS}"/>
<keyStore id="defaultTrustStore" location="${server.output.dir}/resources/security/trust.p12" type="PKCS12" password="PWD_TRUST" />
- <variable name="SEC_TLS_TRUSTDEFAULTCERTS" defaultValue="false"/>
+ <variable name="SEC_TLS_TRUSTDEFAULTCERTS" defaultValue="true"/>
</server>
diff --git a/websphere-liberty_20.0.0.3-kernel-java8-ibmjava/helpers/runtime/docker-server.sh b/websphere-liberty_20.0.0.3-kernel-java8-ibmjava/helpers/runtime/docker-server.sh
index e6fa5ea..935dcc2 100755
--- a/websphere-liberty_20.0.0.3-kernel-java8-ibmjava/helpers/runtime/docker-server.sh
+++ b/websphere-liberty_20.0.0.3-kernel-java8-ibmjava/helpers/runtime/docker-server.sh
@@ -56,7 +56,7 @@ function importKeyCert() {
fi
if [ -e $TRUSTSTORE_FILE ]; then
sed "s|PWD_TRUST|$TRUSTSTORE_PASSWORD|g" $SNIPPETS_SOURCE/truststore.xml > $SNIPPETS_TARGET_OVERRIDES/truststore.xml
- else
+ elif [ ! -z $SEC_TLS_TRUSTDEFAULTCERTS ]; then
cp $SNIPPETS_SOURCE/trustDefault.xml $SNIPPETS_TARGET_OVERRIDES/trustDefault.xml
fi
}
diff --git a/websphere-liberty_20.0.0.4-kernel-java8-ibmjava/helpers/build/configuration_snippets/trustDefault.xml b/websphere-liberty_20.0.0.4-kernel-java8-ibmjava/helpers/build/configuration_snippets/trustDefault.xml
index f49104f..396987f 100644
--- a/websphere-liberty_20.0.0.4-kernel-java8-ibmjava/helpers/build/configuration_snippets/trustDefault.xml
+++ b/websphere-liberty_20.0.0.4-kernel-java8-ibmjava/helpers/build/configuration_snippets/trustDefault.xml
@@ -1,4 +1,4 @@
<server description="Default Server">
<ssl id="defaultSSLConfig" trustDefaultCerts="${SEC_TLS_TRUSTDEFAULTCERTS}"/>
- <variable name="SEC_TLS_TRUSTDEFAULTCERTS" defaultValue="false"/>
+ <variable name="SEC_TLS_TRUSTDEFAULTCERTS" defaultValue="true"/>
</server>
diff --git a/websphere-liberty_20.0.0.4-kernel-java8-ibmjava/helpers/build/configuration_snippets/truststore.xml b/websphere-liberty_20.0.0.4-kernel-java8-ibmjava/helpers/build/configuration_snippets/truststore.xml
index 980e8ea..3a32393 100644
--- a/websphere-liberty_20.0.0.4-kernel-java8-ibmjava/helpers/build/configuration_snippets/truststore.xml
+++ b/websphere-liberty_20.0.0.4-kernel-java8-ibmjava/helpers/build/configuration_snippets/truststore.xml
@@ -1,5 +1,5 @@
<server description="Default Server">
<ssl id="defaultSSLConfig" keyStoreRef="defaultKeyStore" trustStoreRef="defaultTrustStore" trustDefaultCerts="${SEC_TLS_TRUSTDEFAULTCERTS}"/>
<keyStore id="defaultTrustStore" location="${server.output.dir}/resources/security/trust.p12" type="PKCS12" password="PWD_TRUST" />
- <variable name="SEC_TLS_TRUSTDEFAULTCERTS" defaultValue="false"/>
+ <variable name="SEC_TLS_TRUSTDEFAULTCERTS" defaultValue="true"/>
</server>
diff --git a/websphere-liberty_20.0.0.4-kernel-java8-ibmjava/helpers/runtime/docker-server.sh b/websphere-liberty_20.0.0.4-kernel-java8-ibmjava/helpers/runtime/docker-server.sh
index e6fa5ea..935dcc2 100755
--- a/websphere-liberty_20.0.0.4-kernel-java8-ibmjava/helpers/runtime/docker-server.sh
+++ b/websphere-liberty_20.0.0.4-kernel-java8-ibmjava/helpers/runtime/docker-server.sh
@@ -56,7 +56,7 @@ function importKeyCert() {
fi
if [ -e $TRUSTSTORE_FILE ]; then
sed "s|PWD_TRUST|$TRUSTSTORE_PASSWORD|g" $SNIPPETS_SOURCE/truststore.xml > $SNIPPETS_TARGET_OVERRIDES/truststore.xml
- else
+ elif [ ! -z $SEC_TLS_TRUSTDEFAULTCERTS ]; then
cp $SNIPPETS_SOURCE/trustDefault.xml $SNIPPETS_TARGET_OVERRIDES/trustDefault.xml
fi
}
diff --git a/websphere-liberty_20.0.0.4-full-java8-ibmjava/Dockerfile.ubuntu.ibmjava8 b/websphere-liberty_20.0.0.5-full-java8-ibmjava/Dockerfile.ubuntu.ibmjava8
similarity index 100%
copy from websphere-liberty_20.0.0.4-full-java8-ibmjava/Dockerfile.ubuntu.ibmjava8
copy to websphere-liberty_20.0.0.5-full-java8-ibmjava/Dockerfile.ubuntu.ibmjava8
diff --git a/websphere-liberty_19.0.0.12-full-java8-ibmjava/server.xml b/websphere-liberty_20.0.0.5-full-java8-ibmjava/server.xml
similarity index 100%
copy from websphere-liberty_19.0.0.12-full-java8-ibmjava/server.xml
copy to websphere-liberty_20.0.0.5-full-java8-ibmjava/server.xml
diff --git a/websphere-liberty_20.0.0.3-kernel-java8-ibmjava/Dockerfile.ubuntu.ibmjava8 b/websphere-liberty_20.0.0.5-kernel-java8-ibmjava/Dockerfile.ubuntu.ibmjava8
similarity index 95%
copy from websphere-liberty_20.0.0.3-kernel-java8-ibmjava/Dockerfile.ubuntu.ibmjava8
copy to websphere-liberty_20.0.0.5-kernel-java8-ibmjava/Dockerfile.ubuntu.ibmjava8
index e751114..77cb488 100644
--- a/websphere-liberty_20.0.0.3-kernel-java8-ibmjava/Dockerfile.ubuntu.ibmjava8
+++ b/websphere-liberty_20.0.0.5-kernel-java8-ibmjava/Dockerfile.ubuntu.ibmjava8
@@ -21,13 +21,13 @@ LABEL org.opencontainers.image.authors="Arthur De Magalhaes, Chris Potter" \
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="20.0.0.3" \
- org.opencontainers.image.revision="cl200320200305-1433" \
+ org.opencontainers.image.version="20.0.0.5" \
+ org.opencontainers.image.revision="cl200520200429-1655" \
org.opencontainers.image.description="This image contains the WebSphere Liberty runtime with IBM's Java and Ubuntu as the base OS. For more information on this image please see https://github.com/WASdev/ci.docker#building-an-application-image" \
org.opencontainers.image.title="IBM WebSphere Liberty"
# Install WebSphere Liberty
-ENV LIBERTY_VERSION 20.0.0_03
+ENV LIBERTY_VERSION 20.0.0_05
ARG LIBERTY_URL
ARG DOWNLOAD_OPTIONS=""
@@ -52,8 +52,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"="20.0.0.3" \
- "BuildLabel"="cl200320200305-1433"
+ "ProductVersion"="20.0.0.5" \
+ "BuildLabel"="cl200520200429-1655"
# Set Path Shortcuts
ENV LOG_DIR=/logs \
diff --git a/open-liberty_19.0.0.12-kernel-java8-openj9/fixes/.gitkeep b/websphere-liberty_20.0.0.5-kernel-java8-ibmjava/fixes/.gitkeep
similarity index 100%
copy from open-liberty_19.0.0.12-kernel-java8-openj9/fixes/.gitkeep
copy to websphere-liberty_20.0.0.5-kernel-java8-ibmjava/fixes/.gitkeep
diff --git a/open-liberty_19.0.0.12-kernel-java8-openj9/helpers/build/configuration_snippets/hazelcast-client.xml b/websphere-liberty_20.0.0.5-kernel-java8-ibmjava/helpers/build/configuration_snippets/hazelcast-client.xml
similarity index 100%
copy from open-liberty_19.0.0.12-kernel-java8-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
copy to websphere-liberty_20.0.0.5-kernel-java8-ibmjava/helpers/build/configuration_snippets/hazelcast-client.xml
diff --git a/open-liberty_19.0.0.12-kernel-java8-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml b/websphere-liberty_20.0.0.5-kernel-java8-ibmjava/helpers/build/configuration_snippets/hazelcast-embedded.xml
similarity index 100%
copy from open-liberty_19.0.0.12-kernel-java8-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
copy to websphere-liberty_20.0.0.5-kernel-java8-ibmjava/helpers/build/configuration_snippets/hazelcast-embedded.xml
diff --git a/open-liberty_19.0.0.12-kernel-java8-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml b/websphere-liberty_20.0.0.5-kernel-java8-ibmjava/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
similarity index 100%
copy from open-liberty_19.0.0.12-kernel-java8-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
copy to websphere-liberty_20.0.0.5-kernel-java8-ibmjava/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
diff --git a/open-liberty_19.0.0.12-kernel-java8-openj9/helpers/build/configuration_snippets/http-endpoint.xml b/websphere-liberty_20.0.0.5-kernel-java8-ibmjava/helpers/build/configuration_snippets/http-endpoint.xml
similarity index 100%
copy from open-liberty_19.0.0.12-kernel-java8-openj9/helpers/build/configuration_snippets/http-endpoint.xml
copy to websphere-liberty_20.0.0.5-kernel-java8-ibmjava/helpers/build/configuration_snippets/http-endpoint.xml
diff --git a/open-liberty_19.0.0.12-kernel-java8-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml b/websphere-liberty_20.0.0.5-kernel-java8-ibmjava/helpers/build/configuration_snippets/http-ssl-endpoint.xml
similarity index 100%
copy from open-liberty_19.0.0.12-kernel-java8-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml
copy to websphere-liberty_20.0.0.5-kernel-java8-ibmjava/helpers/build/configuration_snippets/http-ssl-endpoint.xml
diff --git a/open-liberty_19.0.0.12-kernel-java8-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml b/websphere-liberty_20.0.0.5-kernel-java8-ibmjava/helpers/build/configuration_snippets/iiop-endpoint.xml
similarity index 100%
copy from open-liberty_19.0.0.12-kernel-java8-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml
copy to websphere-liberty_20.0.0.5-kernel-java8-ibmjava/helpers/build/configuration_snippets/iiop-endpoint.xml
diff --git a/open-liberty_19.0.0.12-kernel-java8-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml b/websphere-liberty_20.0.0.5-kernel-java8-ibmjava/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
similarity index 100%
copy from open-liberty_19.0.0.12-kernel-java8-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
copy to websphere-liberty_20.0.0.5-kernel-java8-ibmjava/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
diff --git a/open-liberty_19.0.0.12-kernel-java8-openj9/helpers/build/configuration_snippets/jms-endpoint.xml b/websphere-liberty_20.0.0.5-kernel-java8-ibmjava/helpers/build/configuration_snippets/jms-endpoint.xml
similarity index 100%
copy from open-liberty_19.0.0.12-kernel-java8-openj9/helpers/build/configuration_snippets/jms-endpoint.xml
copy to websphere-liberty_20.0.0.5-kernel-java8-ibmjava/helpers/build/configuration_snippets/jms-endpoint.xml
diff --git a/open-liberty_19.0.0.12-kernel-java8-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml b/websphere-liberty_20.0.0.5-kernel-java8-ibmjava/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
similarity index 100%
copy from open-liberty_19.0.0.12-kernel-java8-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
copy to websphere-liberty_20.0.0.5-kernel-java8-ibmjava/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
diff --git a/open-liberty_19.0.0.12-kernel-java8-openj9/helpers/build/configuration_snippets/keystore.xml b/websphere-liberty_20.0.0.5-kernel-java8-ibmjava/helpers/build/configuration_snippets/keystore.xml
similarity index 100%
copy from open-liberty_19.0.0.12-kernel-java8-openj9/helpers/build/configuration_snippets/keystore.xml
copy to websphere-liberty_20.0.0.5-kernel-java8-ibmjava/helpers/build/configuration_snippets/keystore.xml
diff --git a/open-liberty_19.0.0.12-kernel-java8-openj9/helpers/build/configuration_snippets/mp-health-check.xml b/websphere-liberty_20.0.0.5-kernel-java8-ibmjava/helpers/build/configuration_snippets/mp-health-check.xml
similarity index 100%
copy from open-liberty_19.0.0.12-kernel-java8-openj9/helpers/build/configuration_snippets/mp-health-check.xml
copy to websphere-liberty_20.0.0.5-kernel-java8-ibmjava/helpers/build/configuration_snippets/mp-health-check.xml
diff --git a/open-liberty_19.0.0.12-kernel-java8-openj9/helpers/build/configuration_snippets/mp-monitoring.xml b/websphere-liberty_20.0.0.5-kernel-java8-ibmjava/helpers/build/configuration_snippets/mp-monitoring.xml
similarity index 100%
copy from open-liberty_19.0.0.12-kernel-java8-openj9/helpers/build/configuration_snippets/mp-monitoring.xml
copy to websphere-liberty_20.0.0.5-kernel-java8-ibmjava/helpers/build/configuration_snippets/mp-monitoring.xml
diff --git a/websphere-liberty_19.0.0.12-kernel-java8-ibmjava/helpers/build/configuration_snippets/oidc-config.xml b/websphere-liberty_20.0.0.5-kernel-java8-ibmjava/helpers/build/configuration_snippets/oidc-config.xml
similarity index 100%
copy from websphere-liberty_19.0.0.12-kernel-java8-ibmjava/helpers/build/configuration_snippets/oidc-config.xml
copy to websphere-liberty_20.0.0.5-kernel-java8-ibmjava/helpers/build/configuration_snippets/oidc-config.xml
diff --git a/websphere-liberty_19.0.0.12-kernel-java8-ibmjava/helpers/build/configuration_snippets/oidc.xml b/websphere-liberty_20.0.0.5-kernel-java8-ibmjava/helpers/build/configuration_snippets/oidc.xml
similarity index 100%
copy from websphere-liberty_19.0.0.12-kernel-java8-ibmjava/helpers/build/configuration_snippets/oidc.xml
copy to websphere-liberty_20.0.0.5-kernel-java8-ibmjava/helpers/build/configuration_snippets/oidc.xml
diff --git a/open-liberty_19.0.0.12-kernel-java8-openj9/helpers/build/configuration_snippets/tls.xml b/websphere-liberty_20.0.0.5-kernel-java8-ibmjava/helpers/build/configuration_snippets/tls.xml
similarity index 100%
copy from open-liberty_19.0.0.12-kernel-java8-openj9/helpers/build/configuration_snippets/tls.xml
copy to websphere-liberty_20.0.0.5-kernel-java8-ibmjava/helpers/build/configuration_snippets/tls.xml
diff --git a/websphere-liberty_20.0.0.4-kernel-java8-ibmjava/helpers/build/configuration_snippets/trustDefault.xml b/websphere-liberty_20.0.0.5-kernel-java8-ibmjava/helpers/build/configuration_snippets/trustDefault.xml
similarity index 65%
copy from websphere-liberty_20.0.0.4-kernel-java8-ibmjava/helpers/build/configuration_snippets/trustDefault.xml
copy to websphere-liberty_20.0.0.5-kernel-java8-ibmjava/helpers/build/configuration_snippets/trustDefault.xml
index f49104f..396987f 100644
--- a/websphere-liberty_20.0.0.4-kernel-java8-ibmjava/helpers/build/configuration_snippets/trustDefault.xml
+++ b/websphere-liberty_20.0.0.5-kernel-java8-ibmjava/helpers/build/configuration_snippets/trustDefault.xml
@@ -1,4 +1,4 @@
<server description="Default Server">
<ssl id="defaultSSLConfig" trustDefaultCerts="${SEC_TLS_TRUSTDEFAULTCERTS}"/>
- <variable name="SEC_TLS_TRUSTDEFAULTCERTS" defaultValue="false"/>
+ <variable name="SEC_TLS_TRUSTDEFAULTCERTS" defaultValue="true"/>
</server>
diff --git a/websphere-liberty_20.0.0.4-kernel-java8-ibmjava/helpers/build/configuration_snippets/truststore.xml b/websphere-liberty_20.0.0.5-kernel-java8-ibmjava/helpers/build/configuration_snippets/truststore.xml
similarity index 82%
copy from websphere-liberty_20.0.0.4-kernel-java8-ibmjava/helpers/build/configuration_snippets/truststore.xml
copy to websphere-liberty_20.0.0.5-kernel-java8-ibmjava/helpers/build/configuration_snippets/truststore.xml
index 980e8ea..3a32393 100644
--- a/websphere-liberty_20.0.0.4-kernel-java8-ibmjava/helpers/build/configuration_snippets/truststore.xml
+++ b/websphere-liberty_20.0.0.5-kernel-java8-ibmjava/helpers/build/configuration_snippets/truststore.xml
@@ -1,5 +1,5 @@
<server description="Default Server">
<ssl id="defaultSSLConfig" keyStoreRef="defaultKeyStore" trustStoreRef="defaultTrustStore" trustDefaultCerts="${SEC_TLS_TRUSTDEFAULTCERTS}"/>
<keyStore id="defaultTrustStore" location="${server.output.dir}/resources/security/trust.p12" type="PKCS12" password="PWD_TRUST" />
- <variable name="SEC_TLS_TRUSTDEFAULTCERTS" defaultValue="false"/>
+ <variable name="SEC_TLS_TRUSTDEFAULTCERTS" defaultValue="true"/>
</server>
diff --git a/websphere-liberty_20.0.0.3-kernel-java8-ibmjava/helpers/build/configure.sh b/websphere-liberty_20.0.0.5-kernel-java8-ibmjava/helpers/build/configure.sh
similarity index 100%
copy from websphere-liberty_20.0.0.3-kernel-java8-ibmjava/helpers/build/configure.sh
copy to websphere-liberty_20.0.0.5-kernel-java8-ibmjava/helpers/build/configure.sh
diff --git a/websphere-liberty_20.0.0.3-kernel-java8-ibmjava/helpers/build/populate_scc.sh b/websphere-liberty_20.0.0.5-kernel-java8-ibmjava/helpers/build/populate_scc.sh
similarity index 100%
copy from websphere-liberty_20.0.0.3-kernel-java8-ibmjava/helpers/build/populate_scc.sh
copy to websphere-liberty_20.0.0.5-kernel-java8-ibmjava/helpers/build/populate_scc.sh
diff --git a/websphere-liberty_20.0.0.4-kernel-java8-ibmjava/helpers/runtime/docker-server.sh b/websphere-liberty_20.0.0.5-kernel-java8-ibmjava/helpers/runtime/docker-server.sh
similarity index 98%
copy from websphere-liberty_20.0.0.4-kernel-java8-ibmjava/helpers/runtime/docker-server.sh
copy to websphere-liberty_20.0.0.5-kernel-java8-ibmjava/helpers/runtime/docker-server.sh
index e6fa5ea..87c77cd 100755
--- a/websphere-liberty_20.0.0.4-kernel-java8-ibmjava/helpers/runtime/docker-server.sh
+++ b/websphere-liberty_20.0.0.5-kernel-java8-ibmjava/helpers/runtime/docker-server.sh
@@ -56,7 +56,7 @@ function importKeyCert() {
fi
if [ -e $TRUSTSTORE_FILE ]; then
sed "s|PWD_TRUST|$TRUSTSTORE_PASSWORD|g" $SNIPPETS_SOURCE/truststore.xml > $SNIPPETS_TARGET_OVERRIDES/truststore.xml
- else
+ elif [ ! -z $SEC_TLS_TRUSTDEFAULTCERTS ]; then
cp $SNIPPETS_SOURCE/trustDefault.xml $SNIPPETS_TARGET_OVERRIDES/trustDefault.xml
fi
}
diff --git a/websphere-liberty_20.0.0.4-kernel-java8-ibmjava/licenses/en.html b/websphere-liberty_20.0.0.5-kernel-java8-ibmjava/licenses/en.html
similarity index 97%
copy from websphere-liberty_20.0.0.4-kernel-java8-ibmjava/licenses/en.html
copy to websphere-liberty_20.0.0.5-kernel-java8-ibmjava/licenses/en.html
index d49ef88..31994f1 100644
--- a/websphere-liberty_20.0.0.4-kernel-java8-ibmjava/licenses/en.html
+++ b/websphere-liberty_20.0.0.5-kernel-java8-ibmjava/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 20.0.0.4
+IBM WebSphere Application Server Liberty 20.0.0.5
(Component)<br>
<br>
The following standard terms apply to Licensee's use of the
@@ -165,9 +165,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-BN7HYM<br>
-D/N: L-CTUR-BN7HYM<br>
-P/N: L-CTUR-BN7HYM<br>
+L/N: L-CTUR-BNGKSP<br>
+D/N: L-CTUR-BNGKSP<br>
+P/N: L-CTUR-BNGKSP<br>
<br>
<br>
International License Agreement for Non-Warranted Programs<br>
diff --git a/websphere-liberty_20.0.0.4-kernel-java8-ibmjava/licenses/non_ibm_license.html b/websphere-liberty_20.0.0.5-kernel-java8-ibmjava/licenses/non_ibm_license.html
similarity index 95%
copy from websphere-liberty_20.0.0.4-kernel-java8-ibmjava/licenses/non_ibm_license.html
copy to websphere-liberty_20.0.0.5-kernel-java8-ibmjava/licenses/non_ibm_license.html
index 81829c5..d39c1e5 100644
--- a/websphere-liberty_20.0.0.4-kernel-java8-ibmjava/licenses/non_ibm_license.html
+++ b/websphere-liberty_20.0.0.5-kernel-java8-ibmjava/licenses/non_ibm_license.html
@@ -6,7 +6,7 @@
<BODY>
TERMS AND CONDITIONS FOR SEPARATELY LICENSED CODE<br>
<br>
-IBM WebSphere Application Server Liberty 20.0.0.4<br>
+IBM WebSphere Application Server Liberty 20.0.0.5<br>
<br>
The IBM license agreement and any applicable information on
the web<br>
@@ -52,7 +52,7 @@ Ubuntu 18.04<br>
RedHat UBI 7.6<br>
<br>
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++<br>
-IBM WEBSPHERE APPLICATION SERVER LIBERTY 20.0.0.4<br>
+IBM WEBSPHERE APPLICATION SERVER LIBERTY 20.0.0.5<br>
NOTICES AND INFORMATION FOR EXCLUDED COMPONENTS<br>
<br>
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++<br>
@@ -242,8 +242,8 @@ END OF NOTICE FILE<br>
<br>
<br>
<br>
-L/N: L-CTUR-BN7HYM<br>
-D/N: L-CTUR-BN7HYM<br>
-P/N: L-CTUR-BN7HYM<br>
+L/N: L-CTUR-BNGKSP<br>
+D/N: L-CTUR-BNGKSP<br>
+P/N: L-CTUR-BNGKSP<br>
</BODY>
</HTML>
\ No newline at end of file
diff --git a/websphere-liberty_20.0.0.4-kernel-java8-ibmjava/licenses/notices.html b/websphere-liberty_20.0.0.5-kernel-java8-ibmjava/licenses/notices.html
similarity index 97%
copy from websphere-liberty_20.0.0.4-kernel-java8-ibmjava/licenses/notices.html
copy to websphere-liberty_20.0.0.5-kernel-java8-ibmjava/licenses/notices.html
index cd8de8a..a906e52 100644
--- a/websphere-liberty_20.0.0.4-kernel-java8-ibmjava/licenses/notices.html
+++ b/websphere-liberty_20.0.0.5-kernel-java8-ibmjava/licenses/notices.html
@@ -6,7 +6,7 @@
<BODY>
NOTICES AND INFORMATION<br>
<br>
-IBM WebSphere Application Server Liberty 20.0.0.4<br>
+IBM WebSphere Application Server Liberty 20.0.0.5<br>
<br>
The IBM license agreement and any applicable information on
the web<br>
@@ -49,10 +49,8 @@ limitation URLs or references to any third party websites.<br>
<br>
ï»
¿++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++<br>
-IBM WEBSPHERE APPLICATION SERVER LIBERTY 20.0.0.4 NOTICES
+IBM WEBSPHERE APPLICATION SERVER LIBERTY 20.0.0.5 NOTICES
AND INFORMATION <br>
-<br>
-<br>
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++<br>
<br>
TABLE OF CONTENTS<br>
@@ -1285,7 +1283,8 @@ medikoo.com)<br>
ES6-WEAK-MAP (Copyright (c) 2013-2018 Mariusz Nowak
@medikoo medikoo.com)<br>
FS.REALPATH (Copyright (c) Isaac Z. Schlueter and
-Contributors Copyright GET-CALLER-FILE (Copyright 2018 Stefan Penner) <br>
+Contributors Copyright<br>
+GET-CALLER-FILE (Copyright 2018 Stefan Penner) <br>
GLOB(Copyright (c) Isaac Z. Schlueter and Contributors) <br>
GLOB-PARENT (Copyright (c) 2015 Elan Shanker)<br>
GRACEFUL-FS (Copyright (c) Isaac Z. Schlueter Ben Noordhuis
@@ -2679,7 +2678,7 @@ LODASH.KEYS(Copyright 2012-2015 The Dojo Foundation <http:
//dojofoundation.org/>)<br>
TOIDENTIFIER (Copyright (c) 2016 Douglas Christopher
Wilson<doug@somethingdoug.com>)<br>
-GET-STDIN (� [SindreSorhus](http://sindresorhus.com))<br>
+GET-STDIN (C [SindreSorhus](http://sindresorhus.com))<br>
MDURL (Copyright (c) 2015 Vitaly Puzrin Alex Kocharin.
Copyright Joyent Inc. and other Node contributors. All rights
reserved.)<br>
@@ -2691,7 +2690,7 @@ SUPPORTS-COLOR (Copyright (c)Sindre Sorhus
<sindresorhus@gmail.com> (sindresorhus.com))<br>
MEDIA-TYPER(Copyright (c) 2014 Douglas Christopher Wilson)<br>
RESOLVE-URL (Copyright(c) 2013 Simon Lydell)<br>
-IS-PATH-CWD (� [Sindre Sorhus](http://sindresorhus.com))<br>
+IS-PATH-CWD (C [Sindre Sorhus](http://sindresorhus.com))<br>
DEBUG.JS (Copyright (c) 2010-2011 Marcus Westin)<br>
JQUERY UI CSS FRAMEWORK [jQuery BBQ] (Copyright (c)
2009AUTHORS.txt (http://jqueryui.com/about))<br>
@@ -3295,7 +3294,6 @@ END OF IBM WEBSPHERE APPLICATION SERVER LIBERTY NOTICES AND
INFORMATION<br>
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++<br>
<br>
-<br>
END OF NOTICE FILE<br>
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++<br>
<br>
@@ -3304,8 +3302,8 @@ END OF NOTICE FILE<br>
<br>
<br>
<br>
-L/N: L-CTUR-BN7HYM<br>
-D/N: L-CTUR-BN7HYM<br>
-P/N: L-CTUR-BN7HYM<br>
+L/N: L-CTUR-BNGKSP<br>
+D/N: L-CTUR-BNGKSP<br>
+P/N: L-CTUR-BNGKSP<br>
</BODY>
</HTML>
\ No newline at end of file
diff --git a/websphere-liberty_beta/Dockerfile b/websphere-liberty_beta/Dockerfile
index e46b0a3..00c6171 100644
--- a/websphere-liberty_beta/Dockerfile
+++ b/websphere-liberty_beta/Dockerfile
@@ -18,8 +18,8 @@ LABEL org.opencontainers.image.authors="Arthur De Magalhaes, Chris Potter" \
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="2020.4.0.0" \
- org.opencontainers.image.revision="cl200420200401-1714"
+ org.opencontainers.image.version="2020.5.0.0" \
+ org.opencontainers.image.revision="cl200520200429-1655"
RUN apt-get update \
&& apt-get install -y --no-install-recommends unzip \
@@ -27,7 +27,7 @@ RUN apt-get update \
&& useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default
# Install WebSphere Liberty
-ENV LIBERTY_VERSION 2020.4.0_0
+ENV LIBERTY_VERSION 2020.5.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_kernel/Dockerfile.ubuntu.ibmjava8 b/websphere-liberty_kernel/Dockerfile.ubuntu.ibmjava8
index aa7273d..77cb488 100644
--- a/websphere-liberty_kernel/Dockerfile.ubuntu.ibmjava8
+++ b/websphere-liberty_kernel/Dockerfile.ubuntu.ibmjava8
@@ -21,13 +21,13 @@ LABEL org.opencontainers.image.authors="Arthur De Magalhaes, Chris Potter" \
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="20.0.0.4" \
- org.opencontainers.image.revision="cl200420200401-1714" \
+ org.opencontainers.image.version="20.0.0.5" \
+ org.opencontainers.image.revision="cl200520200429-1655" \
org.opencontainers.image.description="This image contains the WebSphere Liberty runtime with IBM's Java and Ubuntu as the base OS. For more information on this image please see https://github.com/WASdev/ci.docker#building-an-application-image" \
org.opencontainers.image.title="IBM WebSphere Liberty"
# Install WebSphere Liberty
-ENV LIBERTY_VERSION 20.0.0_04
+ENV LIBERTY_VERSION 20.0.0_05
ARG LIBERTY_URL
ARG DOWNLOAD_OPTIONS=""
@@ -52,8 +52,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"="20.0.0.4" \
- "BuildLabel"="cl200420200401-1714"
+ "ProductVersion"="20.0.0.5" \
+ "BuildLabel"="cl200520200429-1655"
# Set Path Shortcuts
ENV LOG_DIR=/logs \
diff --git a/websphere-liberty_kernel/helpers/build/configuration_snippets/trustDefault.xml b/websphere-liberty_kernel/helpers/build/configuration_snippets/trustDefault.xml
index f49104f..396987f 100644
--- a/websphere-liberty_kernel/helpers/build/configuration_snippets/trustDefault.xml
+++ b/websphere-liberty_kernel/helpers/build/configuration_snippets/trustDefault.xml
@@ -1,4 +1,4 @@
<server description="Default Server">
<ssl id="defaultSSLConfig" trustDefaultCerts="${SEC_TLS_TRUSTDEFAULTCERTS}"/>
- <variable name="SEC_TLS_TRUSTDEFAULTCERTS" defaultValue="false"/>
+ <variable name="SEC_TLS_TRUSTDEFAULTCERTS" defaultValue="true"/>
</server>
diff --git a/websphere-liberty_kernel/helpers/build/configuration_snippets/truststore.xml b/websphere-liberty_kernel/helpers/build/configuration_snippets/truststore.xml
index 980e8ea..3a32393 100644
--- a/websphere-liberty_kernel/helpers/build/configuration_snippets/truststore.xml
+++ b/websphere-liberty_kernel/helpers/build/configuration_snippets/truststore.xml
@@ -1,5 +1,5 @@
<server description="Default Server">
<ssl id="defaultSSLConfig" keyStoreRef="defaultKeyStore" trustStoreRef="defaultTrustStore" trustDefaultCerts="${SEC_TLS_TRUSTDEFAULTCERTS}"/>
<keyStore id="defaultTrustStore" location="${server.output.dir}/resources/security/trust.p12" type="PKCS12" password="PWD_TRUST" />
- <variable name="SEC_TLS_TRUSTDEFAULTCERTS" defaultValue="false"/>
+ <variable name="SEC_TLS_TRUSTDEFAULTCERTS" defaultValue="true"/>
</server>
diff --git a/websphere-liberty_kernel/helpers/runtime/docker-server.sh b/websphere-liberty_kernel/helpers/runtime/docker-server.sh
index e6fa5ea..87c77cd 100755
--- a/websphere-liberty_kernel/helpers/runtime/docker-server.sh
+++ b/websphere-liberty_kernel/helpers/runtime/docker-server.sh
@@ -56,7 +56,7 @@ function importKeyCert() {
fi
if [ -e $TRUSTSTORE_FILE ]; then
sed "s|PWD_TRUST|$TRUSTSTORE_PASSWORD|g" $SNIPPETS_SOURCE/truststore.xml > $SNIPPETS_TARGET_OVERRIDES/truststore.xml
- else
+ elif [ ! -z $SEC_TLS_TRUSTDEFAULTCERTS ]; then
cp $SNIPPETS_SOURCE/trustDefault.xml $SNIPPETS_TARGET_OVERRIDES/trustDefault.xml
fi
}
diff --git a/websphere-liberty_kernel/licenses/en.html b/websphere-liberty_kernel/licenses/en.html
index d49ef88..31994f1 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 20.0.0.4
+IBM WebSphere Application Server Liberty 20.0.0.5
(Component)<br>
<br>
The following standard terms apply to Licensee's use of the
@@ -165,9 +165,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-BN7HYM<br>
-D/N: L-CTUR-BN7HYM<br>
-P/N: L-CTUR-BN7HYM<br>
+L/N: L-CTUR-BNGKSP<br>
+D/N: L-CTUR-BNGKSP<br>
+P/N: L-CTUR-BNGKSP<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 81829c5..d39c1e5 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 20.0.0.4<br>
+IBM WebSphere Application Server Liberty 20.0.0.5<br>
<br>
The IBM license agreement and any applicable information on
the web<br>
@@ -52,7 +52,7 @@ Ubuntu 18.04<br>
RedHat UBI 7.6<br>
<br>
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++<br>
-IBM WEBSPHERE APPLICATION SERVER LIBERTY 20.0.0.4<br>
+IBM WEBSPHERE APPLICATION SERVER LIBERTY 20.0.0.5<br>
NOTICES AND INFORMATION FOR EXCLUDED COMPONENTS<br>
<br>
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++<br>
@@ -242,8 +242,8 @@ END OF NOTICE FILE<br>
<br>
<br>
<br>
-L/N: L-CTUR-BN7HYM<br>
-D/N: L-CTUR-BN7HYM<br>
-P/N: L-CTUR-BN7HYM<br>
+L/N: L-CTUR-BNGKSP<br>
+D/N: L-CTUR-BNGKSP<br>
+P/N: L-CTUR-BNGKSP<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 cd8de8a..a906e52 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 20.0.0.4<br>
+IBM WebSphere Application Server Liberty 20.0.0.5<br>
<br>
The IBM license agreement and any applicable information on
the web<br>
@@ -49,10 +49,8 @@ limitation URLs or references to any third party websites.<br>
<br>
ï»
¿++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++<br>
-IBM WEBSPHERE APPLICATION SERVER LIBERTY 20.0.0.4 NOTICES
+IBM WEBSPHERE APPLICATION SERVER LIBERTY 20.0.0.5 NOTICES
AND INFORMATION <br>
-<br>
-<br>
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++<br>
<br>
TABLE OF CONTENTS<br>
@@ -1285,7 +1283,8 @@ medikoo.com)<br>
ES6-WEAK-MAP (Copyright (c) 2013-2018 Mariusz Nowak
@medikoo medikoo.com)<br>
FS.REALPATH (Copyright (c) Isaac Z. Schlueter and
-Contributors Copyright GET-CALLER-FILE (Copyright 2018 Stefan Penner) <br>
+Contributors Copyright<br>
+GET-CALLER-FILE (Copyright 2018 Stefan Penner) <br>
GLOB(Copyright (c) Isaac Z. Schlueter and Contributors) <br>
GLOB-PARENT (Copyright (c) 2015 Elan Shanker)<br>
GRACEFUL-FS (Copyright (c) Isaac Z. Schlueter Ben Noordhuis
@@ -2679,7 +2678,7 @@ LODASH.KEYS(Copyright 2012-2015 The Dojo Foundation <http:
//dojofoundation.org/>)<br>
TOIDENTIFIER (Copyright (c) 2016 Douglas Christopher
Wilson<doug@somethingdoug.com>)<br>
-GET-STDIN (� [SindreSorhus](http://sindresorhus.com))<br>
+GET-STDIN (C [SindreSorhus](http://sindresorhus.com))<br>
MDURL (Copyright (c) 2015 Vitaly Puzrin Alex Kocharin.
Copyright Joyent Inc. and other Node contributors. All rights
reserved.)<br>
@@ -2691,7 +2690,7 @@ SUPPORTS-COLOR (Copyright (c)Sindre Sorhus
<sindresorhus@gmail.com> (sindresorhus.com))<br>
MEDIA-TYPER(Copyright (c) 2014 Douglas Christopher Wilson)<br>
RESOLVE-URL (Copyright(c) 2013 Simon Lydell)<br>
-IS-PATH-CWD (� [Sindre Sorhus](http://sindresorhus.com))<br>
+IS-PATH-CWD (C [Sindre Sorhus](http://sindresorhus.com))<br>
DEBUG.JS (Copyright (c) 2010-2011 Marcus Westin)<br>
JQUERY UI CSS FRAMEWORK [jQuery BBQ] (Copyright (c)
2009AUTHORS.txt (http://jqueryui.com/about))<br>
@@ -3295,7 +3294,6 @@ END OF IBM WEBSPHERE APPLICATION SERVER LIBERTY NOTICES AND
INFORMATION<br>
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++<br>
<br>
-<br>
END OF NOTICE FILE<br>
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++<br>
<br>
@@ -3304,8 +3302,8 @@ END OF NOTICE FILE<br>
<br>
<br>
<br>
-L/N: L-CTUR-BN7HYM<br>
-D/N: L-CTUR-BN7HYM<br>
-P/N: L-CTUR-BN7HYM<br>
+L/N: L-CTUR-BNGKSP<br>
+D/N: L-CTUR-BNGKSP<br>
+P/N: L-CTUR-BNGKSP<br>
</BODY>
</HTML>
\ No newline at end of file |
|
@crpotter - this PR should remove the WebSphere Liberty updates, since they are done in a separate PR. |
|
It also looks like the commit for #7972 snuck into this one (which is fine if you want to go that route -- we've suggested previously sending one PR for both images since they're so similar and co-maintained, but it's up to you). 😄 |
|
Closing in favor of #7989 |
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.
Updates for the 20.0.0.5 release of open-liberty.