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.

Sign up for GitHub

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

Jump to bottom

websphere-liberty and open-liberty 21.0.0.2 release #9660

Merged
merged 3 commits into from
Feb 22, 2021
Merged

websphere-liberty and open-liberty 21.0.0.2 release #9660

merged 3 commits into from
Feb 22, 2021

Conversation

crpotter
Copy link
Contributor

Updates for the releases of websphere-liberty and open-liberty version 21.0.0.2.

  • Add 21.0.0.2 images
  • Remove 21.0.0.1 images

@github-actions
Copy link

Diff for c3a8812: 
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 1a1c748..8b1b7d2 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -2,7 +2,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/OpenLiberty/ci.docker.git
-GitCommit: c7ad269918729cfef66c5972e21231e3339e64a7
+GitCommit: ce388adb04648887154867bba1ca0a6986fa635a
 
 Tags: 20.0.0.9-kernel-java8-openj9
 Architectures: amd64, ppc64le, s390x
@@ -29,24 +29,24 @@ Architectures: amd64, ppc64le, s390x
 Directory: releases/20.0.0.12/kernel-slim
 File: Dockerfile.ubuntu.adoptopenjdk11
 
-Tags: 21.0.0.1-full-java8-openj9
+Tags: 21.0.0.2-full-java8-openj9
 Architectures: amd64, ppc64le, s390x
-Directory: releases/21.0.0.1/full
+Directory: releases/21.0.0.2/full
 File: Dockerfile.ubuntu.adoptopenjdk8
 
-Tags: 21.0.0.1-full-java11-openj9
+Tags: 21.0.0.2-full-java11-openj9
 Architectures: amd64, ppc64le, s390x
-Directory: releases/21.0.0.1/full
+Directory: releases/21.0.0.2/full
 File: Dockerfile.ubuntu.adoptopenjdk11
 
-Tags: 21.0.0.1-kernel-slim-java8-openj9
+Tags: 21.0.0.2-kernel-slim-java8-openj9
 Architectures: amd64, ppc64le, s390x
-Directory: releases/21.0.0.1/kernel-slim
+Directory: releases/21.0.0.2/kernel-slim
 File: Dockerfile.ubuntu.adoptopenjdk8
 
-Tags: 21.0.0.1-kernel-slim-java11-openj9
+Tags: 21.0.0.2-kernel-slim-java11-openj9
 Architectures: amd64, ppc64le, s390x
-Directory: releases/21.0.0.1/kernel-slim
+Directory: releases/21.0.0.2/kernel-slim
 File: Dockerfile.ubuntu.adoptopenjdk11
 
 Tags: beta
@@ -89,7 +89,7 @@ File: Dockerfile.ubuntu.adoptopenjdk8
 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: fc1f15394dcd59da0bfa865d0f370b26fa6e39d7
+GitCommit: 57924976c86e94651b23d0f5cd5673947085a8e1
 
 Tags: 20.0.0.9-kernel-java8-ibmjava
 Directory: ga/20.0.0.9/kernel
@@ -104,13 +104,13 @@ Architectures: amd64, ppc64le, s390x
 Directory: ga/20.0.0.12/kernel
 File: Dockerfile.ubuntu.adoptopenjdk11
 
-Tags: 21.0.0.1-kernel-java8-ibmjava
-Directory: ga/21.0.0.1/kernel
+Tags: 21.0.0.2-kernel-java8-ibmjava
+Directory: ga/21.0.0.2/kernel
 File: Dockerfile.ubuntu.ibmjava8
 
-Tags: 21.0.0.1-kernel-java11-openj9
+Tags: 21.0.0.2-kernel-java11-openj9
 Architectures: amd64, ppc64le, s390x
-Directory: ga/21.0.0.1/kernel
+Directory: ga/21.0.0.2/kernel
 File: Dockerfile.ubuntu.adoptopenjdk11
 
 Tags: kernel
@@ -135,15 +135,15 @@ Architectures: amd64, ppc64le, s390x
 Directory: ga/20.0.0.12/full
 File: Dockerfile.ubuntu.adoptopenjdk11
 
-Tags: 21.0.0.1-full-java8-ibmjava
-Directory: ga/21.0.0.1/full
+Tags: 21.0.0.2-full-java8-ibmjava
+Directory: ga/21.0.0.2/full
 File: Dockerfile.ubuntu.ibmjava8
 
 Tags: full, latest
 Directory: ga/latest/full
 File: Dockerfile.ubuntu.ibmjava8
 
-Tags: full-java11-openj9, 21.0.0.1-full-java11-openj9
+Tags: full-java11-openj9, 21.0.0.2-full-java11-openj9
 Architectures: amd64, ppc64le, s390x
 Directory: ga/latest/full
 File: Dockerfile.ubuntu.adoptopenjdk11
diff --git a/_bashbrew-list b/_bashbrew-list
index 04fe4c5..595cfef 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -4,10 +4,10 @@ open-liberty:20.0.0.12-full-java8-openj9
 open-liberty:20.0.0.12-full-java11-openj9
 open-liberty:20.0.0.12-kernel-slim-java8-openj9
 open-liberty:20.0.0.12-kernel-slim-java11-openj9
-open-liberty:21.0.0.1-full-java8-openj9
-open-liberty:21.0.0.1-full-java11-openj9
-open-liberty:21.0.0.1-kernel-slim-java8-openj9
-open-liberty:21.0.0.1-kernel-slim-java11-openj9
+open-liberty:21.0.0.2-full-java8-openj9
+open-liberty:21.0.0.2-full-java11-openj9
+open-liberty:21.0.0.2-kernel-slim-java8-openj9
+open-liberty:21.0.0.2-kernel-slim-java11-openj9
 open-liberty:beta
 open-liberty:beta-java11
 open-liberty:full
@@ -23,10 +23,10 @@ websphere-liberty:20.0.0.12-full-java8-ibmjava
 websphere-liberty:20.0.0.12-full-java11-openj9
 websphere-liberty:20.0.0.12-kernel-java8-ibmjava
 websphere-liberty:20.0.0.12-kernel-java11-openj9
-websphere-liberty:21.0.0.1-full-java8-ibmjava
-websphere-liberty:21.0.0.1-full-java11-openj9
-websphere-liberty:21.0.0.1-kernel-java8-ibmjava
-websphere-liberty:21.0.0.1-kernel-java11-openj9
+websphere-liberty:21.0.0.2-full-java8-ibmjava
+websphere-liberty:21.0.0.2-full-java11-openj9
+websphere-liberty:21.0.0.2-kernel-java8-ibmjava
+websphere-liberty:21.0.0.2-kernel-java11-openj9
 websphere-liberty:full
 websphere-liberty:full-java11-openj9
 websphere-liberty:kernel
diff --git a/open-liberty_21.0.0.1-full-java11-openj9/Dockerfile.ubuntu.adoptopenjdk11 b/open-liberty_21.0.0.2-full-java11-openj9/Dockerfile.ubuntu.adoptopenjdk11
similarity index 92%
rename from open-liberty_21.0.0.1-full-java11-openj9/Dockerfile.ubuntu.adoptopenjdk11
rename to open-liberty_21.0.0.2-full-java11-openj9/Dockerfile.ubuntu.adoptopenjdk11
index 8d98b1f..b6c51d6 100644
--- a/open-liberty_21.0.0.1-full-java11-openj9/Dockerfile.ubuntu.adoptopenjdk11
+++ b/open-liberty_21.0.0.2-full-java11-openj9/Dockerfile.ubuntu.adoptopenjdk11
@@ -1,7 +1,7 @@
 FROM adoptopenjdk:11-jre-openj9
-ARG LIBERTY_VERSION=21.0.0.1
-ARG LIBERTY_SHA=b6d5d5c19dae9e4e11c5b98b885c70c50fb67d91
-ARG LIBERTY_BUILD_LABEL=cl210120210113-1459
+ARG LIBERTY_VERSION=21.0.0.2
+ARG LIBERTY_SHA=3f3d248227d8708da40447352d249c0d2b856fcc
+ARG LIBERTY_BUILD_LABEL=cl210220210209-1100
 ARG LIBERTY_DOWNLOAD_URL=https://repo1.maven.org/maven2/io/openliberty/openliberty-runtime/$LIBERTY_VERSION/openliberty-runtime-$LIBERTY_VERSION.zip
 ARG LIBERTY_LICENSE_URL=https://raw.githubusercontent.com/OpenLiberty/open-liberty/master/LICENSE
 ARG LIBERTY_LICENSE_SHA=84f00503d6516c91190de866e78d6010899673b7
@@ -87,7 +87,8 @@ RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
     && chmod -R g+rwx /opt/ol/wlp/output
 
 #These settings are needed so that we can run as a different user than 1001 after server warmup
-ENV RANDFILE=/tmp/.rnd
+ENV RANDFILE=/tmp/.rnd \
+    OPENJ9_JAVA_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal"
 
 USER 1001
 
