Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates for 20.0.0.7 release of websphere-liberty #8313

Merged

Conversation

crpotter
Copy link
Contributor

@crpotter crpotter commented Jul 6, 2020

Websphere-liberty updates for the release of 20.0.0.7.

@github-actions
Copy link

github-actions bot commented Jul 6, 2020

Diff for f2182ad:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index d837cf9..dabda65 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,7 +1,7 @@
 Maintainers: Chris Potter <crpotter@us.ibm.com> (@crpotter), Wendy Raschke <wraschke@us.ibm.com> (@wraschke), Arthur De Magalhaes <arthurdm@ca.ibm.com> (@arthurdm)
 Architectures: amd64, i386, ppc64le, s390x
 GitRepo: https://github.com/WASdev/ci.docker.git
-GitCommit: 7714723b4129c546a7d2f8931206b45b2e1e33d4
+GitCommit: e861161ba82416c5bfc719dd72f522593bdf43f1
 
 Tags: 20.0.0.3-kernel-java8-ibmjava
 Directory: ga/20.0.0.3/kernel
@@ -11,6 +11,10 @@ Tags: 20.0.0.6-kernel-java8-ibmjava
 Directory: ga/20.0.0.6/kernel
 File: Dockerfile.ubuntu.ibmjava8
 
+Tags: 20.0.0.7-kernel-java8-ibmjava
+Directory: ga/20.0.0.7/kernel
+File: Dockerfile.ubuntu.ibmjava8
+
 Tags: beta
 Directory: beta
 
@@ -26,6 +30,10 @@ Tags: 20.0.0.6-full-java8-ibmjava
 Directory: ga/20.0.0.6/full
 File: Dockerfile.ubuntu.ibmjava8
 
+Tags: 20.0.0.7-full-java8-ibmjava
+Directory: ga/20.0.0.7/full
+File: Dockerfile.ubuntu.ibmjava8
+
 Tags: full, latest
 Directory: ga/latest/full
 File: Dockerfile.ubuntu.ibmjava8
diff --git a/_bashbrew-list b/_bashbrew-list
index 98a889b..0189642 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -2,6 +2,8 @@ websphere-liberty:20.0.0.3-full-java8-ibmjava
 websphere-liberty:20.0.0.3-kernel-java8-ibmjava
 websphere-liberty:20.0.0.6-full-java8-ibmjava
 websphere-liberty:20.0.0.6-kernel-java8-ibmjava
+websphere-liberty:20.0.0.7-full-java8-ibmjava
+websphere-liberty:20.0.0.7-kernel-java8-ibmjava
 websphere-liberty:beta
 websphere-liberty:full
 websphere-liberty:kernel
diff --git a/websphere-liberty_20.0.0.6-full-java8-ibmjava/Dockerfile.ubuntu.ibmjava8 b/websphere-liberty_20.0.0.7-full-java8-ibmjava/Dockerfile.ubuntu.ibmjava8
similarity index 96%
copy from websphere-liberty_20.0.0.6-full-java8-ibmjava/Dockerfile.ubuntu.ibmjava8
copy to websphere-liberty_20.0.0.7-full-java8-ibmjava/Dockerfile.ubuntu.ibmjava8
index 75ea94d..8d2a2a5 100644
--- a/websphere-liberty_20.0.0.6-full-java8-ibmjava/Dockerfile.ubuntu.ibmjava8
+++ b/websphere-liberty_20.0.0.7-full-java8-ibmjava/Dockerfile.ubuntu.ibmjava8
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM websphere-liberty:20.0.0.6-kernel-java8-ibmjava
+FROM websphere-liberty:20.0.0.7-kernel-java8-ibmjava
 ARG VERBOSE=false
 ARG REPOSITORIES_PROPERTIES=""
 
diff --git a/websphere-liberty_20.0.0.3-full-java8-ibmjava/server.xml b/websphere-liberty_20.0.0.7-full-java8-ibmjava/server.xml
similarity index 100%
copy from websphere-liberty_20.0.0.3-full-java8-ibmjava/server.xml
copy to websphere-liberty_20.0.0.7-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.7-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.7-kernel-java8-ibmjava/Dockerfile.ubuntu.ibmjava8
index e751114..9260ccb 100644
--- a/websphere-liberty_20.0.0.3-kernel-java8-ibmjava/Dockerfile.ubuntu.ibmjava8
+++ b/websphere-liberty_20.0.0.7-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.7" \
+      org.opencontainers.image.revision="cl200720200625-0300" \
       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_07
 
 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.7" \
+      "BuildLabel"="cl200720200625-0300"
 
 # Set Path Shortcuts
 ENV LOG_DIR=/logs \
diff --git a/websphere-liberty_20.0.0.3-kernel-java8-ibmjava/fixes/.gitkeep b/websphere-liberty_20.0.0.7-kernel-java8-ibmjava/fixes/.gitkeep
similarity index 100%
copy from websphere-liberty_20.0.0.3-kernel-java8-ibmjava/fixes/.gitkeep
copy to websphere-liberty_20.0.0.7-kernel-java8-ibmjava/fixes/.gitkeep
diff --git a/websphere-liberty_20.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/hazelcast-client.xml b/websphere-liberty_20.0.0.7-kernel-java8-ibmjava/helpers/build/configuration_snippets/hazelcast-client.xml
similarity index 100%
copy from websphere-liberty_20.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/hazelcast-client.xml
copy to websphere-liberty_20.0.0.7-kernel-java8-ibmjava/helpers/build/configuration_snippets/hazelcast-client.xml
diff --git a/websphere-liberty_20.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/hazelcast-embedded.xml b/websphere-liberty_20.0.0.7-kernel-java8-ibmjava/helpers/build/configuration_snippets/hazelcast-embedded.xml
similarity index 100%
copy from websphere-liberty_20.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/hazelcast-embedded.xml
copy to websphere-liberty_20.0.0.7-kernel-java8-ibmjava/helpers/build/configuration_snippets/hazelcast-embedded.xml
diff --git a/websphere-liberty_20.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/hazelcast-sessioncache.xml b/websphere-liberty_20.0.0.7-kernel-java8-ibmjava/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
similarity index 100%
copy from websphere-liberty_20.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
copy to websphere-liberty_20.0.0.7-kernel-java8-ibmjava/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
diff --git a/websphere-liberty_20.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/http-endpoint.xml b/websphere-liberty_20.0.0.7-kernel-java8-ibmjava/helpers/build/configuration_snippets/http-endpoint.xml
similarity index 100%
copy from websphere-liberty_20.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/http-endpoint.xml
copy to websphere-liberty_20.0.0.7-kernel-java8-ibmjava/helpers/build/configuration_snippets/http-endpoint.xml
diff --git a/websphere-liberty_20.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/http-ssl-endpoint.xml b/websphere-liberty_20.0.0.7-kernel-java8-ibmjava/helpers/build/configuration_snippets/http-ssl-endpoint.xml
similarity index 100%
copy from websphere-liberty_20.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/http-ssl-endpoint.xml
copy to websphere-liberty_20.0.0.7-kernel-java8-ibmjava/helpers/build/configuration_snippets/http-ssl-endpoint.xml
diff --git a/websphere-liberty_20.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/iiop-endpoint.xml b/websphere-liberty_20.0.0.7-kernel-java8-ibmjava/helpers/build/configuration_snippets/iiop-endpoint.xml
similarity index 100%
copy from websphere-liberty_20.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/iiop-endpoint.xml
copy to websphere-liberty_20.0.0.7-kernel-java8-ibmjava/helpers/build/configuration_snippets/iiop-endpoint.xml
diff --git a/websphere-liberty_20.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml b/websphere-liberty_20.0.0.7-kernel-java8-ibmjava/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
similarity index 100%
copy from websphere-liberty_20.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
copy to websphere-liberty_20.0.0.7-kernel-java8-ibmjava/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
diff --git a/websphere-liberty_20.0.0.6-kernel-java8-ibmjava/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/websphere-liberty_20.0.0.7-kernel-java8-ibmjava/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
similarity index 100%
copy from websphere-liberty_20.0.0.6-kernel-java8-ibmjava/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
copy to websphere-liberty_20.0.0.7-kernel-java8-ibmjava/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
diff --git a/websphere-liberty_20.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/jms-endpoint.xml b/websphere-liberty_20.0.0.7-kernel-java8-ibmjava/helpers/build/configuration_snippets/jms-endpoint.xml
similarity index 100%
copy from websphere-liberty_20.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/jms-endpoint.xml
copy to websphere-liberty_20.0.0.7-kernel-java8-ibmjava/helpers/build/configuration_snippets/jms-endpoint.xml
diff --git a/websphere-liberty_20.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/jms-ssl-endpoint.xml b/websphere-liberty_20.0.0.7-kernel-java8-ibmjava/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
similarity index 100%
copy from websphere-liberty_20.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
copy to websphere-liberty_20.0.0.7-kernel-java8-ibmjava/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
diff --git a/websphere-liberty_20.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/keystore.xml b/websphere-liberty_20.0.0.7-kernel-java8-ibmjava/helpers/build/configuration_snippets/keystore.xml
similarity index 100%
copy from websphere-liberty_20.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/keystore.xml
copy to websphere-liberty_20.0.0.7-kernel-java8-ibmjava/helpers/build/configuration_snippets/keystore.xml
diff --git a/websphere-liberty_20.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/mp-health-check.xml b/websphere-liberty_20.0.0.7-kernel-java8-ibmjava/helpers/build/configuration_snippets/mp-health-check.xml
similarity index 100%
copy from websphere-liberty_20.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/mp-health-check.xml
copy to websphere-liberty_20.0.0.7-kernel-java8-ibmjava/helpers/build/configuration_snippets/mp-health-check.xml
diff --git a/websphere-liberty_20.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/mp-monitoring.xml b/websphere-liberty_20.0.0.7-kernel-java8-ibmjava/helpers/build/configuration_snippets/mp-monitoring.xml
similarity index 100%
copy from websphere-liberty_20.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/mp-monitoring.xml
copy to websphere-liberty_20.0.0.7-kernel-java8-ibmjava/helpers/build/configuration_snippets/mp-monitoring.xml
diff --git a/websphere-liberty_20.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/oidc-config.xml b/websphere-liberty_20.0.0.7-kernel-java8-ibmjava/helpers/build/configuration_snippets/oidc-config.xml
similarity index 100%
copy from websphere-liberty_20.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/oidc-config.xml
copy to websphere-liberty_20.0.0.7-kernel-java8-ibmjava/helpers/build/configuration_snippets/oidc-config.xml
diff --git a/websphere-liberty_20.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/oidc.xml b/websphere-liberty_20.0.0.7-kernel-java8-ibmjava/helpers/build/configuration_snippets/oidc.xml
similarity index 100%
copy from websphere-liberty_20.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/oidc.xml
copy to websphere-liberty_20.0.0.7-kernel-java8-ibmjava/helpers/build/configuration_snippets/oidc.xml
diff --git a/websphere-liberty_20.0.0.6-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-facebook.xml b/websphere-liberty_20.0.0.7-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-facebook.xml
similarity index 100%
copy from websphere-liberty_20.0.0.6-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-facebook.xml
copy to websphere-liberty_20.0.0.7-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-facebook.xml
diff --git a/websphere-liberty_20.0.0.6-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-features.xml b/websphere-liberty_20.0.0.7-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-features.xml
similarity index 100%
copy from websphere-liberty_20.0.0.6-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-features.xml
copy to websphere-liberty_20.0.0.7-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-features.xml
diff --git a/websphere-liberty_20.0.0.6-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-github.xml b/websphere-liberty_20.0.0.7-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-github.xml
similarity index 100%
copy from websphere-liberty_20.0.0.6-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-github.xml
copy to websphere-liberty_20.0.0.7-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-github.xml
diff --git a/websphere-liberty_20.0.0.6-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-google.xml b/websphere-liberty_20.0.0.7-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-google.xml
similarity index 100%
copy from websphere-liberty_20.0.0.6-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-google.xml
copy to websphere-liberty_20.0.0.7-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-google.xml
diff --git a/websphere-liberty_20.0.0.6-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-linkedin.xml b/websphere-liberty_20.0.0.7-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-linkedin.xml
similarity index 100%
copy from websphere-liberty_20.0.0.6-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-linkedin.xml
copy to websphere-liberty_20.0.0.7-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-linkedin.xml
diff --git a/websphere-liberty_20.0.0.6-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-oauth2.xml b/websphere-liberty_20.0.0.7-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-oauth2.xml
similarity index 100%
copy from websphere-liberty_20.0.0.6-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-oauth2.xml
copy to websphere-liberty_20.0.0.7-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-oauth2.xml
diff --git a/websphere-liberty_20.0.0.6-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-oidc.xml b/websphere-liberty_20.0.0.7-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-oidc.xml
similarity index 100%
copy from websphere-liberty_20.0.0.6-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-oidc.xml
copy to websphere-liberty_20.0.0.7-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-oidc.xml
diff --git a/websphere-liberty_20.0.0.6-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-twitter.xml b/websphere-liberty_20.0.0.7-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-twitter.xml
similarity index 100%
copy from websphere-liberty_20.0.0.6-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-twitter.xml
copy to websphere-liberty_20.0.0.7-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-twitter.xml
diff --git a/websphere-liberty_20.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/tls.xml b/websphere-liberty_20.0.0.7-kernel-java8-ibmjava/helpers/build/configuration_snippets/tls.xml
similarity index 100%
copy from websphere-liberty_20.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/tls.xml
copy to websphere-liberty_20.0.0.7-kernel-java8-ibmjava/helpers/build/configuration_snippets/tls.xml
diff --git a/websphere-liberty_20.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/trustDefault.xml b/websphere-liberty_20.0.0.7-kernel-java8-ibmjava/helpers/build/configuration_snippets/trustDefault.xml
similarity index 100%
copy from websphere-liberty_20.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/trustDefault.xml
copy to websphere-liberty_20.0.0.7-kernel-java8-ibmjava/helpers/build/configuration_snippets/trustDefault.xml
diff --git a/websphere-liberty_20.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/truststore.xml b/websphere-liberty_20.0.0.7-kernel-java8-ibmjava/helpers/build/configuration_snippets/truststore.xml
similarity index 100%
copy from websphere-liberty_20.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/truststore.xml
copy to websphere-liberty_20.0.0.7-kernel-java8-ibmjava/helpers/build/configuration_snippets/truststore.xml
diff --git a/websphere-liberty_20.0.0.6-kernel-java8-ibmjava/helpers/build/configure.sh b/websphere-liberty_20.0.0.7-kernel-java8-ibmjava/helpers/build/configure.sh
similarity index 100%
copy from websphere-liberty_20.0.0.6-kernel-java8-ibmjava/helpers/build/configure.sh
copy to websphere-liberty_20.0.0.7-kernel-java8-ibmjava/helpers/build/configure.sh
diff --git a/websphere-liberty_20.0.0.6-kernel-java8-ibmjava/helpers/build/infinispan-client-setup.sh b/websphere-liberty_20.0.0.7-kernel-java8-ibmjava/helpers/build/infinispan-client-setup.sh
similarity index 100%
copy from websphere-liberty_20.0.0.6-kernel-java8-ibmjava/helpers/build/infinispan-client-setup.sh
copy to websphere-liberty_20.0.0.7-kernel-java8-ibmjava/helpers/build/infinispan-client-setup.sh
diff --git a/websphere-liberty_20.0.0.6-kernel-java8-ibmjava/helpers/build/populate_scc.sh b/websphere-liberty_20.0.0.7-kernel-java8-ibmjava/helpers/build/populate_scc.sh
similarity index 100%
copy from websphere-liberty_20.0.0.6-kernel-java8-ibmjava/helpers/build/populate_scc.sh
copy to websphere-liberty_20.0.0.7-kernel-java8-ibmjava/helpers/build/populate_scc.sh
diff --git a/websphere-liberty_20.0.0.6-kernel-java8-ibmjava/helpers/runtime/docker-server.sh b/websphere-liberty_20.0.0.7-kernel-java8-ibmjava/helpers/runtime/docker-server.sh
similarity index 100%
copy from websphere-liberty_20.0.0.6-kernel-java8-ibmjava/helpers/runtime/docker-server.sh
copy to websphere-liberty_20.0.0.7-kernel-java8-ibmjava/helpers/runtime/docker-server.sh
diff --git a/websphere-liberty_20.0.0.6-kernel-java8-ibmjava/licenses/en.html b/websphere-liberty_20.0.0.7-kernel-java8-ibmjava/licenses/en.html
similarity index 96%
copy from websphere-liberty_20.0.0.6-kernel-java8-ibmjava/licenses/en.html
copy to websphere-liberty_20.0.0.7-kernel-java8-ibmjava/licenses/en.html
index 6db0ccf..a578328 100644
--- a/websphere-liberty_20.0.0.6-kernel-java8-ibmjava/licenses/en.html
+++ b/websphere-liberty_20.0.0.7-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.6 
+IBM WebSphere Application Server Liberty 20.0.0.7 
 (Component)<br>
 <br>
 The following standard terms apply to Licensee's use of the 
