OpenLiberty · SteveSamJacob19 · Apr 30, 2025 · Apr 11, 2025 · Apr 11, 2025 · Apr 11, 2025
diff --git a/docker/Dockerfile.demo b/docker/Dockerfile.demo
@@ -49,7 +49,7 @@ RUN ./mvnw -B -Dhttps.protocols=TLSv1.2 compile war:exploded
 #
 #
 #
-FROM icr.io/appcafe/open-liberty:25.0.0.3-kernel-slim-java8-openj9-ubi as runtime
+FROM icr.io/appcafe/open-liberty:25.0.0.4-kernel-slim-java8-openj9-ubi as runtime
 ENV SEC_TLS_TRUSTDEFAULTCERTS true
 
 COPY --chown=1001:0 src/main/wlp/server.xml /config/server.xml

diff --git a/docker/Dockerfile.draft b/docker/Dockerfile.draft
@@ -50,7 +50,7 @@ RUN ./mvnw -B -Dhttps.protocols=TLSv1.2 compile war:exploded
 #
 #
 #
-FROM icr.io/appcafe/open-liberty:25.0.0.3-kernel-slim-java8-openj9-ubi as runtime
+FROM icr.io/appcafe/open-liberty:25.0.0.4-kernel-slim-java8-openj9-ubi as runtime
 ENV SEC_TLS_TRUSTDEFAULTCERTS true
 
 COPY --chown=1001:0 src/main/wlp/server.xml /config/server.xml

diff --git a/docker/Dockerfile.prod b/docker/Dockerfile.prod
@@ -68,7 +68,7 @@ COPY --from=docs --chown=1001:0 /temp-docs/docs /target/openliberty-website-1.0-
 #
 #
 #
-FROM icr.io/appcafe/open-liberty:25.0.0.3-kernel-slim-java8-openj9-ubi as runtime
+FROM icr.io/appcafe/open-liberty:25.0.0.4-kernel-slim-java8-openj9-ubi as runtime
 ENV SEC_TLS_TRUSTDEFAULTCERTS true
 
 COPY --chown=1001:0 src/main/wlp/server.xml /config/server.xml

diff --git a/docker/Dockerfile.staging b/docker/Dockerfile.staging
@@ -65,7 +65,7 @@ COPY --from=docs --chown=1001:0 /temp-docs/docs /target/openliberty-website-1.0-
 #
 #
 #
-FROM icr.io/appcafe/open-liberty:25.0.0.3-kernel-slim-java8-openj9-ubi as runtime
+FROM icr.io/appcafe/open-liberty:25.0.0.4-kernel-slim-java8-openj9-ubi as runtime
 ENV SEC_TLS_TRUSTDEFAULTCERTS true
 
 COPY --chown=1001:0 src/main/wlp/server.xml /config/server.xml

diff --git a/docker/blogs/Dockerfile.blogs.draft b/docker/blogs/Dockerfile.blogs.draft
@@ -42,7 +42,7 @@ RUN ./mvnw -B -Dhttps.protocols=TLSv1.2 compile war:exploded
 #
 #
 #
-FROM icr.io/appcafe/open-liberty:25.0.0.3-kernel-slim-java8-openj9-ubi as runtime
+FROM icr.io/appcafe/open-liberty:25.0.0.4-kernel-slim-java8-openj9-ubi as runtime
 ENV SEC_TLS_TRUSTDEFAULTCERTS true
 
 COPY --chown=1001:0 src/main/wlp/server.xml /config/server.xml

diff --git a/docker/blogs/Dockerfile.blogs.staging b/docker/blogs/Dockerfile.blogs.staging
@@ -42,7 +42,7 @@ RUN ./mvnw -B -Dhttps.protocols=TLSv1.2 compile war:exploded
 #
 #
 #
-FROM icr.io/appcafe/open-liberty:25.0.0.3-kernel-slim-java8-openj9-ubi as runtime
+FROM icr.io/appcafe/open-liberty:25.0.0.4-kernel-slim-java8-openj9-ubi as runtime
 ENV SEC_TLS_TRUSTDEFAULTCERTS true
 
 COPY --chown=1001:0 src/main/wlp/server.xml /config/server.xml

diff --git a/docker/certifications/Dockerfile.certifications.draft b/docker/certifications/Dockerfile.certifications.draft
@@ -42,7 +42,7 @@ RUN ./mvnw -B -Dhttps.protocols=TLSv1.2 compile war:exploded
 #
 #
 #
-FROM icr.io/appcafe/open-liberty:25.0.0.3-kernel-slim-java8-openj9-ubi as runtime
+FROM icr.io/appcafe/open-liberty:25.0.0.4-kernel-slim-java8-openj9-ubi as runtime
 ENV SEC_TLS_TRUSTDEFAULTCERTS true
 
 COPY --chown=1001:0 src/main/wlp/server.xml /config/server.xml

diff --git a/docker/certifications/Dockerfile.certifications.staging b/docker/certifications/Dockerfile.certifications.staging
@@ -42,7 +42,7 @@ RUN ./mvnw -B -Dhttps.protocols=TLSv1.2 compile war:exploded
 #
 #
 #
