This is an automated email from the ASF dual-hosted git repository.
janhoy pushed a commit to branch branch_10_0
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/branch_10_0 by this push:
new 8ed5c96ffa6 SOLR-17908 Use Java 25 in Docker image (#3782)
8ed5c96ffa6 is described below
commit 8ed5c96ffa669c1c50693dc11f2ebf1157040c48
Author: Jan Høydahl <[email protected]>
AuthorDate: Mon Oct 20 16:38:29 2025 +0200
SOLR-17908 Use Java 25 in Docker image (#3782)
(cherry picked from commit 5e210f95d295f0d3c02f69573aabea7be70c174b)
---
dev-docs/gradle-help/docker.txt | 2 +-
gradle/libs.versions.toml | 1 +
solr/docker/build.gradle | 2 +-
.../modules/upgrade-notes/pages/major-changes-in-solr-10.adoc | 2 +-
4 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/dev-docs/gradle-help/docker.txt b/dev-docs/gradle-help/docker.txt
index 4df9bae9626..f02e1948349 100644
--- a/dev-docs/gradle-help/docker.txt
+++ b/dev-docs/gradle-help/docker.txt
@@ -17,7 +17,7 @@ gradlew dockerBuild
The docker build task accepts the following inputs, all accepted via both
Environment Variables and Gradle Properties.
Base Docker Image: (The docker image used for the "FROM" in the Solr
Dockerfile)
- Default: "eclipse-temurin:21-jre-noble"
+ Default: "eclipse-temurin:25-jre-noble"
EnvVar: SOLR_DOCKER_BASE_IMAGE
Gradle Property: -Psolr.docker.baseImage
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 641de520d6b..9c77912fcb9 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -79,6 +79,7 @@ cuvs-lucene = "25.10.0"
cybozulabs-langdetect = "1.1-20120112"
decompose = "3.3.0"
diffplug-spotless = "7.2.1"
+dockerfile-baseimage-java = "25"
dropwizard-metrics = "4.2.26"
eclipse-ecj = "3.39.0"
eclipse-jetty = "12.0.27"
diff --git a/solr/docker/build.gradle b/solr/docker/build.gradle
index 8d2326a5164..25bba389465 100644
--- a/solr/docker/build.gradle
+++ b/solr/docker/build.gradle
@@ -22,7 +22,7 @@ import org.apache.commons.codec.digest.DigestUtils
description = 'Solr Docker image'
apply plugin: 'base'
-def javaVersion = libs.versions.java.min.get()
+def javaVersion = libs.versions.dockerfile.baseimage.java.get()
// Solr Docker inputs
def dockerImageSolrDist = "${ -> propertyOrEnvOrDefault("solr.docker.dist",
"SOLR_DOCKER_DIST", 'full') }"
def isDistSlim = {String dist -> dist.toLowerCase(Locale.ROOT) == "slim"}
diff --git
a/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-10.adoc
b/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-10.adoc
index a53ff77b43c..f87a4645597 100644
---
a/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-10.adoc
+++
b/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-10.adoc
@@ -190,7 +190,7 @@ Solr upgraded to Jetty 12.x from 10.x as Jetty 10 and 11
have reached end-of-lif
=== Docker
-The OS version of the official Docker image and provided Dockerfile has been
upgraded to Ubuntu 24 (noble) from Ubuntu 22 (jammy).
+The OS version of the official Docker image and provided Dockerfile has been
upgraded to Ubuntu 24 (noble) from Ubuntu 22 (jammy). The Docker base image is
`eclipse-temurin:25-jre-noble`.
=== Analysis and Tokenizers