@@ -26,6 +26,17 @@ 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>
+Components Not Used for Establishing Required Entitlements<br>
+<br>
+When determining the number of entitlements required for 
+Licensee's installation or use of the Program, the installation or use 
+of the following Program components are not taken into 
+consideration. In other words, Licensee may install and use the following 
+Program components, under the license terms, but these components 
+are not used to determine the number of entitlements required 
+for the Program.<br>
+Liberty Operator<br>
+<br>
 Separately Licensed Code<br>
 <br>
 The provisions of this paragraph do not apply to the extent 
@@ -150,9 +161,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-BPKJTD<br>
-D/N:  L-CTUR-BPKJTD<br>
-P/N:  L-CTUR-BPKJTD<br>
+L/N:  L-CTUR-BQ8LY4<br>
+D/N:  L-CTUR-BQ8LY4<br>
+P/N:  L-CTUR-BQ8LY4<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_20.0.0.7-kernel-java8-ibmjava/licenses/non_ibm_license.html
similarity index 95%
copy from websphere-liberty_kernel/licenses/non_ibm_license.html
copy to websphere-liberty_20.0.0.7-kernel-java8-ibmjava/licenses/non_ibm_license.html
index 48c4794..c7a6220 100644
--- a/websphere-liberty_kernel/licenses/non_ibm_license.html
+++ b/websphere-liberty_20.0.0.7-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.6<br>
+IBM WebSphere Application Server Liberty 20.0.0.7<br>
 <br>
 The IBM license agreement and any applicable information on 
 the web<br>