diff --git a/open-liberty_21.0.0.1-full-java11-openj9/fixes/.gitkeep b/open-liberty_21.0.0.2-full-java11-openj9/fixes/.gitkeep
similarity index 100%
rename from open-liberty_21.0.0.1-full-java11-openj9/fixes/.gitkeep
rename to open-liberty_21.0.0.2-full-java11-openj9/fixes/.gitkeep
diff --git a/open-liberty_21.0.0.1-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml b/open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
similarity index 100%
rename from open-liberty_21.0.0.1-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
rename to open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
diff --git a/open-liberty_21.0.0.1-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml b/open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
similarity index 100%
rename from open-liberty_21.0.0.1-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
rename to open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
diff --git a/open-liberty_21.0.0.1-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml b/open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
similarity index 100%
rename from open-liberty_21.0.0.1-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
rename to open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
diff --git a/open-liberty_21.0.0.1-full-java11-openj9/helpers/build/configuration_snippets/http-endpoint.xml b/open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/http-endpoint.xml
similarity index 100%
rename from open-liberty_21.0.0.1-full-java11-openj9/helpers/build/configuration_snippets/http-endpoint.xml
rename to open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/http-endpoint.xml
diff --git a/open-liberty_21.0.0.1-full-java11-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml b/open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml
similarity index 100%
rename from open-liberty_21.0.0.1-full-java11-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml
rename to open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml
diff --git a/open-liberty_21.0.0.1-full-java11-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml b/open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml
similarity index 100%
rename from open-liberty_21.0.0.1-full-java11-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml
rename to open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml
diff --git a/open-liberty_21.0.0.1-full-java11-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml b/open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
similarity index 100%
rename from open-liberty_21.0.0.1-full-java11-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
rename to open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
diff --git a/open-liberty_21.0.0.1-full-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
similarity index 100%
rename from open-liberty_21.0.0.1-full-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
rename to open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
diff --git a/open-liberty_21.0.0.1-full-java11-openj9/helpers/build/configuration_snippets/jms-endpoint.xml b/open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/jms-endpoint.xml
similarity index 100%
rename from open-liberty_21.0.0.1-full-java11-openj9/helpers/build/configuration_snippets/jms-endpoint.xml
rename to open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/jms-endpoint.xml
diff --git a/open-liberty_21.0.0.1-full-java11-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml b/open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
similarity index 100%
rename from open-liberty_21.0.0.1-full-java11-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
rename to open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
diff --git a/open-liberty_21.0.0.1-full-java11-openj9/helpers/build/configuration_snippets/keystore.xml b/open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/keystore.xml
similarity index 100%
rename from open-liberty_21.0.0.1-full-java11-openj9/helpers/build/configuration_snippets/keystore.xml
rename to open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/keystore.xml
diff --git a/open-liberty_21.0.0.1-full-java11-openj9/helpers/build/configuration_snippets/mp-health-check.xml b/open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/mp-health-check.xml
similarity index 100%
rename from open-liberty_21.0.0.1-full-java11-openj9/helpers/build/configuration_snippets/mp-health-check.xml
rename to open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/mp-health-check.xml
diff --git a/open-liberty_21.0.0.1-full-java11-openj9/helpers/build/configuration_snippets/mp-monitoring.xml b/open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/mp-monitoring.xml
similarity index 100%
rename from open-liberty_21.0.0.1-full-java11-openj9/helpers/build/configuration_snippets/mp-monitoring.xml
rename to open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/mp-monitoring.xml
diff --git a/open-liberty_21.0.0.1-full-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml b/open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml
similarity index 100%
rename from open-liberty_21.0.0.1-full-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml
rename to open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml
diff --git a/open-liberty_21.0.0.1-full-java11-openj9/helpers/build/configuration_snippets/sso-features.xml b/open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/sso-features.xml
similarity index 100%
rename from open-liberty_21.0.0.1-full-java11-openj9/helpers/build/configuration_snippets/sso-features.xml
rename to open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/sso-features.xml
diff --git a/open-liberty_21.0.0.1-full-java11-openj9/helpers/build/configuration_snippets/sso-github.xml b/open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/sso-github.xml
similarity index 100%
rename from open-liberty_21.0.0.1-full-java11-openj9/helpers/build/configuration_snippets/sso-github.xml
rename to open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/sso-github.xml
diff --git a/open-liberty_21.0.0.1-full-java11-openj9/helpers/build/configuration_snippets/sso-google.xml b/open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/sso-google.xml
similarity index 100%
rename from open-liberty_21.0.0.1-full-java11-openj9/helpers/build/configuration_snippets/sso-google.xml
rename to open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/sso-google.xml
diff --git a/open-liberty_21.0.0.1-full-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml b/open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
similarity index 100%
rename from open-liberty_21.0.0.1-full-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
rename to open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
diff --git a/open-liberty_21.0.0.1-full-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml b/open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
similarity index 100%
rename from open-liberty_21.0.0.1-full-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
rename to open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
diff --git a/open-liberty_21.0.0.1-full-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml b/open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml
similarity index 100%
rename from open-liberty_21.0.0.1-full-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml
rename to open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml
diff --git a/open-liberty_21.0.0.1-full-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml b/open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml
similarity index 100%
rename from open-liberty_21.0.0.1-full-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml
rename to open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml
diff --git a/open-liberty_21.0.0.1-full-java11-openj9/helpers/build/configuration_snippets/tls.xml b/open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/tls.xml
similarity index 100%
rename from open-liberty_21.0.0.1-full-java11-openj9/helpers/build/configuration_snippets/tls.xml
rename to open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/tls.xml
diff --git a/open-liberty_21.0.0.1-full-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml b/open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml
similarity index 100%
rename from open-liberty_21.0.0.1-full-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml
rename to open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml
diff --git a/open-liberty_21.0.0.1-full-java11-openj9/helpers/build/configuration_snippets/truststore.xml b/open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/truststore.xml
similarity index 100%
rename from open-liberty_21.0.0.1-full-java11-openj9/helpers/build/configuration_snippets/truststore.xml
rename to open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/truststore.xml
diff --git a/open-liberty_21.0.0.1-full-java11-openj9/helpers/build/configure.sh b/open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configure.sh
similarity index 100%
rename from open-liberty_21.0.0.1-full-java11-openj9/helpers/build/configure.sh
rename to open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configure.sh
diff --git a/open-liberty_21.0.0.1-full-java11-openj9/helpers/build/infinispan-client-setup.sh b/open-liberty_21.0.0.2-full-java11-openj9/helpers/build/infinispan-client-setup.sh
similarity index 100%
rename from open-liberty_21.0.0.1-full-java11-openj9/helpers/build/infinispan-client-setup.sh
rename to open-liberty_21.0.0.2-full-java11-openj9/helpers/build/infinispan-client-setup.sh
diff --git a/open-liberty_21.0.0.1-full-java11-openj9/helpers/build/populate_scc.sh b/open-liberty_21.0.0.2-full-java11-openj9/helpers/build/populate_scc.sh
similarity index 100%
rename from open-liberty_21.0.0.1-full-java11-openj9/helpers/build/populate_scc.sh
rename to open-liberty_21.0.0.2-full-java11-openj9/helpers/build/populate_scc.sh
diff --git a/open-liberty_21.0.0.1-full-java11-openj9/helpers/runtime/docker-server.sh b/open-liberty_21.0.0.2-full-java11-openj9/helpers/runtime/docker-server.sh
similarity index 100%
rename from open-liberty_21.0.0.1-full-java11-openj9/helpers/runtime/docker-server.sh
rename to open-liberty_21.0.0.2-full-java11-openj9/helpers/runtime/docker-server.sh
diff --git a/open-liberty_21.0.0.1-full-java8-openj9/Dockerfile.ubuntu.adoptopenjdk8 b/open-liberty_21.0.0.2-full-java8-openj9/Dockerfile.ubuntu.adoptopenjdk8
similarity index 92%
rename from open-liberty_21.0.0.1-full-java8-openj9/Dockerfile.ubuntu.adoptopenjdk8
rename to open-liberty_21.0.0.2-full-java8-openj9/Dockerfile.ubuntu.adoptopenjdk8
index 9bee8a9..ef5498f 100644
--- a/open-liberty_21.0.0.1-full-java8-openj9/Dockerfile.ubuntu.adoptopenjdk8
+++ b/open-liberty_21.0.0.2-full-java8-openj9/Dockerfile.ubuntu.adoptopenjdk8
@@ -1,7 +1,7 @@
 FROM adoptopenjdk:8-jre-openj9
-ARG LIBERTY_VERSION=21.0.0.1
-ARG LIBERTY_SHA=b6d5d5c19dae9e4e11c5b98b885c70c50fb67d91
-ARG LIBERTY_BUILD_LABEL=cl210120210113-1459
+ARG LIBERTY_VERSION=21.0.0.2
+ARG LIBERTY_SHA=3f3d248227d8708da40447352d249c0d2b856fcc
+ARG LIBERTY_BUILD_LABEL=cl210220210209-1100
 ARG LIBERTY_DOWNLOAD_URL=https://repo1.maven.org/maven2/io/openliberty/openliberty-runtime/$LIBERTY_VERSION/openliberty-runtime-$LIBERTY_VERSION.zip
 ARG LIBERTY_LICENSE_URL=https://raw.githubusercontent.com/OpenLiberty/open-liberty/master/LICENSE
 ARG LIBERTY_LICENSE_SHA=84f00503d6516c91190de866e78d6010899673b7
@@ -87,7 +87,8 @@ RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
     && chmod -R g+rwx /opt/ol/wlp/output
 
 #These settings are needed so that we can run as a different user than 1001 after server warmup
-ENV RANDFILE=/tmp/.rnd
+ENV RANDFILE=/tmp/.rnd \
+    OPENJ9_JAVA_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal"
 
 USER 1001
 
