From 393b5ed77f59ec8bc4e0cbe0f65b0420c5bc2b11 Mon Sep 17 00:00:00 2001 From: ChrisHegarty Date: Mon, 9 Dec 2024 20:45:58 +0000 Subject: [PATCH 1/4] Upgrade to Lucene 9.12.1 --- build-tools-internal/version.properties | 2 +- build.gradle | 5 + docs/Versions.asciidoc | 4 +- gradle/verification-metadata.xml | 151 +++++++++--------- .../elasticsearch/index/IndexVersions.java | 1 + 5 files changed, 84 insertions(+), 79 deletions(-) diff --git a/build-tools-internal/version.properties b/build-tools-internal/version.properties index 2836c75516356..1efe4e8d1fc04 100644 --- a/build-tools-internal/version.properties +++ b/build-tools-internal/version.properties @@ -1,5 +1,5 @@ elasticsearch = 8.18.0 -lucene = 9.12.0 +lucene = 9.12.1 bundled_jdk_vendor = openjdk bundled_jdk = 23+37@3c5b90190c68498b986a97f276efd28a diff --git a/build.gradle b/build.gradle index a5c518afef94e..6120f85e1fda8 100644 --- a/build.gradle +++ b/build.gradle @@ -236,6 +236,11 @@ if (project.gradle.startParameter.taskNames.any { it.startsWith("checkPart") || subprojects { proj -> apply plugin: 'elasticsearch.base' + + repositories { + // TODO: Temporary for Lucene RC builds. REMOVE + maven { url "https://dist.apache.org/repos/dist/dev/lucene/lucene-9.12.1-RC1-rev-7a97a05a239d6fb9f1f347aa09bfa52e875be092/lucene/maven" } + } } allprojects { diff --git a/docs/Versions.asciidoc b/docs/Versions.asciidoc index b65b974cd6b69..8d31856d4706f 100644 --- a/docs/Versions.asciidoc +++ b/docs/Versions.asciidoc @@ -1,8 +1,8 @@ include::{docs-root}/shared/versions/stack/{source_branch}.asciidoc[] -:lucene_version: 9.12.0 -:lucene_version_path: 9_12_0 +:lucene_version: 9.12.1 +:lucene_version_path: 9_12_1 :jdk: 11.0.2 :jdk_major: 11 :build_type: tar diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 1a3b753e129c3..5ac79f80fd592 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -2915,129 +2915,128 @@ - - - + + + - - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + diff --git a/server/src/main/java/org/elasticsearch/index/IndexVersions.java b/server/src/main/java/org/elasticsearch/index/IndexVersions.java index 1f2bdf5a06234..ee366a8b5924a 100644 --- a/server/src/main/java/org/elasticsearch/index/IndexVersions.java +++ b/server/src/main/java/org/elasticsearch/index/IndexVersions.java @@ -122,6 +122,7 @@ private static IndexVersion def(int id, Version luceneVersion) { public static final IndexVersion LOGSDB_DEFAULT_IGNORE_DYNAMIC_BEYOND_LIMIT_BACKPORT = def(8_519_00_0, Version.LUCENE_9_12_0); public static final IndexVersion TIME_BASED_K_ORDERED_DOC_ID_BACKPORT = def(8_520_00_0, Version.LUCENE_9_12_0); public static final IndexVersion DEPRECATE_SOURCE_MODE_MAPPER = def(8_521_00_0, Version.LUCENE_9_12_0); + public static final IndexVersion UPGRADE_TO_LUCENE_9_12_1 = def(8_522_00_0, Version.LUCENE_9_12_1); /* * STOP! READ THIS FIRST! No, really, * ____ _____ ___ ____ _ ____ _____ _ ____ _____ _ _ ___ ____ _____ ___ ____ ____ _____ _ From 5cb3099beb2ee542407c81dd443da06b143aaa8f Mon Sep 17 00:00:00 2001 From: Chris Hegarty <62058229+ChrisHegarty@users.noreply.github.com> Date: Mon, 9 Dec 2024 20:49:12 +0000 Subject: [PATCH 2/4] Update docs/changelog/118300.yaml --- docs/changelog/118300.yaml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 docs/changelog/118300.yaml diff --git a/docs/changelog/118300.yaml b/docs/changelog/118300.yaml new file mode 100644 index 0000000000000..e11f5bfd73b2e --- /dev/null +++ b/docs/changelog/118300.yaml @@ -0,0 +1,5 @@ +pr: 118300 +summary: Upgrade to Lucene 9.12.1 +area: Search +type: upgrade +issues: [] From b741ed4c9cbac506b09128567bb3eeb57d968a04 Mon Sep 17 00:00:00 2001 From: ChrisHegarty Date: Mon, 9 Dec 2024 20:55:27 +0000 Subject: [PATCH 3/4] minor --- gradle/verification-metadata.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 5ac79f80fd592..96fd8f25c5734 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -2919,6 +2919,7 @@ + From 8390fd8f5b936072df14f51df567ab64f61ace4f Mon Sep 17 00:00:00 2001 From: Chris Hegarty <62058229+ChrisHegarty@users.noreply.github.com> Date: Fri, 13 Dec 2024 11:38:41 +0000 Subject: [PATCH 4/4] remove RC build repo --- build.gradle | 5 ----- 1 file changed, 5 deletions(-) diff --git a/build.gradle b/build.gradle index 9195cec847d26..cf7bcc96330a1 100644 --- a/build.gradle +++ b/build.gradle @@ -236,11 +236,6 @@ if (project.gradle.startParameter.taskNames.any { it.startsWith("checkPart") || subprojects { proj -> apply plugin: 'elasticsearch.base' - - repositories { - // TODO: Temporary for Lucene RC builds. REMOVE - maven { url "https://dist.apache.org/repos/dist/dev/lucene/lucene-9.12.1-RC1-rev-7a97a05a239d6fb9f1f347aa09bfa52e875be092/lucene/maven" } - } } allprojects {