@@ -238,8 +238,8 @@ END OF NOTICE FILE<br>
 <br>
 <br>
 <br>
-L/N:  L-CTUR-BPKJTD<br>
-D/N:  L-CTUR-BPKJTD<br>
-P/N:  L-CTUR-BPKJTD<br>
+L/N:  L-CTUR-BQ8LY4<br>
+D/N:  L-CTUR-BQ8LY4<br>
+P/N:  L-CTUR-BQ8LY4<br>
 </BODY>
 </HTML>
\ No newline at end of file
diff --git a/websphere-liberty_kernel/licenses/notices.html b/websphere-liberty_20.0.0.7-kernel-java8-ibmjava/licenses/notices.html
similarity index 97%
copy from websphere-liberty_kernel/licenses/notices.html
copy to websphere-liberty_20.0.0.7-kernel-java8-ibmjava/licenses/notices.html
index 035d023..61c26ab 100644
--- a/websphere-liberty_kernel/licenses/notices.html
+++ b/websphere-liberty_20.0.0.7-kernel-java8-ibmjava/licenses/notices.html
@@ -6,7 +6,7 @@
 <BODY>
 NOTICES AND INFORMATION<br>
 <br>
-IBM WebSphere Application Server Liberty 20.0.0.6<br>
+IBM WebSphere Application Server Liberty 20.0.0.7<br>
 <br>
 The IBM license agreement and any applicable information on 
 the web<br>