diff --git a/open-liberty_21.0.0.1-full-java8-openj9/fixes/.gitkeep b/open-liberty_21.0.0.2-full-java8-openj9/fixes/.gitkeep
similarity index 100%
rename from open-liberty_21.0.0.1-full-java8-openj9/fixes/.gitkeep
rename to open-liberty_21.0.0.2-full-java8-openj9/fixes/.gitkeep
diff --git a/open-liberty_21.0.0.1-full-java8-openj9/helpers/build/configuration_snippets/hazelcast-client.xml b/open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
similarity index 100%
rename from open-liberty_21.0.0.1-full-java8-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
rename to open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
diff --git a/open-liberty_21.0.0.1-full-java8-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml b/open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
similarity index 100%
rename from open-liberty_21.0.0.1-full-java8-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
rename to open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
diff --git a/open-liberty_21.0.0.1-full-java8-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml b/open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
similarity index 100%
rename from open-liberty_21.0.0.1-full-java8-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
rename to open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
diff --git a/open-liberty_21.0.0.1-full-java8-openj9/helpers/build/configuration_snippets/http-endpoint.xml b/open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/http-endpoint.xml
similarity index 100%
rename from open-liberty_21.0.0.1-full-java8-openj9/helpers/build/configuration_snippets/http-endpoint.xml
rename to open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/http-endpoint.xml
diff --git a/open-liberty_21.0.0.1-full-java8-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml b/open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml
similarity index 100%
rename from open-liberty_21.0.0.1-full-java8-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml
rename to open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml
diff --git a/open-liberty_21.0.0.1-full-java8-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml b/open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml
similarity index 100%
rename from open-liberty_21.0.0.1-full-java8-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml
rename to open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml
diff --git a/open-liberty_21.0.0.1-full-java8-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml b/open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
similarity index 100%
rename from open-liberty_21.0.0.1-full-java8-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
rename to open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
diff --git a/open-liberty_21.0.0.1-full-java8-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
similarity index 100%
rename from open-liberty_21.0.0.1-full-java8-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
rename to open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
diff --git a/open-liberty_21.0.0.1-full-java8-openj9/helpers/build/configuration_snippets/jms-endpoint.xml b/open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/jms-endpoint.xml
similarity index 100%
rename from open-liberty_21.0.0.1-full-java8-openj9/helpers/build/configuration_snippets/jms-endpoint.xml
rename to open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/jms-endpoint.xml
diff --git a/open-liberty_21.0.0.1-full-java8-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml b/open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
similarity index 100%
rename from open-liberty_21.0.0.1-full-java8-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
rename to open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
diff --git a/open-liberty_21.0.0.1-full-java8-openj9/helpers/build/configuration_snippets/keystore.xml b/open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/keystore.xml
similarity index 100%
rename from open-liberty_21.0.0.1-full-java8-openj9/helpers/build/configuration_snippets/keystore.xml
rename to open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/keystore.xml
diff --git a/open-liberty_21.0.0.1-full-java8-openj9/helpers/build/configuration_snippets/mp-health-check.xml b/open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/mp-health-check.xml
similarity index 100%
rename from open-liberty_21.0.0.1-full-java8-openj9/helpers/build/configuration_snippets/mp-health-check.xml
rename to open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/mp-health-check.xml
diff --git a/open-liberty_21.0.0.1-full-java8-openj9/helpers/build/configuration_snippets/mp-monitoring.xml b/open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/mp-monitoring.xml
similarity index 100%
rename from open-liberty_21.0.0.1-full-java8-openj9/helpers/build/configuration_snippets/mp-monitoring.xml
rename to open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/mp-monitoring.xml
diff --git a/open-liberty_21.0.0.1-full-java8-openj9/helpers/build/configuration_snippets/sso-facebook.xml b/open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/sso-facebook.xml
similarity index 100%
rename from open-liberty_21.0.0.1-full-java8-openj9/helpers/build/configuration_snippets/sso-facebook.xml
rename to open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/sso-facebook.xml
diff --git a/open-liberty_21.0.0.1-full-java8-openj9/helpers/build/configuration_snippets/sso-features.xml b/open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/sso-features.xml
similarity index 100%
rename from open-liberty_21.0.0.1-full-java8-openj9/helpers/build/configuration_snippets/sso-features.xml
rename to open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/sso-features.xml
diff --git a/open-liberty_21.0.0.1-full-java8-openj9/helpers/build/configuration_snippets/sso-github.xml b/open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/sso-github.xml
similarity index 100%
rename from open-liberty_21.0.0.1-full-java8-openj9/helpers/build/configuration_snippets/sso-github.xml
rename to open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/sso-github.xml
diff --git a/open-liberty_21.0.0.1-full-java8-openj9/helpers/build/configuration_snippets/sso-google.xml b/open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/sso-google.xml
similarity index 100%
rename from open-liberty_21.0.0.1-full-java8-openj9/helpers/build/configuration_snippets/sso-google.xml
rename to open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/sso-google.xml
diff --git a/open-liberty_21.0.0.1-full-java8-openj9/helpers/build/configuration_snippets/sso-linkedin.xml b/open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
similarity index 100%
rename from open-liberty_21.0.0.1-full-java8-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
rename to open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
diff --git a/open-liberty_21.0.0.1-full-java8-openj9/helpers/build/configuration_snippets/sso-oauth2.xml b/open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
similarity index 100%
rename from open-liberty_21.0.0.1-full-java8-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
rename to open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
diff --git a/open-liberty_21.0.0.1-full-java8-openj9/helpers/build/configuration_snippets/sso-oidc.xml b/open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/sso-oidc.xml
similarity index 100%
rename from open-liberty_21.0.0.1-full-java8-openj9/helpers/build/configuration_snippets/sso-oidc.xml
rename to open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/sso-oidc.xml
diff --git a/open-liberty_21.0.0.1-full-java8-openj9/helpers/build/configuration_snippets/sso-twitter.xml b/open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/sso-twitter.xml
similarity index 100%
rename from open-liberty_21.0.0.1-full-java8-openj9/helpers/build/configuration_snippets/sso-twitter.xml
rename to open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/sso-twitter.xml
diff --git a/open-liberty_21.0.0.1-full-java8-openj9/helpers/build/configuration_snippets/tls.xml b/open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/tls.xml
similarity index 100%
rename from open-liberty_21.0.0.1-full-java8-openj9/helpers/build/configuration_snippets/tls.xml
rename to open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/tls.xml
diff --git a/open-liberty_21.0.0.1-full-java8-openj9/helpers/build/configuration_snippets/trustDefault.xml b/open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/trustDefault.xml
similarity index 100%
rename from open-liberty_21.0.0.1-full-java8-openj9/helpers/build/configuration_snippets/trustDefault.xml
rename to open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/trustDefault.xml
diff --git a/open-liberty_21.0.0.1-full-java8-openj9/helpers/build/configuration_snippets/truststore.xml b/open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/truststore.xml
similarity index 100%
rename from open-liberty_21.0.0.1-full-java8-openj9/helpers/build/configuration_snippets/truststore.xml
rename to open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/truststore.xml
diff --git a/open-liberty_21.0.0.1-full-java8-openj9/helpers/build/configure.sh b/open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configure.sh
similarity index 100%
rename from open-liberty_21.0.0.1-full-java8-openj9/helpers/build/configure.sh
rename to open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configure.sh
diff --git a/open-liberty_21.0.0.1-full-java8-openj9/helpers/build/infinispan-client-setup.sh b/open-liberty_21.0.0.2-full-java8-openj9/helpers/build/infinispan-client-setup.sh
similarity index 100%
rename from open-liberty_21.0.0.1-full-java8-openj9/helpers/build/infinispan-client-setup.sh
rename to open-liberty_21.0.0.2-full-java8-openj9/helpers/build/infinispan-client-setup.sh
diff --git a/open-liberty_21.0.0.1-full-java8-openj9/helpers/build/populate_scc.sh b/open-liberty_21.0.0.2-full-java8-openj9/helpers/build/populate_scc.sh
similarity index 100%
rename from open-liberty_21.0.0.1-full-java8-openj9/helpers/build/populate_scc.sh
rename to open-liberty_21.0.0.2-full-java8-openj9/helpers/build/populate_scc.sh
diff --git a/open-liberty_21.0.0.1-full-java8-openj9/helpers/runtime/docker-server.sh b/open-liberty_21.0.0.2-full-java8-openj9/helpers/runtime/docker-server.sh
similarity index 100%
rename from open-liberty_21.0.0.1-full-java8-openj9/helpers/runtime/docker-server.sh
rename to open-liberty_21.0.0.2-full-java8-openj9/helpers/runtime/docker-server.sh
diff --git a/open-liberty_21.0.0.1-kernel-slim-java11-openj9/Dockerfile.ubuntu.adoptopenjdk11 b/open-liberty_21.0.0.2-kernel-slim-java11-openj9/Dockerfile.ubuntu.adoptopenjdk11
similarity index 92%
rename from open-liberty_21.0.0.1-kernel-slim-java11-openj9/Dockerfile.ubuntu.adoptopenjdk11
rename to open-liberty_21.0.0.2-kernel-slim-java11-openj9/Dockerfile.ubuntu.adoptopenjdk11
index 7600597..176412f 100644
--- a/open-liberty_21.0.0.1-kernel-slim-java11-openj9/Dockerfile.ubuntu.adoptopenjdk11
+++ b/open-liberty_21.0.0.2-kernel-slim-java11-openj9/Dockerfile.ubuntu.adoptopenjdk11
@@ -1,7 +1,7 @@
 FROM adoptopenjdk:11-jre-openj9
-ARG LIBERTY_VERSION=21.0.0.1
-ARG LIBERTY_SHA=9be6bee3ba1b8f312b1af0e59c53f748d4835dc0
-ARG LIBERTY_BUILD_LABEL=cl210120210113-1459
+ARG LIBERTY_VERSION=21.0.0.2
+ARG LIBERTY_SHA=31206d5063125ab56b466e792b42092671147d62
+ARG LIBERTY_BUILD_LABEL=cl210220210209-1100
 ARG LIBERTY_DOWNLOAD_URL=https://repo1.maven.org/maven2/io/openliberty/openliberty-kernel/$LIBERTY_VERSION/openliberty-kernel-$LIBERTY_VERSION.zip
 ARG LIBERTY_LICENSE_URL=https://raw.githubusercontent.com/OpenLiberty/open-liberty/master/LICENSE
 ARG LIBERTY_LICENSE_SHA=84f00503d6516c91190de866e78d6010899673b7
@@ -86,7 +86,8 @@ RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
     && chmod -R g+rwx /opt/ol/wlp/output
 
 #These settings are needed so that we can run as a different user than 1001 after server warmup
-ENV RANDFILE=/tmp/.rnd
+ENV RANDFILE=/tmp/.rnd \
+    OPENJ9_JAVA_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal"
 
 USER 1001
 