-FROM icr.io/appcafe/open-liberty:25.0.0.3-kernel-slim-java8-openj9-ubi as runtime
+FROM icr.io/appcafe/open-liberty:25.0.0.4-kernel-slim-java8-openj9-ubi as runtime
 ENV SEC_TLS_TRUSTDEFAULTCERTS true
 
 COPY --chown=1001:0 src/main/wlp/server.xml /config/server.xml

diff --git a/docker/docs/Dockerfile.docs.draft b/docker/docs/Dockerfile.docs.draft
@@ -54,7 +54,7 @@ RUN ./mvnw -B -Dhttps.protocols=TLSv1.2 compile war:exploded
 #
 #
 #
-FROM icr.io/appcafe/open-liberty:25.0.0.3-kernel-slim-java8-openj9-ubi as runtime
+FROM icr.io/appcafe/open-liberty:25.0.0.4-kernel-slim-java8-openj9-ubi as runtime
 ENV SEC_TLS_TRUSTDEFAULTCERTS true
 
 COPY --chown=1001:0 src/main/wlp/server.xml /config/server.xml

diff --git a/docker/docs/Dockerfile.docs.staging b/docker/docs/Dockerfile.docs.staging
@@ -54,7 +54,7 @@ RUN ./mvnw -B -Dhttps.protocols=TLSv1.2 compile war:exploded
 #
 #
 #
-FROM icr.io/appcafe/open-liberty:25.0.0.3-kernel-slim-java8-openj9-ubi as runtime
+FROM icr.io/appcafe/open-liberty:25.0.0.4-kernel-slim-java8-openj9-ubi as runtime
 ENV SEC_TLS_TRUSTDEFAULTCERTS true
 
 COPY --chown=1001:0 src/main/wlp/server.xml /config/server.xml

diff --git a/docker/guides/Dockerfile.guides.draft b/docker/guides/Dockerfile.guides.draft
@@ -42,7 +42,7 @@ RUN ./mvnw -B -Dhttps.protocols=TLSv1.2 compile war:exploded
 #
 #
 #
-FROM icr.io/appcafe/open-liberty:25.0.0.3-kernel-slim-java8-openj9-ubi as runtime
+FROM icr.io/appcafe/open-liberty:25.0.0.4-kernel-slim-java8-openj9-ubi as runtime
 ENV SEC_TLS_TRUSTDEFAULTCERTS true
 
 COPY --chown=1001:0 src/main/wlp/server.xml /config/server.xml

diff --git a/docker/guides/Dockerfile.guides.staging b/docker/guides/Dockerfile.guides.staging
@@ -42,7 +42,7 @@ RUN ./mvnw -B -Dhttps.protocols=TLSv1.2 compile war:exploded
 #
 #
 #
-FROM icr.io/appcafe/open-liberty:25.0.0.3-kernel-slim-java8-openj9-ubi as runtime
+FROM icr.io/appcafe/open-liberty:25.0.0.4-kernel-slim-java8-openj9-ubi as runtime
 ENV SEC_TLS_TRUSTDEFAULTCERTS true
 
 COPY --chown=1001:0 src/main/wlp/server.xml /config/server.xml

diff --git a/docker/ui-only/Dockerfile.ui-only b/docker/ui-only/Dockerfile.ui-only
@@ -41,7 +41,7 @@ RUN ./mvnw -B -Dhttps.protocols=TLSv1.2 compile war:exploded
 #
 #
 #
-FROM icr.io/appcafe/open-liberty:25.0.0.3-kernel-slim-java8-openj9-ubi as runtime
+FROM icr.io/appcafe/open-liberty:25.0.0.4-kernel-slim-java8-openj9-ubi as runtime
 ENV SEC_TLS_TRUSTDEFAULTCERTS true
 
 COPY --chown=1001:0 src/main/wlp/server.xml /config/server.xml

diff --git a/scripts/build/antora_build_docs.sh b/scripts/build/antora_build_docs.sh
@@ -2,10 +2,4 @@
 echo "Using the Antora playbook to generate what content to display for docs"
 echo "npm analysis antora_build" 
 npm ls -g --depth=0
-if [ "$PROD_SITE" = true ]
-  then    
-    # Enable google analytics in docs
-    antora --fetch --stacktrace --key google-analytics=G-PXYTWCYE18 src/main/content/docs/antora-playbook.yml
-  else
-    antora --fetch --stacktrace src/main/content/docs/antora-playbook.yml
-fi
+antora --fetch --stacktrace src/main/content/docs/antora-playbook.yml
diff --git a/scripts/build/jekyll.sh b/scripts/build/jekyll.sh
@@ -80,7 +80,7 @@ mkdir -p target/jekyll-webapp
 # Enable google analytics if ga is true
 if [ "$PROD_SITE" = true ]
   then 
-    jekyll build --source src/main/content --config src/main/content/_config.yml,src/main/content/_google_analytics.yml --destination target/jekyll-webapp 
+    jekyll build --source src/main/content --config src/main/content/_config.yml --destination target/jekyll-webapp 
   else
     # Set the --future flag to show blogs with date timestamps in the future
     jekyll build --future --source src/main/content --config src/main/content/_config.yml --destination target/jekyll-webapp

