Apache Solr open-source search software
SOLR-17908 Use Java 25 in Docker image (#3782)
Jan Høydahl5e210f95d295
diff --git a/dev-docs/gradle-help/docker.txt b/dev-docs/gradle-help/docker.txtindex 4df9bae9626..f02e1948349 100644--- a/dev-docs/gradle-help/docker.txt+++ b/dev-docs/gradle-help/docker.txt@@ -17,7 +17,7 @@ gradlew dockerBuildThe 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_IMAGEGradle Property: -Psolr.docker.baseImagediff --git a/gradle/libs.versions.toml b/gradle/libs.versions.tomlindex 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.gradleindex 8d2326a5164..25bba389465 100644--- a/solr/docker/build.gradle+++ b/solr/docker/build.gradle@@ -22,7 +22,7 @@ import org.apache.commons.codec.digest.DigestUtilsdescription = 'Solr Docker image'apply plugin: 'base'-def javaVersion = libs.versions.java.min.get()+def javaVersion = libs.versions.dockerfile.baseimage.java.get()// Solr Docker inputsdef 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.adocindex bcd10974008..eda84e8a57b 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@@ -189,7 +189,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`.=== Miscellaneous