Apache Solr open-source search software
SOLR-15949: Docker, use Java 17 (#556)
David Smileyc869e0e3db28
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex 6183d1b1dd3..2b0cf47bda8 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -65,8 +65,6 @@ Other Changes================== 9.0.0 ==================-Docker and modules have separate CHANGES.md files.-New Features---------------------* SOLR-14789: Migrate docker image creation from docker-solr repo to solr/docker. (Houston Putman, Martijn Koster, Tim Potter, David Smiley, janhoy, Mike Drob)@@ -587,6 +585,9 @@ and each individual module's jar will be included in its directory's lib/ folder* SOLR-15991: analysis-extras module tests shouldn't rely on log4j dependency (Kevin Risden)+* SOLR-15949: Docker: the official image now uses Java 17 provided by Eclipse Temurin. Formerly it was Java 11 from OpenJDK.+ (janhoy, David Smiley)+Bug Fixes---------------------* SOLR-15849: Fix the connection reset problem caused by the incorrect use of 4LW with \n when monitoring zooKeeper status (Fa Ming).diff --git a/solr/docker/build.gradle b/solr/docker/build.gradleindex a44a92d63cc..0c2232789b2 100644--- a/solr/docker/build.gradle+++ b/solr/docker/build.gradle@@ -27,7 +27,7 @@ apply plugin: 'base'def dockerImageRepo = propertyOrEnvOrDefault("solr.docker.imageRepo", "SOLR_DOCKER_IMAGE_REPO", "apache/solr")def dockerImageTag = propertyOrEnvOrDefault("solr.docker.imageTag", "SOLR_DOCKER_IMAGE_TAG", "${version}")def dockerImageName = propertyOrEnvOrDefault("solr.docker.imageName", "SOLR_DOCKER_IMAGE_NAME", "${dockerImageRepo}:${dockerImageTag}")-def baseDockerImage = propertyOrEnvOrDefault("solr.docker.baseImage", "SOLR_DOCKER_BASE_IMAGE", 'openjdk:11-jre-slim')+def baseDockerImage = propertyOrEnvOrDefault("solr.docker.baseImage", "SOLR_DOCKER_BASE_IMAGE", 'eclipse-temurin:17-jre')def officialDockerImageName = propertyOrEnvOrDefault("solr.docker.imageName", "SOLR_DOCKER_IMAGE_NAME", "${dockerImageRepo}-official:${dockerImageTag}")def releaseGpgFingerprint = propertyOrDefault('signing.gnupg.keyName',propertyOrDefault('signing.keyId',''));diff --git a/solr/docker/gradle-help.txt b/solr/docker/gradle-help.txtindex 83cc439831a..f60de752974 100644--- a/solr/docker/gradle-help.txt+++ b/solr/docker/gradle-help.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: "openjdk:11-jre-slim"+ Default: "eclipse-temurin:17-jre"EnvVar: SOLR_DOCKER_BASE_IMAGEGradle Property: -Psolr.docker.baseImagediff --git a/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-9.adoc b/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-9.adocindex 490db96778d..0593c56e194 100644--- a/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-9.adoc+++ b/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-9.adoc@@ -312,3 +312,6 @@ Example has been provided in `sample_techproducts_configs` to override content-twhere they really belong: /admin/threads, /admin/properties, /admin/logging* SOLR-12336: Remove Filter, SolrFilter and SolrConstantScoreQuery++* SOLR-15949: Docker: the official image now uses Java 17 provided by Eclipse Temurin. Formerly it was Java 11 from OpenJDK.+(janhoy, David Smiley)\ No newline at end of file