diff --git a/open-liberty_21.0.0.1-kernel-slim-java11-openj9/fixes/.gitkeep b/open-liberty_21.0.0.2-kernel-slim-java11-openj9/fixes/.gitkeep
similarity index 100%
rename from open-liberty_21.0.0.1-kernel-slim-java11-openj9/fixes/.gitkeep
rename to open-liberty_21.0.0.2-kernel-slim-java11-openj9/fixes/.gitkeep
diff --git a/open-liberty_21.0.0.1-kernel-slim-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml b/open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
similarity index 100%
rename from open-liberty_21.0.0.1-kernel-slim-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
rename to open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
diff --git a/open-liberty_21.0.0.1-kernel-slim-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml b/open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
similarity index 100%
rename from open-liberty_21.0.0.1-kernel-slim-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
rename to open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
diff --git a/open-liberty_21.0.0.1-kernel-slim-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml b/open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
similarity index 100%
rename from open-liberty_21.0.0.1-kernel-slim-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
rename to open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
diff --git a/open-liberty_21.0.0.1-kernel-slim-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
similarity index 100%
rename from open-liberty_21.0.0.1-kernel-slim-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
rename to open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
diff --git a/open-liberty_21.0.0.1-kernel-slim-java11-openj9/helpers/build/configuration_snippets/keystore.xml b/open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/configuration_snippets/keystore.xml
similarity index 100%
rename from open-liberty_21.0.0.1-kernel-slim-java11-openj9/helpers/build/configuration_snippets/keystore.xml
rename to open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/configuration_snippets/keystore.xml
diff --git a/open-liberty_21.0.0.1-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sessioncache-features.xml b/open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sessioncache-features.xml
similarity index 100%
rename from open-liberty_21.0.0.1-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sessioncache-features.xml
rename to open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sessioncache-features.xml
diff --git a/open-liberty_21.0.0.1-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml b/open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml
similarity index 100%
rename from open-liberty_21.0.0.1-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml
rename to open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml
diff --git a/open-liberty_21.0.0.1-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-features.xml b/open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-features.xml
similarity index 100%
rename from open-liberty_21.0.0.1-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-features.xml
rename to open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-features.xml
diff --git a/open-liberty_21.0.0.1-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-github.xml b/open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-github.xml
similarity index 100%
rename from open-liberty_21.0.0.1-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-github.xml
rename to open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-github.xml
diff --git a/open-liberty_21.0.0.1-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-google.xml b/open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-google.xml
similarity index 100%
rename from open-liberty_21.0.0.1-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-google.xml
rename to open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-google.xml
diff --git a/open-liberty_21.0.0.1-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml b/open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
similarity index 100%
rename from open-liberty_21.0.0.1-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
rename to open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
diff --git a/open-liberty_21.0.0.1-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml b/open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
similarity index 100%
rename from open-liberty_21.0.0.1-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
rename to open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
diff --git a/open-liberty_21.0.0.1-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml b/open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml
similarity index 100%
rename from open-liberty_21.0.0.1-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml
rename to open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml
diff --git a/open-liberty_21.0.0.1-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml b/open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml
similarity index 100%
rename from open-liberty_21.0.0.1-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml
rename to open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml
diff --git a/open-liberty_21.0.0.1-kernel-slim-java11-openj9/helpers/build/configuration_snippets/tls.xml b/open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/configuration_snippets/tls.xml
similarity index 100%
rename from open-liberty_21.0.0.1-kernel-slim-java11-openj9/helpers/build/configuration_snippets/tls.xml
rename to open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/configuration_snippets/tls.xml
diff --git a/open-liberty_21.0.0.1-kernel-slim-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml b/open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml
similarity index 100%
rename from open-liberty_21.0.0.1-kernel-slim-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml
rename to open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml
diff --git a/open-liberty_21.0.0.1-kernel-slim-java11-openj9/helpers/build/configuration_snippets/truststore.xml b/open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/configuration_snippets/truststore.xml
similarity index 100%
rename from open-liberty_21.0.0.1-kernel-slim-java11-openj9/helpers/build/configuration_snippets/truststore.xml
rename to open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/configuration_snippets/truststore.xml
diff --git a/open-liberty_21.0.0.1-kernel-slim-java11-openj9/helpers/build/configure.sh b/open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/configure.sh
similarity index 100%
rename from open-liberty_21.0.0.1-kernel-slim-java11-openj9/helpers/build/configure.sh
rename to open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/configure.sh
diff --git a/open-liberty_21.0.0.1-kernel-slim-java11-openj9/helpers/build/features.sh b/open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/features.sh
similarity index 100%
rename from open-liberty_21.0.0.1-kernel-slim-java11-openj9/helpers/build/features.sh
rename to open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/features.sh
diff --git a/open-liberty_21.0.0.1-kernel-slim-java11-openj9/helpers/build/infinispan-client-setup.sh b/open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/infinispan-client-setup.sh
similarity index 100%
rename from open-liberty_21.0.0.1-kernel-slim-java11-openj9/helpers/build/infinispan-client-setup.sh
rename to open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/infinispan-client-setup.sh
diff --git a/open-liberty_21.0.0.1-kernel-slim-java11-openj9/helpers/build/populate_scc.sh b/open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/populate_scc.sh
similarity index 100%
rename from open-liberty_21.0.0.1-kernel-slim-java11-openj9/helpers/build/populate_scc.sh
rename to open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/populate_scc.sh
diff --git a/open-liberty_21.0.0.1-kernel-slim-java11-openj9/helpers/runtime/docker-server.sh b/open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/runtime/docker-server.sh
similarity index 100%
rename from open-liberty_21.0.0.1-kernel-slim-java11-openj9/helpers/runtime/docker-server.sh
rename to open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/runtime/docker-server.sh
diff --git a/open-liberty_21.0.0.1-kernel-slim-java8-openj9/Dockerfile.ubuntu.adoptopenjdk8 b/open-liberty_21.0.0.2-kernel-slim-java8-openj9/Dockerfile.ubuntu.adoptopenjdk8
similarity index 92%
rename from open-liberty_21.0.0.1-kernel-slim-java8-openj9/Dockerfile.ubuntu.adoptopenjdk8
rename to open-liberty_21.0.0.2-kernel-slim-java8-openj9/Dockerfile.ubuntu.adoptopenjdk8
index 45b32f3..18f8365 100644
--- a/open-liberty_21.0.0.1-kernel-slim-java8-openj9/Dockerfile.ubuntu.adoptopenjdk8
+++ b/open-liberty_21.0.0.2-kernel-slim-java8-openj9/Dockerfile.ubuntu.adoptopenjdk8
@@ -1,7 +1,7 @@
 FROM adoptopenjdk:8-jre-openj9
-ARG LIBERTY_VERSION=21.0.0.1
-ARG LIBERTY_SHA=9be6bee3ba1b8f312b1af0e59c53f748d4835dc0
-ARG LIBERTY_BUILD_LABEL=cl210120210113-1459
+ARG LIBERTY_VERSION=21.0.0.2
+ARG LIBERTY_SHA=31206d5063125ab56b466e792b42092671147d62
+ARG LIBERTY_BUILD_LABEL=cl210220210209-1100
 ARG LIBERTY_DOWNLOAD_URL=https://repo1.maven.org/maven2/io/openliberty/openliberty-kernel/$LIBERTY_VERSION/openliberty-kernel-$LIBERTY_VERSION.zip
 ARG LIBERTY_LICENSE_URL=https://raw.githubusercontent.com/OpenLiberty/open-liberty/master/LICENSE
 ARG LIBERTY_LICENSE_SHA=84f00503d6516c91190de866e78d6010899673b7
@@ -86,7 +86,8 @@ RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
     && chmod -R g+rwx /opt/ol/wlp/output
 
 #These settings are needed so that we can run as a different user than 1001 after server warmup
-ENV RANDFILE=/tmp/.rnd
+ENV RANDFILE=/tmp/.rnd \
+    OPENJ9_JAVA_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal"
 
 USER 1001
 
diff --git a/open-liberty_21.0.0.1-kernel-slim-java8-openj9/fixes/.gitkeep b/open-liberty_21.0.0.2-kernel-slim-java8-openj9/fixes/.gitkeep
similarity index 100%
rename from open-liberty_21.0.0.1-kernel-slim-java8-openj9/fixes/.gitkeep
rename to open-liberty_21.0.0.2-kernel-slim-java8-openj9/fixes/.gitkeep
diff --git a/open-liberty_21.0.0.1-kernel-slim-java8-openj9/helpers/build/configuration_snippets/hazelcast-client.xml b/open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
similarity index 100%
rename from open-liberty_21.0.0.1-kernel-slim-java8-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
rename to open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
diff --git a/open-liberty_21.0.0.1-kernel-slim-java8-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml b/open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
similarity index 100%
rename from open-liberty_21.0.0.1-kernel-slim-java8-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
rename to open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
diff --git a/open-liberty_21.0.0.1-kernel-slim-java8-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml b/open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
similarity index 100%
rename from open-liberty_21.0.0.1-kernel-slim-java8-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
rename to open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
diff --git a/open-liberty_21.0.0.1-kernel-slim-java8-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
similarity index 100%
rename from open-liberty_21.0.0.1-kernel-slim-java8-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
rename to open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
diff --git a/open-liberty_21.0.0.1-kernel-slim-java8-openj9/helpers/build/configuration_snippets/keystore.xml b/open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/configuration_snippets/keystore.xml
similarity index 100%
rename from open-liberty_21.0.0.1-kernel-slim-java8-openj9/helpers/build/configuration_snippets/keystore.xml
rename to open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/configuration_snippets/keystore.xml
diff --git a/open-liberty_21.0.0.1-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sessioncache-features.xml b/open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sessioncache-features.xml
similarity index 100%
rename from open-liberty_21.0.0.1-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sessioncache-features.xml
rename to open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sessioncache-features.xml
diff --git a/open-liberty_21.0.0.1-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-facebook.xml b/open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-facebook.xml
similarity index 100%
rename from open-liberty_21.0.0.1-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-facebook.xml
rename to open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-facebook.xml
diff --git a/open-liberty_21.0.0.1-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-features.xml b/open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-features.xml
similarity index 100%
rename from open-liberty_21.0.0.1-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-features.xml
rename to open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-features.xml
diff --git a/open-liberty_21.0.0.1-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-github.xml b/open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-github.xml
similarity index 100%
rename from open-liberty_21.0.0.1-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-github.xml
rename to open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-github.xml
diff --git a/open-liberty_21.0.0.1-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-google.xml b/open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-google.xml
similarity index 100%
rename from open-liberty_21.0.0.1-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-google.xml
rename to open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-google.xml
diff --git a/open-liberty_21.0.0.1-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-linkedin.xml b/open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
similarity index 100%
rename from open-liberty_21.0.0.1-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
rename to open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
diff --git a/open-liberty_21.0.0.1-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-oauth2.xml b/open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
similarity index 100%
rename from open-liberty_21.0.0.1-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
rename to open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
diff --git a/open-liberty_21.0.0.1-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-oidc.xml b/open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-oidc.xml
similarity index 100%
rename from open-liberty_21.0.0.1-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-oidc.xml
rename to open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-oidc.xml
diff --git a/open-liberty_21.0.0.1-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-twitter.xml b/open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-twitter.xml
similarity index 100%
rename from open-liberty_21.0.0.1-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-twitter.xml
rename to open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-twitter.xml
diff --git a/open-liberty_21.0.0.1-kernel-slim-java8-openj9/helpers/build/configuration_snippets/tls.xml b/open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/configuration_snippets/tls.xml
similarity index 100%
rename from open-liberty_21.0.0.1-kernel-slim-java8-openj9/helpers/build/configuration_snippets/tls.xml
rename to open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/configuration_snippets/tls.xml
diff --git a/open-liberty_21.0.0.1-kernel-slim-java8-openj9/helpers/build/configuration_snippets/trustDefault.xml b/open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/configuration_snippets/trustDefault.xml
similarity index 100%
rename from open-liberty_21.0.0.1-kernel-slim-java8-openj9/helpers/build/configuration_snippets/trustDefault.xml
rename to open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/configuration_snippets/trustDefault.xml
diff --git a/open-liberty_21.0.0.1-kernel-slim-java8-openj9/helpers/build/configuration_snippets/truststore.xml b/open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/configuration_snippets/truststore.xml
similarity index 100%
rename from open-liberty_21.0.0.1-kernel-slim-java8-openj9/helpers/build/configuration_snippets/truststore.xml
rename to open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/configuration_snippets/truststore.xml
diff --git a/open-liberty_21.0.0.1-kernel-slim-java8-openj9/helpers/build/configure.sh b/open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/configure.sh
similarity index 100%
rename from open-liberty_21.0.0.1-kernel-slim-java8-openj9/helpers/build/configure.sh
rename to open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/configure.sh
diff --git a/open-liberty_21.0.0.1-kernel-slim-java8-openj9/helpers/build/features.sh b/open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/features.sh
similarity index 100%
rename from open-liberty_21.0.0.1-kernel-slim-java8-openj9/helpers/build/features.sh
rename to open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/features.sh
diff --git a/open-liberty_21.0.0.1-kernel-slim-java8-openj9/helpers/build/infinispan-client-setup.sh b/open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/infinispan-client-setup.sh
similarity index 100%
rename from open-liberty_21.0.0.1-kernel-slim-java8-openj9/helpers/build/infinispan-client-setup.sh
rename to open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/infinispan-client-setup.sh
diff --git a/open-liberty_21.0.0.1-kernel-slim-java8-openj9/helpers/build/populate_scc.sh b/open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/populate_scc.sh
similarity index 100%
rename from open-liberty_21.0.0.1-kernel-slim-java8-openj9/helpers/build/populate_scc.sh
rename to open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/populate_scc.sh
diff --git a/open-liberty_21.0.0.1-kernel-slim-java8-openj9/helpers/runtime/docker-server.sh b/open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/runtime/docker-server.sh
similarity index 100%
rename from open-liberty_21.0.0.1-kernel-slim-java8-openj9/helpers/runtime/docker-server.sh
rename to open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/runtime/docker-server.sh
diff --git a/open-liberty_beta-java11/Dockerfile.ubuntu.adoptopenjdk11 b/open-liberty_beta-java11/Dockerfile.ubuntu.adoptopenjdk11
index 4f2aff0..a9357b2 100644
--- a/open-liberty_beta-java11/Dockerfile.ubuntu.adoptopenjdk11
+++ b/open-liberty_beta-java11/Dockerfile.ubuntu.adoptopenjdk11
@@ -1,7 +1,7 @@
 FROM adoptopenjdk:11-jre-openj9
