From 2c518602e44e096d6ab75eed96971eed28a65c28 Mon Sep 17 00:00:00 2001 From: ChrisHegarty Date: Fri, 22 Sep 2023 10:33:27 +0100 Subject: [PATCH] Upgrade to Lucene 9.8.0 RC1 --- .../internal/RepositoriesSetupPlugin.java | 7 + build-tools-internal/version.properties | 2 +- build-tools/build.gradle | 2 + gradle/verification-metadata.xml | 144 +++++++++--------- 4 files changed, 82 insertions(+), 73 deletions(-) diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/RepositoriesSetupPlugin.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/RepositoriesSetupPlugin.java index 098b7923bcbde..b7e8dff8d8355 100644 --- a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/RepositoriesSetupPlugin.java +++ b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/RepositoriesSetupPlugin.java @@ -59,5 +59,12 @@ public static void configureRepositories(Project project) { exclusiveRepo.forRepositories(luceneRepo); }); } + // TODO: Temporary for Lucene RC builds. REMOVE + MavenArtifactRepository luceneRCRepo = repos.maven(repo -> { + repo.setName("lucene-rc"); + repo.setUrl( + "https://dist.apache.org/repos/dist/dev/lucene/lucene-9.8.0-RC1-rev-d914b3722bd5b8ef31ccf7e8ddc638a87fd648db/lucene/maven" + ); + }); } } diff --git a/build-tools-internal/version.properties b/build-tools-internal/version.properties index 151381bfa0cb1..bc34f95396844 100644 --- a/build-tools-internal/version.properties +++ b/build-tools-internal/version.properties @@ -1,5 +1,5 @@ elasticsearch = 8.11.0 -lucene = 9.8.0-snapshot-1f8e08481c2 +lucene = 9.8.0 bundled_jdk_vendor = openjdk bundled_jdk = 20.0.2+9@6e380f22cbe7469fa75fb448bd903d8e diff --git a/build-tools/build.gradle b/build-tools/build.gradle index 3fe2639bfe2a4..e7d20e14e0b55 100644 --- a/build-tools/build.gradle +++ b/build-tools/build.gradle @@ -109,6 +109,8 @@ configurations { repositories { mavenCentral() gradlePluginPortal() + // TODO: Temporary for Lucene RC builds. REMOVE + maven { url 'https://dist.apache.org/repos/dist/dev/lucene/lucene-9.8.0-RC1-rev-d914b3722bd5b8ef31ccf7e8ddc638a87fd648db/lucene/maven' } } dependencies { diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 9e8c193fa705f..cf958aa657db8 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -2528,124 +2528,124 @@ - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + +