From 4cfa6b9b678d8cdef1e3ab490a83885332d006c5 Mon Sep 17 00:00:00 2001
From: Will Ezell <will@dotcms.com>
Date: Fri, 9 Jan 2026 12:34:51 -0500
Subject: [PATCH 1/3] task(java): Second pr which actually moves us to Java 25.
  Do not merge this until we get PR #34264 merged and then these changes
 re-merged with main with the part1 changes.

ref: #33865
---
 .sdkmanrc                   |  2 +-
 docker/java-base/Dockerfile |  4 ++--
 parent/pom.xml              | 11 ++++++++---
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/.sdkmanrc b/.sdkmanrc
index 288c293c1461..6d94eea3cebe 100644
--- a/.sdkmanrc
+++ b/.sdkmanrc
@@ -1,3 +1,3 @@
 # sets the SDKMAN_JAVA_VERSION for dotCMS
 # this is the version of java that will be used as the base image for the docker build
-java=21.0.8-ms
+java=25.0.1-ms
diff --git a/docker/java-base/Dockerfile b/docker/java-base/Dockerfile
index 67f0128a14b6..698db3a405e3 100644
--- a/docker/java-base/Dockerfile
+++ b/docker/java-base/Dockerfile
@@ -6,7 +6,7 @@ FROM ubuntu:24.04 AS base-builder
 WORKDIR /srv
 
 # Defining default Java version, can be any java version provided by sdkman
-ARG SDKMAN_JAVA_VERSION="21.0.8-ms"
+ARG SDKMAN_JAVA_VERSION="25.0.1-ms"
 
 ENV JAVA_OUTPUT_DIR="/java"
 ENV DEBIAN_FRONTEND=noninteractive
@@ -24,7 +24,7 @@ RUN apt update && \
     apt update && \
     apt install -y --no-install-recommends postgresql-common && \
     /usr/share/postgresql-common/pgdg/apt.postgresql.org.sh -y && \
-    apt install -y --no-install-recommends postgresql-client-18 && \
+    apt install -y --no-install-recommends postgresql-client-16 && \
     apt purge -y postgresql-common gnupg && \
     /usr/bin/pg_dump --version || exit 1 && \
     rm -rf /var/lib/apt/lists/*
diff --git a/parent/pom.xml b/parent/pom.xml
index 9f08f5b69498..29db7f2f9264 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -26,7 +26,7 @@
          support new version default in environments/environment.properties and can be changed for local developer in
         environments/dev/user-dev.properties -->
         <!--suppress UnresolvedMavenProperty -->
-        <maven.compiler.release>11</maven.compiler.release>
+        <maven.compiler.release>25</maven.compiler.release>
         <maven.compiler.source>${maven.compiler.release}</maven.compiler.source>
         <maven.compiler.target>${maven.compiler.release}</maven.compiler.target>
         <maven.compiler.testSource>${maven.compiler.source}</maven.compiler.testSource>
@@ -58,6 +58,9 @@
             --add-opens java.base/sun.nio.cs=ALL-UNNAMED
             --add-opens java.base/sun.util.calendar=ALL-UNNAMED
             --add-opens java.base/sun.util.locale=ALL-UNNAMED
+            --add-opens java.base/jdk.internal.loader=ALL-UNNAMED
+            --add-opens java.base/jdk.internal.misc=ALL-UNNAMED
+            --add-opens java.base/jdk.internal.module=ALL-UNNAMED
         </java.module.args>
 
         <maven.deploy.skip>false</maven.deploy.skip>
@@ -214,7 +217,7 @@
         <environment.properties.folder>${maven.multiModuleProjectDirectory}/environments</environment.properties.folder>
         <environment.properties.defaults>${environment.properties.folder}/environment.properties</environment.properties.defaults>
         <spotless.skip>true</spotless.skip>
-        <glowroot.version>0.14.2</glowroot.version>
+        <glowroot.version>0.14.0-beta.3</glowroot.version>
         <jmeter.test.skip>true</jmeter.test.skip>
     </properties>
 
@@ -307,7 +310,7 @@
                                     </ports>
                                     <volumes>
                                         <bind>
-                                            <volume>${docker.db.volume}:/var/lib/postgresql</volume>
+                                            <volume>${docker.db.volume}:/var/lib/postgresql/data</volume>
                                         </bind>
                                     </volumes>
                                     <env>
@@ -725,6 +728,7 @@
                         -->
                         <argLine>@{argLine} -Xmx1024m
                             ${java.module.args}
+                            -Dnet.bytebuddy.experimental=true
                         </argLine>
 
                         <trimStackTrace>false</trimStackTrace>
@@ -876,6 +880,7 @@
                         <reuseForks>true</reuseForks>
                         <argLine>@{argLine} -Xmx1024m
                             ${java.module.args}
+                            -Dnet.bytebuddy.experimental=true
                         </argLine>
 
                         <systemPropertyVariables/>

From 54ea1b47d043e23f8f633a5fa726ee38d091de4c Mon Sep 17 00:00:00 2001
From: Will Ezell <will@dotcms.com>
Date: Fri, 9 Jan 2026 12:51:24 -0500
Subject: [PATCH 2/3] task(java): Second pr which actually moves us to Java 25.
  Do not merge this until we get PR #34264 merged and then these changes
 re-merged with main with the part1 changes.

ref: #33865
---
 docker/java-base/Dockerfile | 2 +-
 parent/pom.xml              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/java-base/Dockerfile b/docker/java-base/Dockerfile
index 698db3a405e3..a4ead8ed2158 100644
--- a/docker/java-base/Dockerfile
+++ b/docker/java-base/Dockerfile
@@ -24,7 +24,7 @@ RUN apt update && \
     apt update && \
     apt install -y --no-install-recommends postgresql-common && \
     /usr/share/postgresql-common/pgdg/apt.postgresql.org.sh -y && \
-    apt install -y --no-install-recommends postgresql-client-16 && \
+    apt install -y --no-install-recommends postgresql-client-18 && \
     apt purge -y postgresql-common gnupg && \
     /usr/bin/pg_dump --version || exit 1 && \
     rm -rf /var/lib/apt/lists/*
diff --git a/parent/pom.xml b/parent/pom.xml
index 29db7f2f9264..35e2166c740f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -310,7 +310,7 @@
                                     </ports>
                                     <volumes>
                                         <bind>
-                                            <volume>${docker.db.volume}:/var/lib/postgresql/data</volume>
+                                            <volume>${docker.db.volume}:/var/lib/postgresql</volume>
                                         </bind>
                                     </volumes>
                                     <env>

From b963df9bcb64820c1f0f9f6c475fd9d7173782d6 Mon Sep 17 00:00:00 2001
From: Will Ezell <will@dotcms.com>
Date: Fri, 16 Jan 2026 16:23:18 -0500
Subject: [PATCH 3/3] feat(java25): updating glowroot to work in java25

#33865
---
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 50dc5ee36646..7807c119be4d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -217,7 +217,7 @@
         <environment.properties.folder>${maven.multiModuleProjectDirectory}/environments</environment.properties.folder>
         <environment.properties.defaults>${environment.properties.folder}/environment.properties</environment.properties.defaults>
         <spotless.skip>true</spotless.skip>
-        <glowroot.version>0.14.4</glowroot.version>
+        <glowroot.version>0.14.5-beta.3-java25</glowroot.version>
         <jmeter.test.skip>true</jmeter.test.skip>
     </properties>