-ARG LIBERTY_VERSION=21.0.0.2-beta
-ARG LIBERTY_SHA=c8a28be5d0241847a99186d6961073da41c10c16
-ARG LIBERTY_BUILD_LABEL=cl210120210113-1459
+ARG LIBERTY_VERSION=21.0.0.3-beta
+ARG LIBERTY_SHA=bbeaa17c1000b08b5f3772ce974014f6f7c2ba48
+ARG LIBERTY_BUILD_LABEL=cl210220210209-1100
 ARG LIBERTY_DOWNLOAD_URL=https://repo1.maven.org/maven2/io/openliberty/beta/openliberty-runtime/$LIBERTY_VERSION/openliberty-runtime-$LIBERTY_VERSION.zip
 ARG LIBERTY_LICENSE_URL=https://raw.githubusercontent.com/OpenLiberty/open-liberty/master/LICENSE
 ARG LIBERTY_LICENSE_SHA=84f00503d6516c91190de866e78d6010899673b7
@@ -87,7 +87,8 @@ RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
     && chmod -R g+rwx /opt/ol/wlp/output
 
 #These settings are needed so that we can run as a different user than 1001 after server warmup
-ENV RANDFILE=/tmp/.rnd
+ENV RANDFILE=/tmp/.rnd \
+    OPENJ9_JAVA_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal"
 
 USER 1001
 
diff --git a/open-liberty_beta/Dockerfile.ubuntu.adoptopenjdk8 b/open-liberty_beta/Dockerfile.ubuntu.adoptopenjdk8
index 84a779e..851e26b 100644
--- a/open-liberty_beta/Dockerfile.ubuntu.adoptopenjdk8
+++ b/open-liberty_beta/Dockerfile.ubuntu.adoptopenjdk8
@@ -1,7 +1,7 @@
 FROM adoptopenjdk:8-jre-openj9
-ARG LIBERTY_VERSION=21.0.0.2-beta
-ARG LIBERTY_SHA=c8a28be5d0241847a99186d6961073da41c10c16
-ARG LIBERTY_BUILD_LABEL=cl210120210113-1459
+ARG LIBERTY_VERSION=21.0.0.3-beta
+ARG LIBERTY_SHA=bbeaa17c1000b08b5f3772ce974014f6f7c2ba48
+ARG LIBERTY_BUILD_LABEL=cl210220210209-1100
 ARG LIBERTY_DOWNLOAD_URL=https://repo1.maven.org/maven2/io/openliberty/beta/openliberty-runtime/$LIBERTY_VERSION/openliberty-runtime-$LIBERTY_VERSION.zip
 ARG LIBERTY_LICENSE_URL=https://raw.githubusercontent.com/OpenLiberty/open-liberty/master/LICENSE
 ARG LIBERTY_LICENSE_SHA=84f00503d6516c91190de866e78d6010899673b7
@@ -87,7 +87,8 @@ RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
     && chmod -R g+rwx /opt/ol/wlp/output
 
 #These settings are needed so that we can run as a different user than 1001 after server warmup
-ENV RANDFILE=/tmp/.rnd
+ENV RANDFILE=/tmp/.rnd \
+    OPENJ9_JAVA_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal"
 
 USER 1001
 
diff --git a/open-liberty_full-java11-openj9/Dockerfile.ubuntu.adoptopenjdk11 b/open-liberty_full-java11-openj9/Dockerfile.ubuntu.adoptopenjdk11
index 8d98b1f..b6c51d6 100644
--- a/open-liberty_full-java11-openj9/Dockerfile.ubuntu.adoptopenjdk11
+++ b/open-liberty_full-java11-openj9/Dockerfile.ubuntu.adoptopenjdk11
@@ -1,7 +1,7 @@
 FROM adoptopenjdk:11-jre-openj9
-ARG LIBERTY_VERSION=21.0.0.1
-ARG LIBERTY_SHA=b6d5d5c19dae9e4e11c5b98b885c70c50fb67d91
-ARG LIBERTY_BUILD_LABEL=cl210120210113-1459
+ARG LIBERTY_VERSION=21.0.0.2
+ARG LIBERTY_SHA=3f3d248227d8708da40447352d249c0d2b856fcc
+ARG LIBERTY_BUILD_LABEL=cl210220210209-1100
 ARG LIBERTY_DOWNLOAD_URL=https://repo1.maven.org/maven2/io/openliberty/openliberty-runtime/$LIBERTY_VERSION/openliberty-runtime-$LIBERTY_VERSION.zip
 ARG LIBERTY_LICENSE_URL=https://raw.githubusercontent.com/OpenLiberty/open-liberty/master/LICENSE
 ARG LIBERTY_LICENSE_SHA=84f00503d6516c91190de866e78d6010899673b7
@@ -87,7 +87,8 @@ RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
     && chmod -R g+rwx /opt/ol/wlp/output
 
 #These settings are needed so that we can run as a different user than 1001 after server warmup
-ENV RANDFILE=/tmp/.rnd
+ENV RANDFILE=/tmp/.rnd \
+    OPENJ9_JAVA_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal"
 
 USER 1001
 
diff --git a/open-liberty_kernel-slim-java11-openj9/Dockerfile.ubuntu.adoptopenjdk11 b/open-liberty_kernel-slim-java11-openj9/Dockerfile.ubuntu.adoptopenjdk11
index 7600597..176412f 100644
--- a/open-liberty_kernel-slim-java11-openj9/Dockerfile.ubuntu.adoptopenjdk11
+++ b/open-liberty_kernel-slim-java11-openj9/Dockerfile.ubuntu.adoptopenjdk11
@@ -1,7 +1,7 @@
 FROM adoptopenjdk:11-jre-openj9
-ARG LIBERTY_VERSION=21.0.0.1
-ARG LIBERTY_SHA=9be6bee3ba1b8f312b1af0e59c53f748d4835dc0
-ARG LIBERTY_BUILD_LABEL=cl210120210113-1459
+ARG LIBERTY_VERSION=21.0.0.2
+ARG LIBERTY_SHA=31206d5063125ab56b466e792b42092671147d62
+ARG LIBERTY_BUILD_LABEL=cl210220210209-1100
 ARG LIBERTY_DOWNLOAD_URL=https://repo1.maven.org/maven2/io/openliberty/openliberty-kernel/$LIBERTY_VERSION/openliberty-kernel-$LIBERTY_VERSION.zip
 ARG LIBERTY_LICENSE_URL=https://raw.githubusercontent.com/OpenLiberty/open-liberty/master/LICENSE
 ARG LIBERTY_LICENSE_SHA=84f00503d6516c91190de866e78d6010899673b7
@@ -86,7 +86,8 @@ RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
     && chmod -R g+rwx /opt/ol/wlp/output
 
 #These settings are needed so that we can run as a different user than 1001 after server warmup
-ENV RANDFILE=/tmp/.rnd
+ENV RANDFILE=/tmp/.rnd \
+    OPENJ9_JAVA_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal"
 
 USER 1001
 
diff --git a/open-liberty_kernel-slim-java8-openj9/Dockerfile.ubuntu.adoptopenjdk8 b/open-liberty_kernel-slim-java8-openj9/Dockerfile.ubuntu.adoptopenjdk8
index 45b32f3..18f8365 100644
--- a/open-liberty_kernel-slim-java8-openj9/Dockerfile.ubuntu.adoptopenjdk8
+++ b/open-liberty_kernel-slim-java8-openj9/Dockerfile.ubuntu.adoptopenjdk8
@@ -1,7 +1,7 @@
 FROM adoptopenjdk:8-jre-openj9
-ARG LIBERTY_VERSION=21.0.0.1
-ARG LIBERTY_SHA=9be6bee3ba1b8f312b1af0e59c53f748d4835dc0
-ARG LIBERTY_BUILD_LABEL=cl210120210113-1459
+ARG LIBERTY_VERSION=21.0.0.2
+ARG LIBERTY_SHA=31206d5063125ab56b466e792b42092671147d62
+ARG LIBERTY_BUILD_LABEL=cl210220210209-1100
 ARG LIBERTY_DOWNLOAD_URL=https://repo1.maven.org/maven2/io/openliberty/openliberty-kernel/$LIBERTY_VERSION/openliberty-kernel-$LIBERTY_VERSION.zip
 ARG LIBERTY_LICENSE_URL=https://raw.githubusercontent.com/OpenLiberty/open-liberty/master/LICENSE
 ARG LIBERTY_LICENSE_SHA=84f00503d6516c91190de866e78d6010899673b7
@@ -86,7 +86,8 @@ RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
     && chmod -R g+rwx /opt/ol/wlp/output
 
 #These settings are needed so that we can run as a different user than 1001 after server warmup
-ENV RANDFILE=/tmp/.rnd
+ENV RANDFILE=/tmp/.rnd \
+    OPENJ9_JAVA_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal"
 
 USER 1001
 
diff --git a/open-liberty_latest/Dockerfile.ubuntu.adoptopenjdk8 b/open-liberty_latest/Dockerfile.ubuntu.adoptopenjdk8
index 9bee8a9..ef5498f 100644
--- a/open-liberty_latest/Dockerfile.ubuntu.adoptopenjdk8
+++ b/open-liberty_latest/Dockerfile.ubuntu.adoptopenjdk8
@@ -1,7 +1,7 @@
 FROM adoptopenjdk:8-jre-openj9