@@ -3297,8 +3297,8 @@ END OF NOTICE FILE<br>
 <br>
 <br>
 <br>
-L/N:  L-CTUR-BPKJTD<br>
-D/N:  L-CTUR-BPKJTD<br>
-P/N:  L-CTUR-BPKJTD<br>
+L/N:  L-CTUR-BQ8LY4<br>
+D/N:  L-CTUR-BQ8LY4<br>
+P/N:  L-CTUR-BQ8LY4<br>
 </BODY>
 </HTML>
\ No newline at end of file
diff --git a/websphere-liberty_beta/Dockerfile b/websphere-liberty_beta/Dockerfile
index 02de635..323171d 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.6.0.0" \
-      org.opencontainers.image.revision="cl200620200528-0414"
+      org.opencontainers.image.version="2020.7.0.0" \
+      org.opencontainers.image.revision="cl200720200625-0300"
 
 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.6.0_0
+ENV LIBERTY_VERSION 2020.7.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 8a4065d..9260ccb 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.6" \
-      org.opencontainers.image.revision="cl200620200528-0414" \
+      org.opencontainers.image.version="20.0.0.7" \
+      org.opencontainers.image.revision="cl200720200625-0300" \
       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_06
+ENV LIBERTY_VERSION 20.0.0_07
 
 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.6" \
-      "BuildLabel"="cl200620200528-0414"
+      "ProductVersion"="20.0.0.7" \
+      "BuildLabel"="cl200720200625-0300"
 
 # Set Path Shortcuts
 ENV LOG_DIR=/logs \