diff --git a/src/main/content/_assets/css/openliberty.scss b/src/main/content/_assets/css/openliberty.scss
@@ -547,6 +547,10 @@ footer {
         color: #6F7878;
     }
 
+    #footer_copyright{
+        margin-bottom: 0;
+    }
+
     .vertical_bar {
         margin: 0 4px;
     }
@@ -622,19 +626,15 @@ footer {
 
 
 #teconsent {
-    height: 40px;
-    background-color: rgb(255, 255, 255);
-    z-index: 2147483647;
-    bottom: 0px;
-    right: 0px;
-    margin: 0px;
-    padding: 0px 16px;
-    line-height: 40px;
     vertical-align: middle;
-    box-shadow: rgba(0, 0, 0, 0.1) 0px 0px 10px 3px;
     float: right;
-    margin-bottom: 10px;
-    margin-left: 10px;
+    display:contents !important;
+    a{
+        font-size: 11px;
+        color: #6F7878;
+        display: inline-block;
+        line-height: 1.5;
+    }
 }
 
 
@@ -783,4 +783,4 @@ code .conum[data-value]+b {
             opacity: 1;
         }
     }
-}
+}
diff --git a/src/main/content/_google_analytics.yml b/src/main/content/_google_analytics.yml
diff --git a/src/main/content/_i18n/en.yml b/src/main/content/_i18n/en.yml
@@ -29,7 +29,7 @@ pages:
   support: Support
   blog: Blog
 footer:
-  copyright: Copyright IBM Corp. 2017, 2024
+  copyright: Copyright IBM Corp. 2017, 2025
   privacy_policy: Privacy policy
   license: License
   logos: Logos

diff --git a/src/main/content/_i18n/ja.yml b/src/main/content/_i18n/ja.yml
@@ -29,7 +29,7 @@ pages:
   support: サポート
   blog: ブログ
 footer:
-  copyright: Copyright IBM Corp. 2017, 2024
+  copyright: Copyright IBM Corp. 2017, 2025
   privacy_policy: プライバシー・ポリシー
   license: ライセンス
   logos: ロゴ

diff --git a/src/main/content/_i18n/zh-Hans.yml b/src/main/content/_i18n/zh-Hans.yml
@@ -29,7 +29,7 @@ pages:
   support: 支持
   blog: 博客
 footer:
-  copyright: Copyright IBM Corp. 2017, 2024
+  copyright: Copyright IBM Corp. 2017, 2025
   privacy_policy: 隐私策略
   license: 许可证
   logos: 洛戈斯

diff --git a/src/main/content/_includes/footer.html b/src/main/content/_includes/footer.html
@@ -29,6 +29,8 @@
             <a id="footer_license_link" href="https://github.com/OpenLiberty/open-liberty/blob/release/LICENSE" target="_blank" rel="noopener" class="left_footer_link">{% t footer.license %}</a>
             <p class="vertical_bar">|</p>
             <a id="footer_logos_link" href="https://github.com/OpenLiberty/logos" target="_blank" rel="noopener" class="left_footer_link">{% t footer.logos %}</a>
+            <p class="vertical_bar">|</p>
+            <span id="teconsent" style="display:none"></span>
         </div>
         <div id="footer_bottom_right_section">
             <a id="footer_get_started_link" href="/start" aria-label="Open Liberty Get Started" class="right_footer_link blue_link_light_background">{% t pages.start %}</a>

diff --git a/src/main/content/_includes/google_tag_manager_head.html b/src/main/content/_includes/google_tag_manager_head.html
diff --git a/src/main/content/_includes/head.html b/src/main/content/_includes/head.html
@@ -56,10 +56,6 @@
     {% css {{css_name}} %}
   {% endfor %}
 
-  {% if jekyll.environment == 'production' and site.google_tag_manager %}
-    {% include google_tag_manager_head.html %}
-  {% endif %}
-
   <link rel="canonical" href="{{ page.url | replace:'index.html','' | absolute_url }}">
   <link rel="alternate" type="application/rss+xml" title="{{ site.title | escape }}" href="{{ "/feed.xml" | relative_url }}">  
 
@@ -77,4 +73,26 @@
   {% endif %}
 
   <script async defer src="https://buttons.github.io/buttons.js"></script>
-</head>
+  <script type="text/javascript">
+    window._ibmAnalytics = {
+        "settings": {
+            "name": "Openliberty-io-website",
+            "tealiumProfileName": "ibm-web-app"
+        },
+        "digitalData.page.services.google.enabled": true
+    };
+    digitalData = {
+        "page": {
+            "pageInfo": {
+                "ibm": {
+                "siteId": "IBM_" + _ibmAnalytics.settings.name,
+                }
+            },
+            "category": {
+                "primaryCategory": "PC100"
+            }
+        }
+    };
+  </script>
+  <script src="//1.www.s81c.com/common/stats/ibm-common.js" type="text/javascript" async="async"></script>
+</head>