-ARG LIBERTY_VERSION=21.0.0.1
-ARG LIBERTY_SHA=b6d5d5c19dae9e4e11c5b98b885c70c50fb67d91
-ARG LIBERTY_BUILD_LABEL=cl210120210113-1459
+ARG LIBERTY_VERSION=21.0.0.2
+ARG LIBERTY_SHA=3f3d248227d8708da40447352d249c0d2b856fcc
+ARG LIBERTY_BUILD_LABEL=cl210220210209-1100
 ARG LIBERTY_DOWNLOAD_URL=https://repo1.maven.org/maven2/io/openliberty/openliberty-runtime/$LIBERTY_VERSION/openliberty-runtime-$LIBERTY_VERSION.zip
 ARG LIBERTY_LICENSE_URL=https://raw.githubusercontent.com/OpenLiberty/open-liberty/master/LICENSE
 ARG LIBERTY_LICENSE_SHA=84f00503d6516c91190de866e78d6010899673b7
@@ -87,7 +87,8 @@ RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
     && chmod -R g+rwx /opt/ol/wlp/output
 
 #These settings are needed so that we can run as a different user than 1001 after server warmup
-ENV RANDFILE=/tmp/.rnd
+ENV RANDFILE=/tmp/.rnd \
+    OPENJ9_JAVA_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal"
 
 USER 1001
 
diff --git a/websphere-liberty_21.0.0.1-full-java11-openj9/Dockerfile.ubuntu.adoptopenjdk11 b/websphere-liberty_21.0.0.2-full-java11-openj9/Dockerfile.ubuntu.adoptopenjdk11
similarity index 100%
rename from websphere-liberty_21.0.0.1-full-java11-openj9/Dockerfile.ubuntu.adoptopenjdk11
rename to websphere-liberty_21.0.0.2-full-java11-openj9/Dockerfile.ubuntu.adoptopenjdk11
diff --git a/websphere-liberty_21.0.0.1-full-java11-openj9/server.xml b/websphere-liberty_21.0.0.2-full-java11-openj9/server.xml
similarity index 100%
rename from websphere-liberty_21.0.0.1-full-java11-openj9/server.xml
rename to websphere-liberty_21.0.0.2-full-java11-openj9/server.xml
diff --git a/websphere-liberty_21.0.0.1-full-java8-ibmjava/Dockerfile.ubuntu.ibmjava8 b/websphere-liberty_21.0.0.2-full-java8-ibmjava/Dockerfile.ubuntu.ibmjava8
similarity index 96%
rename from websphere-liberty_21.0.0.1-full-java8-ibmjava/Dockerfile.ubuntu.ibmjava8
rename to websphere-liberty_21.0.0.2-full-java8-ibmjava/Dockerfile.ubuntu.ibmjava8
index 0164d33..71ef1d9 100644
--- a/websphere-liberty_21.0.0.1-full-java8-ibmjava/Dockerfile.ubuntu.ibmjava8
+++ b/websphere-liberty_21.0.0.2-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:21.0.0.1-kernel-java8-ibmjava
+FROM websphere-liberty:21.0.0.2-kernel-java8-ibmjava
 ARG VERBOSE=false
 ARG REPOSITORIES_PROPERTIES=""
 
diff --git a/websphere-liberty_21.0.0.1-full-java8-ibmjava/server.xml b/websphere-liberty_21.0.0.2-full-java8-ibmjava/server.xml
similarity index 100%
rename from websphere-liberty_21.0.0.1-full-java8-ibmjava/server.xml
rename to websphere-liberty_21.0.0.2-full-java8-ibmjava/server.xml
diff --git a/websphere-liberty_21.0.0.1-kernel-java11-openj9/Dockerfile.ubuntu.adoptopenjdk11 b/websphere-liberty_21.0.0.2-kernel-java11-openj9/Dockerfile.ubuntu.adoptopenjdk11
similarity index 88%
rename from websphere-liberty_21.0.0.1-kernel-java11-openj9/Dockerfile.ubuntu.adoptopenjdk11
rename to websphere-liberty_21.0.0.2-kernel-java11-openj9/Dockerfile.ubuntu.adoptopenjdk11
index 7163da9..4ba954f 100644
--- a/websphere-liberty_21.0.0.1-kernel-java11-openj9/Dockerfile.ubuntu.adoptopenjdk11
+++ b/websphere-liberty_21.0.0.2-kernel-java11-openj9/Dockerfile.ubuntu.adoptopenjdk11
@@ -16,21 +16,21 @@ FROM adoptopenjdk:11-jre-openj9
 
 ARG VERBOSE=false
 ARG OPENJ9_SCC=true
-ARG EN_SHA=010fb297a252511538e412763f850437f862318c438c2755babfb071374e8bc1
-ARG NON_IBM_SHA=17219608c92e0a457bc2e20ab59fae823c1d546440a6dbba538d84dfe219914b
-ARG NOTICES_SHA=0dc130362d45b6a64fc07650bba077a99cf4c8cab1d886b762fc978de347843d
+ARG EN_SHA=ad2a4f13dd58fe7735d749651b9cd07f6d9f07bf0abe637640f3fb3a7956e25e
+ARG NON_IBM_SHA=1505b50145f790fd4537b678134b46412dcbf130641cbd9a4e539eb41d4bb481
+ARG NOTICES_SHA=1b88caf341b053446b5ba92a75d9f1ee3cf040ae0f13a279fa2dbaec4360b6f7
 
 LABEL org.opencontainers.image.authors="Arthur De Magalhaes, Chris Potter, Christy Jesuraj" \
       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="21.0.0.1" \
-      org.opencontainers.image.revision="cl210120210113-1459" \
+      org.opencontainers.image.version="21.0.0.2" \
+      org.opencontainers.image.revision="cl210220210209-1100" \
       org.opencontainers.image.description="This image contains the WebSphere Liberty runtime with AdoptOpenJDK with OpenJ9 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 21.0.0_01
+ENV LIBERTY_VERSION 21.0.0_02
 
 ARG LIBERTY_URL
 ARG DOWNLOAD_OPTIONS=""
@@ -62,8 +62,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"="21.0.0.1" \
-      "BuildLabel"="cl210120210113-1459"
+      "ProductVersion"="21.0.0.2" \
+      "BuildLabel"="cl210220210209-1100"
 
 # Set Path Shortcuts
 ENV LOG_DIR=/logs \
@@ -115,7 +115,8 @@ RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
     && chmod -R g+rwx /opt/ibm/wlp/output
 
 #These settings are needed so that we can run as a different user than 1001 after server warmup
-ENV RANDFILE=/tmp/.rnd
+ENV RANDFILE=/tmp/.rnd \
+    OPENJ9_JAVA_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal"
 
 USER 1001
 
diff --git a/websphere-liberty_21.0.0.1-kernel-java11-openj9/fixes/.gitkeep b/websphere-liberty_21.0.0.2-kernel-java11-openj9/fixes/.gitkeep
similarity index 100%
rename from websphere-liberty_21.0.0.1-kernel-java11-openj9/fixes/.gitkeep
rename to websphere-liberty_21.0.0.2-kernel-java11-openj9/fixes/.gitkeep
diff --git a/websphere-liberty_21.0.0.1-kernel-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml b/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
similarity index 100%
rename from websphere-liberty_21.0.0.1-kernel-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
rename to websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
diff --git a/websphere-liberty_21.0.0.1-kernel-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml b/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
similarity index 100%
rename from websphere-liberty_21.0.0.1-kernel-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
rename to websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
diff --git a/websphere-liberty_21.0.0.1-kernel-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml b/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
similarity index 100%
rename from websphere-liberty_21.0.0.1-kernel-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
rename to websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
diff --git a/websphere-liberty_21.0.0.1-kernel-java11-openj9/helpers/build/configuration_snippets/http-endpoint.xml b/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/http-endpoint.xml
similarity index 100%
rename from websphere-liberty_21.0.0.1-kernel-java11-openj9/helpers/build/configuration_snippets/http-endpoint.xml
rename to websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/http-endpoint.xml
diff --git a/websphere-liberty_21.0.0.1-kernel-java11-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml b/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml
similarity index 100%
rename from websphere-liberty_21.0.0.1-kernel-java11-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml
rename to websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml
diff --git a/websphere-liberty_21.0.0.1-kernel-java11-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml b/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml
similarity index 100%
rename from websphere-liberty_21.0.0.1-kernel-java11-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml
rename to websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml
diff --git a/websphere-liberty_21.0.0.1-kernel-java11-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml b/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
similarity index 100%
rename from websphere-liberty_21.0.0.1-kernel-java11-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
rename to websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
diff --git a/websphere-liberty_21.0.0.1-kernel-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
similarity index 100%
rename from websphere-liberty_21.0.0.1-kernel-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
rename to websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
diff --git a/websphere-liberty_21.0.0.1-kernel-java11-openj9/helpers/build/configuration_snippets/jms-endpoint.xml b/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/jms-endpoint.xml
similarity index 100%
rename from websphere-liberty_21.0.0.1-kernel-java11-openj9/helpers/build/configuration_snippets/jms-endpoint.xml
rename to websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/jms-endpoint.xml
diff --git a/websphere-liberty_21.0.0.1-kernel-java11-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml b/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
similarity index 100%
rename from websphere-liberty_21.0.0.1-kernel-java11-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
rename to websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
diff --git a/websphere-liberty_21.0.0.1-kernel-java11-openj9/helpers/build/configuration_snippets/keystore.xml b/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/keystore.xml
similarity index 100%
rename from websphere-liberty_21.0.0.1-kernel-java11-openj9/helpers/build/configuration_snippets/keystore.xml
rename to websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/keystore.xml
diff --git a/websphere-liberty_21.0.0.1-kernel-java11-openj9/helpers/build/configuration_snippets/mp-health-check.xml b/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/mp-health-check.xml
similarity index 100%
rename from websphere-liberty_21.0.0.1-kernel-java11-openj9/helpers/build/configuration_snippets/mp-health-check.xml
rename to websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/mp-health-check.xml
diff --git a/websphere-liberty_21.0.0.1-kernel-java11-openj9/helpers/build/configuration_snippets/mp-monitoring.xml b/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/mp-monitoring.xml
similarity index 100%
rename from websphere-liberty_21.0.0.1-kernel-java11-openj9/helpers/build/configuration_snippets/mp-monitoring.xml
rename to websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/mp-monitoring.xml
diff --git a/websphere-liberty_21.0.0.1-kernel-java11-openj9/helpers/build/configuration_snippets/oidc-config.xml b/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/oidc-config.xml
similarity index 100%
rename from websphere-liberty_21.0.0.1-kernel-java11-openj9/helpers/build/configuration_snippets/oidc-config.xml
rename to websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/oidc-config.xml
diff --git a/websphere-liberty_21.0.0.1-kernel-java11-openj9/helpers/build/configuration_snippets/oidc.xml b/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/oidc.xml
similarity index 100%
rename from websphere-liberty_21.0.0.1-kernel-java11-openj9/helpers/build/configuration_snippets/oidc.xml
rename to websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/oidc.xml
diff --git a/websphere-liberty_21.0.0.1-kernel-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml b/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml
similarity index 100%
rename from websphere-liberty_21.0.0.1-kernel-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml
rename to websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml
diff --git a/websphere-liberty_21.0.0.1-kernel-java11-openj9/helpers/build/configuration_snippets/sso-features.xml b/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/sso-features.xml
similarity index 100%
rename from websphere-liberty_21.0.0.1-kernel-java11-openj9/helpers/build/configuration_snippets/sso-features.xml
rename to websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/sso-features.xml
diff --git a/websphere-liberty_21.0.0.1-kernel-java11-openj9/helpers/build/configuration_snippets/sso-github.xml b/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/sso-github.xml
similarity index 100%
rename from websphere-liberty_21.0.0.1-kernel-java11-openj9/helpers/build/configuration_snippets/sso-github.xml
rename to websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/sso-github.xml
diff --git a/websphere-liberty_21.0.0.1-kernel-java11-openj9/helpers/build/configuration_snippets/sso-google.xml b/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/sso-google.xml
similarity index 100%
rename from websphere-liberty_21.0.0.1-kernel-java11-openj9/helpers/build/configuration_snippets/sso-google.xml
rename to websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/sso-google.xml
diff --git a/websphere-liberty_21.0.0.1-kernel-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml b/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
similarity index 100%
rename from websphere-liberty_21.0.0.1-kernel-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
rename to websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
diff --git a/websphere-liberty_21.0.0.1-kernel-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml b/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
similarity index 100%
rename from websphere-liberty_21.0.0.1-kernel-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
rename to websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
diff --git a/websphere-liberty_21.0.0.1-kernel-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml b/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml
similarity index 100%
rename from websphere-liberty_21.0.0.1-kernel-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml
rename to websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml
diff --git a/websphere-liberty_21.0.0.1-kernel-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml b/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml
similarity index 100%
rename from websphere-liberty_21.0.0.1-kernel-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml
rename to websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml
diff --git a/websphere-liberty_21.0.0.1-kernel-java11-openj9/helpers/build/configuration_snippets/tls.xml b/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/tls.xml
similarity index 100%
rename from websphere-liberty_21.0.0.1-kernel-java11-openj9/helpers/build/configuration_snippets/tls.xml
rename to websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/tls.xml
diff --git a/websphere-liberty_21.0.0.1-kernel-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml b/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml
similarity index 100%
rename from websphere-liberty_21.0.0.1-kernel-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml
rename to websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml
diff --git a/websphere-liberty_21.0.0.1-kernel-java11-openj9/helpers/build/configuration_snippets/truststore.xml b/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/truststore.xml
similarity index 100%
rename from websphere-liberty_21.0.0.1-kernel-java11-openj9/helpers/build/configuration_snippets/truststore.xml
rename to websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/truststore.xml
diff --git a/websphere-liberty_21.0.0.1-kernel-java11-openj9/helpers/build/configure.sh b/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configure.sh
similarity index 100%
rename from websphere-liberty_21.0.0.1-kernel-java11-openj9/helpers/build/configure.sh
rename to websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configure.sh
diff --git a/websphere-liberty_21.0.0.1-kernel-java11-openj9/helpers/build/infinispan-client-setup.sh b/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/infinispan-client-setup.sh
similarity index 100%
rename from websphere-liberty_21.0.0.1-kernel-java11-openj9/helpers/build/infinispan-client-setup.sh
rename to websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/infinispan-client-setup.sh
diff --git a/websphere-liberty_21.0.0.1-kernel-java11-openj9/helpers/build/populate_scc.sh b/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/populate_scc.sh
similarity index 100%
rename from websphere-liberty_21.0.0.1-kernel-java11-openj9/helpers/build/populate_scc.sh
rename to websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/populate_scc.sh
diff --git a/websphere-liberty_21.0.0.1-kernel-java11-openj9/helpers/runtime/docker-server.sh b/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/runtime/docker-server.sh
similarity index 100%
rename from websphere-liberty_21.0.0.1-kernel-java11-openj9/helpers/runtime/docker-server.sh
rename to websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/runtime/docker-server.sh
diff --git a/websphere-liberty_21.0.0.1-kernel-java8-ibmjava/Dockerfile.ubuntu.ibmjava8 b/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/Dockerfile.ubuntu.ibmjava8
similarity index 92%
rename from websphere-liberty_21.0.0.1-kernel-java8-ibmjava/Dockerfile.ubuntu.ibmjava8
rename to websphere-liberty_21.0.0.2-kernel-java8-ibmjava/Dockerfile.ubuntu.ibmjava8
index 0a52878..7b10433 100644
--- a/websphere-liberty_21.0.0.1-kernel-java8-ibmjava/Dockerfile.ubuntu.ibmjava8
+++ b/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/Dockerfile.ubuntu.ibmjava8
@@ -16,21 +16,21 @@ FROM ibmjava:8-jre
 
 ARG VERBOSE=false
 ARG OPENJ9_SCC=true
-ARG EN_SHA=010fb297a252511538e412763f850437f862318c438c2755babfb071374e8bc1
-ARG NON_IBM_SHA=17219608c92e0a457bc2e20ab59fae823c1d546440a6dbba538d84dfe219914b
-ARG NOTICES_SHA=0dc130362d45b6a64fc07650bba077a99cf4c8cab1d886b762fc978de347843d
+ARG EN_SHA=ad2a4f13dd58fe7735d749651b9cd07f6d9f07bf0abe637640f3fb3a7956e25e
+ARG NON_IBM_SHA=1505b50145f790fd4537b678134b46412dcbf130641cbd9a4e539eb41d4bb481
+ARG NOTICES_SHA=1b88caf341b053446b5ba92a75d9f1ee3cf040ae0f13a279fa2dbaec4360b6f7
 
 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="21.0.0.1" \
-      org.opencontainers.image.revision="cl210120210113-1459" \
+      org.opencontainers.image.version="21.0.0.2" \
+      org.opencontainers.image.revision="cl210220210209-1100" \
       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 21.0.0_01
+ENV LIBERTY_VERSION 21.0.0_02
 
 ARG LIBERTY_URL
 ARG DOWNLOAD_OPTIONS=""
@@ -62,8 +62,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"="21.0.0.1" \
-      "BuildLabel"="cl210120210113-1459"
+      "ProductVersion"="21.0.0.2" \
+      "BuildLabel"="cl210220210209-1100"
 
 # Set Path Shortcuts
 ENV LOG_DIR=/logs \
diff --git a/websphere-liberty_21.0.0.1-kernel-java8-ibmjava/fixes/.gitkeep b/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/fixes/.gitkeep
similarity index 100%
rename from websphere-liberty_21.0.0.1-kernel-java8-ibmjava/fixes/.gitkeep
rename to websphere-liberty_21.0.0.2-kernel-java8-ibmjava/fixes/.gitkeep
diff --git a/websphere-liberty_21.0.0.1-kernel-java8-ibmjava/helpers/build/configuration_snippets/hazelcast-client.xml b/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/hazelcast-client.xml
similarity index 100%
rename from websphere-liberty_21.0.0.1-kernel-java8-ibmjava/helpers/build/configuration_snippets/hazelcast-client.xml
rename to websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/hazelcast-client.xml
diff --git a/websphere-liberty_21.0.0.1-kernel-java8-ibmjava/helpers/build/configuration_snippets/hazelcast-embedded.xml b/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/hazelcast-embedded.xml
similarity index 100%
rename from websphere-liberty_21.0.0.1-kernel-java8-ibmjava/helpers/build/configuration_snippets/hazelcast-embedded.xml
rename to websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/hazelcast-embedded.xml
diff --git a/websphere-liberty_21.0.0.1-kernel-java8-ibmjava/helpers/build/configuration_snippets/hazelcast-sessioncache.xml b/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
similarity index 100%
rename from websphere-liberty_21.0.0.1-kernel-java8-ibmjava/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
rename to websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
diff --git a/websphere-liberty_21.0.0.1-kernel-java8-ibmjava/helpers/build/configuration_snippets/http-endpoint.xml b/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/http-endpoint.xml
similarity index 100%
rename from websphere-liberty_21.0.0.1-kernel-java8-ibmjava/helpers/build/configuration_snippets/http-endpoint.xml
rename to websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/http-endpoint.xml
diff --git a/websphere-liberty_21.0.0.1-kernel-java8-ibmjava/helpers/build/configuration_snippets/http-ssl-endpoint.xml b/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/http-ssl-endpoint.xml
similarity index 100%
rename from websphere-liberty_21.0.0.1-kernel-java8-ibmjava/helpers/build/configuration_snippets/http-ssl-endpoint.xml
rename to websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/http-ssl-endpoint.xml
diff --git a/websphere-liberty_21.0.0.1-kernel-java8-ibmjava/helpers/build/configuration_snippets/iiop-endpoint.xml b/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/iiop-endpoint.xml
similarity index 100%
rename from websphere-liberty_21.0.0.1-kernel-java8-ibmjava/helpers/build/configuration_snippets/iiop-endpoint.xml
rename to websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/iiop-endpoint.xml
diff --git a/websphere-liberty_21.0.0.1-kernel-java8-ibmjava/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml b/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
similarity index 100%
rename from websphere-liberty_21.0.0.1-kernel-java8-ibmjava/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
rename to websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
diff --git a/websphere-liberty_21.0.0.1-kernel-java8-ibmjava/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
similarity index 100%
rename from websphere-liberty_21.0.0.1-kernel-java8-ibmjava/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
rename to websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
diff --git a/websphere-liberty_21.0.0.1-kernel-java8-ibmjava/helpers/build/configuration_snippets/jms-endpoint.xml b/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/jms-endpoint.xml
similarity index 100%
rename from websphere-liberty_21.0.0.1-kernel-java8-ibmjava/helpers/build/configuration_snippets/jms-endpoint.xml
rename to websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/jms-endpoint.xml
diff --git a/websphere-liberty_21.0.0.1-kernel-java8-ibmjava/helpers/build/configuration_snippets/jms-ssl-endpoint.xml b/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
similarity index 100%
rename from websphere-liberty_21.0.0.1-kernel-java8-ibmjava/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
rename to websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
diff --git a/websphere-liberty_21.0.0.1-kernel-java8-ibmjava/helpers/build/configuration_snippets/keystore.xml b/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/keystore.xml
similarity index 100%
rename from websphere-liberty_21.0.0.1-kernel-java8-ibmjava/helpers/build/configuration_snippets/keystore.xml
rename to websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/keystore.xml
diff --git a/websphere-liberty_21.0.0.1-kernel-java8-ibmjava/helpers/build/configuration_snippets/mp-health-check.xml b/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/mp-health-check.xml
similarity index 100%
rename from websphere-liberty_21.0.0.1-kernel-java8-ibmjava/helpers/build/configuration_snippets/mp-health-check.xml
rename to websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/mp-health-check.xml
diff --git a/websphere-liberty_21.0.0.1-kernel-java8-ibmjava/helpers/build/configuration_snippets/mp-monitoring.xml b/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/mp-monitoring.xml
similarity index 100%
rename from websphere-liberty_21.0.0.1-kernel-java8-ibmjava/helpers/build/configuration_snippets/mp-monitoring.xml
rename to websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/mp-monitoring.xml
diff --git a/websphere-liberty_21.0.0.1-kernel-java8-ibmjava/helpers/build/configuration_snippets/oidc-config.xml b/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/oidc-config.xml
similarity index 100%
rename from websphere-liberty_21.0.0.1-kernel-java8-ibmjava/helpers/build/configuration_snippets/oidc-config.xml
rename to websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/oidc-config.xml
diff --git a/websphere-liberty_21.0.0.1-kernel-java8-ibmjava/helpers/build/configuration_snippets/oidc.xml b/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/oidc.xml
similarity index 100%
rename from websphere-liberty_21.0.0.1-kernel-java8-ibmjava/helpers/build/configuration_snippets/oidc.xml
rename to websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/oidc.xml
diff --git a/websphere-liberty_21.0.0.1-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-facebook.xml b/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-facebook.xml
similarity index 100%
rename from websphere-liberty_21.0.0.1-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-facebook.xml
rename to websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-facebook.xml
diff --git a/websphere-liberty_21.0.0.1-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-features.xml b/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-features.xml
similarity index 100%
rename from websphere-liberty_21.0.0.1-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-features.xml
rename to websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-features.xml
diff --git a/websphere-liberty_21.0.0.1-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-github.xml b/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-github.xml
similarity index 100%
rename from websphere-liberty_21.0.0.1-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-github.xml
rename to websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-github.xml
diff --git a/websphere-liberty_21.0.0.1-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-google.xml b/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-google.xml
similarity index 100%
rename from websphere-liberty_21.0.0.1-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-google.xml
rename to websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-google.xml
diff --git a/websphere-liberty_21.0.0.1-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-linkedin.xml b/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-linkedin.xml
similarity index 100%
rename from websphere-liberty_21.0.0.1-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-linkedin.xml
rename to websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-linkedin.xml
diff --git a/websphere-liberty_21.0.0.1-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-oauth2.xml b/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-oauth2.xml
similarity index 100%
rename from websphere-liberty_21.0.0.1-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-oauth2.xml
rename to websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-oauth2.xml
diff --git a/websphere-liberty_21.0.0.1-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-oidc.xml b/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-oidc.xml
similarity index 100%
rename from websphere-liberty_21.0.0.1-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-oidc.xml
rename to websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-oidc.xml
diff --git a/websphere-liberty_21.0.0.1-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-twitter.xml b/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-twitter.xml
similarity index 100%
rename from websphere-liberty_21.0.0.1-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-twitter.xml
rename to websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-twitter.xml
diff --git a/websphere-liberty_21.0.0.1-kernel-java8-ibmjava/helpers/build/configuration_snippets/tls.xml b/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/tls.xml
similarity index 100%
rename from websphere-liberty_21.0.0.1-kernel-java8-ibmjava/helpers/build/configuration_snippets/tls.xml
rename to websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/tls.xml
diff --git a/websphere-liberty_21.0.0.1-kernel-java8-ibmjava/helpers/build/configuration_snippets/trustDefault.xml b/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/trustDefault.xml
similarity index 100%
rename from websphere-liberty_21.0.0.1-kernel-java8-ibmjava/helpers/build/configuration_snippets/trustDefault.xml
rename to websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/trustDefault.xml
diff --git a/websphere-liberty_21.0.0.1-kernel-java8-ibmjava/helpers/build/configuration_snippets/truststore.xml b/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/truststore.xml
similarity index 100%
rename from websphere-liberty_21.0.0.1-kernel-java8-ibmjava/helpers/build/configuration_snippets/truststore.xml
rename to websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/truststore.xml
diff --git a/websphere-liberty_21.0.0.1-kernel-java8-ibmjava/helpers/build/configure.sh b/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configure.sh
similarity index 100%
rename from websphere-liberty_21.0.0.1-kernel-java8-ibmjava/helpers/build/configure.sh
rename to websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configure.sh
diff --git a/websphere-liberty_21.0.0.1-kernel-java8-ibmjava/helpers/build/infinispan-client-setup.sh b/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/infinispan-client-setup.sh
similarity index 100%
rename from websphere-liberty_21.0.0.1-kernel-java8-ibmjava/helpers/build/infinispan-client-setup.sh
rename to websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/infinispan-client-setup.sh
diff --git a/websphere-liberty_21.0.0.1-kernel-java8-ibmjava/helpers/build/populate_scc.sh b/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/populate_scc.sh
similarity index 100%
rename from websphere-liberty_21.0.0.1-kernel-java8-ibmjava/helpers/build/populate_scc.sh
rename to websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/populate_scc.sh
diff --git a/websphere-liberty_21.0.0.1-kernel-java8-ibmjava/helpers/runtime/docker-server.sh b/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/runtime/docker-server.sh
similarity index 100%
rename from websphere-liberty_21.0.0.1-kernel-java8-ibmjava/helpers/runtime/docker-server.sh
rename to websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/runtime/docker-server.sh
diff --git a/websphere-liberty_kernel-java11-openj9/Dockerfile.ubuntu.adoptopenjdk11 b/websphere-liberty_kernel-java11-openj9/Dockerfile.ubuntu.adoptopenjdk11
index 7163da9..4ba954f 100644
--- a/websphere-liberty_kernel-java11-openj9/Dockerfile.ubuntu.adoptopenjdk11
+++ b/websphere-liberty_kernel-java11-openj9/Dockerfile.ubuntu.adoptopenjdk11
@@ -16,21 +16,21 @@ FROM adoptopenjdk:11-jre-openj9
 
 ARG VERBOSE=false
 ARG OPENJ9_SCC=true
-ARG EN_SHA=010fb297a252511538e412763f850437f862318c438c2755babfb071374e8bc1
-ARG NON_IBM_SHA=17219608c92e0a457bc2e20ab59fae823c1d546440a6dbba538d84dfe219914b
-ARG NOTICES_SHA=0dc130362d45b6a64fc07650bba077a99cf4c8cab1d886b762fc978de347843d
+ARG EN_SHA=ad2a4f13dd58fe7735d749651b9cd07f6d9f07bf0abe637640f3fb3a7956e25e
+ARG NON_IBM_SHA=1505b50145f790fd4537b678134b46412dcbf130641cbd9a4e539eb41d4bb481
+ARG NOTICES_SHA=1b88caf341b053446b5ba92a75d9f1ee3cf040ae0f13a279fa2dbaec4360b6f7
 
 LABEL org.opencontainers.image.authors="Arthur De Magalhaes, Chris Potter, Christy Jesuraj" \
       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="21.0.0.1" \
-      org.opencontainers.image.revision="cl210120210113-1459" \
+      org.opencontainers.image.version="21.0.0.2" \
+      org.opencontainers.image.revision="cl210220210209-1100" \
       org.opencontainers.image.description="This image contains the WebSphere Liberty runtime with AdoptOpenJDK with OpenJ9 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 21.0.0_01
+ENV LIBERTY_VERSION 21.0.0_02
 
 ARG LIBERTY_URL
 ARG DOWNLOAD_OPTIONS=""
@@ -62,8 +62,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"="21.0.0.1" \
-      "BuildLabel"="cl210120210113-1459"
+      "ProductVersion"="21.0.0.2" \
+      "BuildLabel"="cl210220210209-1100"
 
 # Set Path Shortcuts
 ENV LOG_DIR=/logs \
@@ -115,7 +115,8 @@ RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
     && chmod -R g+rwx /opt/ibm/wlp/output
 
 #These settings are needed so that we can run as a different user than 1001 after server warmup
-ENV RANDFILE=/tmp/.rnd
+ENV RANDFILE=/tmp/.rnd \
+    OPENJ9_JAVA_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal"
 
 USER 1001
 
diff --git a/websphere-liberty_kernel/Dockerfile.ubuntu.ibmjava8 b/websphere-liberty_kernel/Dockerfile.ubuntu.ibmjava8
index 0a52878..7b10433 100644
--- a/websphere-liberty_kernel/Dockerfile.ubuntu.ibmjava8
+++ b/websphere-liberty_kernel/Dockerfile.ubuntu.ibmjava8
@@ -16,21 +16,21 @@ FROM ibmjava:8-jre
 
 ARG VERBOSE=false
 ARG OPENJ9_SCC=true
-ARG EN_SHA=010fb297a252511538e412763f850437f862318c438c2755babfb071374e8bc1
-ARG NON_IBM_SHA=17219608c92e0a457bc2e20ab59fae823c1d546440a6dbba538d84dfe219914b
-ARG NOTICES_SHA=0dc130362d45b6a64fc07650bba077a99cf4c8cab1d886b762fc978de347843d
+ARG EN_SHA=ad2a4f13dd58fe7735d749651b9cd07f6d9f07bf0abe637640f3fb3a7956e25e
+ARG NON_IBM_SHA=1505b50145f790fd4537b678134b46412dcbf130641cbd9a4e539eb41d4bb481
+ARG NOTICES_SHA=1b88caf341b053446b5ba92a75d9f1ee3cf040ae0f13a279fa2dbaec4360b6f7
 
 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="21.0.0.1" \
-      org.opencontainers.image.revision="cl210120210113-1459" \
+      org.opencontainers.image.version="21.0.0.2" \
+      org.opencontainers.image.revision="cl210220210209-1100" \
       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 21.0.0_01
+ENV LIBERTY_VERSION 21.0.0_02
 
 ARG LIBERTY_URL
 ARG DOWNLOAD_OPTIONS=""
@@ -62,8 +62,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"="21.0.0.1" \
-      "BuildLabel"="cl210120210113-1459"
+      "ProductVersion"="21.0.0.2" \
+      "BuildLabel"="cl210220210209-1100"
 
 # Set Path Shortcuts
 ENV LOG_DIR=/logs \

@yosifkit yosifkit merged commit aa789e9 into docker-library:master Feb 22, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
library/open-liberty library/websphere-liberty
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@crpotter @yosifkit