diff --git a/websphere-liberty_kernel/licenses/en.html b/websphere-liberty_kernel/licenses/en.html
index 6db0ccf..a578328 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.6 
+IBM WebSphere Application Server Liberty 20.0.0.7 
 (Component)<br>
 <br>
 The following standard terms apply to Licensee's use of the 
@@ -26,6 +26,17 @@ 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>
+Components Not Used for Establishing Required Entitlements<br>
+<br>
+When determining the number of entitlements required for 
+Licensee's installation or use of the Program, the installation or use 
+of the following Program components are not taken into 
+consideration. In other words, Licensee may install and use the following 
+Program components, under the license terms, but these components 
+are not used to determine the number of entitlements required 
+for the Program.<br>
+Liberty Operator<br>
+<br>
 Separately Licensed Code<br>
 <br>
 The provisions of this paragraph do not apply to the extent 
@@ -150,9 +161,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-BPKJTD<br>
-D/N:  L-CTUR-BPKJTD<br>
-P/N:  L-CTUR-BPKJTD<br>
+L/N:  L-CTUR-BQ8LY4<br>
+D/N:  L-CTUR-BQ8LY4<br>
+P/N:  L-CTUR-BQ8LY4<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 48c4794..c7a6220 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.6<br>
+IBM WebSphere Application Server Liberty 20.0.0.7<br>
 <br>
 The IBM license agreement and any applicable information on 
 the web<br>
@@ -238,8 +238,8 @@ END OF NOTICE FILE<br>
 <br>
 <br>
 <br>
-L/N:  L-CTUR-BPKJTD<br>
-D/N:  L-CTUR-BPKJTD<br>
-P/N:  L-CTUR-BPKJTD<br>
+L/N:  L-CTUR-BQ8LY4<br>
+D/N:  L-CTUR-BQ8LY4<br>
+P/N:  L-CTUR-BQ8LY4<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 035d023..61c26ab 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.6<br>
+IBM WebSphere Application Server Liberty 20.0.0.7<br>
 <br>
 The IBM license agreement and any applicable information on 
 the web<br>
@@ -3297,8 +3297,8 @@ END OF NOTICE FILE<br>
 <br>
 <br>
 <br>
-L/N:  L-CTUR-BPKJTD<br>
-D/N:  L-CTUR-BPKJTD<br>
-P/N:  L-CTUR-BPKJTD<br>
+L/N:  L-CTUR-BQ8LY4<br>
+D/N:  L-CTUR-BQ8LY4<br>
+P/N:  L-CTUR-BQ8LY4<br>
 </BODY>
 </HTML>
\ No newline at end of file

@yosifkit yosifkit merged commit 4771405 into docker-library:master Jul 6, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants