Skip to content

Move to java 25 part II #34269

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

Draft
wezell wants to merge 6 commits into
base: main
Choose a base branch
from
+4 −4
Draft

Move to java 25 part II #34269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4cfa6b9
task(java): Second pr which actually moves us to Java 25. Do not mer…
wezell Jan 9, 2026
54ea1b4
task(java): Second pr which actually moves us to Java 25. Do not mer…
wezell Jan 9, 2026
f0471c4
Merge remote-tracking branch 'origin/main' into issue-33865-java-25-p…
wezell Jan 10, 2026
9566d44
Merge remote-tracking branch 'origin/main' into issue-33865-java-25-p…
wezell Jan 10, 2026
930d237
Merge remote-tracking branch 'origin/main' into issue-33865-java-25-p…
wezell Jan 16, 2026
b963df9
feat(java25): updating glowroot to work in java25
wezell Jan 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .sdkmanrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion docker/java-base/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>

Expand Down
Loading