Upgrade to Lucene 9.8.0 RC1

ChrisHegarty · Sep 22, 2023 · 2c51860 · 2c51860
1 parent dee85de
commit 2c51860
Show file tree

Hide file tree

Showing 4 changed files with 82 additions and 73 deletions.
diff --git a/...ols-internal/src/main/java/org/elasticsearch/gradle/internal/RepositoriesSetupPlugin.java b/...ols-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
@@ -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
@@ -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
@@ -2528,124 +2528,124 @@
             <sha256 value="015d5c229f3cd5c0ebf175c1da08d596d94043362ae9d92637d88848c90537c8" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-analysis-common" version="9.8.0-snapshot-1f8e08481c2">
-         <artifact name="lucene-analysis-common-9.8.0-snapshot-1f8e08481c2.jar">
-            <sha256 value="d1e92b6934d5d3115c8c59fb2b70d724ca420f439a311d153f86e6a8520921c4" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-analysis-common" version="9.8.0">
+         <artifact name="lucene-analysis-common-9.8.0.jar">
+            <sha256 value="722cff7ce85bbf6a487d8a1c0ad89c7f11d9781c88459cb0140e2c53e3ff5b02" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-analysis-icu" version="9.8.0-snapshot-1f8e08481c2">
-         <artifact name="lucene-analysis-icu-9.8.0-snapshot-1f8e08481c2.jar">
-            <sha256 value="9d21a78ae819ba580807a9f891b02d37aaeea9b57333c53596348ba598fedbf2" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-analysis-icu" version="9.8.0">
+         <artifact name="lucene-analysis-icu-9.8.0.jar">
+            <sha256 value="99cc3674e06e42640ded7a523ed7f6213d7ccd5507a755bc04179a1b20de570f" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-analysis-kuromoji" version="9.8.0-snapshot-1f8e08481c2">
-         <artifact name="lucene-analysis-kuromoji-9.8.0-snapshot-1f8e08481c2.jar">
-            <sha256 value="5cad0c95f5dbc3e414d25f440441376e09764ae9db3b24db169d2ce1e03b3809" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-analysis-kuromoji" version="9.8.0">
+         <artifact name="lucene-analysis-kuromoji-9.8.0.jar">
+            <sha256 value="447361302c6b9612053d352b6f75e905166591f12fafe9c8e43cec7915e051a7" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-analysis-morfologik" version="9.8.0-snapshot-1f8e08481c2">
-         <artifact name="lucene-analysis-morfologik-9.8.0-snapshot-1f8e08481c2.jar">
-            <sha256 value="51d67f68a1326e8e123c53f39e1386d6f075906e8384a28d1f6e385a0433c053" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-analysis-morfologik" version="9.8.0">
+         <artifact name="lucene-analysis-morfologik-9.8.0.jar">
+            <sha256 value="d363c607cf42b94607004fe4f4a9a677bf19890cb4d625be05156f04f10144dd" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-analysis-nori" version="9.8.0-snapshot-1f8e08481c2">
-         <artifact name="lucene-analysis-nori-9.8.0-snapshot-1f8e08481c2.jar">
-            <sha256 value="6aa1befbc29c40501a390fabd15e33f69339d9fc1f929f27025733e73e6e3c01" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-analysis-nori" version="9.8.0">
+         <artifact name="lucene-analysis-nori-9.8.0.jar">
+            <sha256 value="27af324eb5fce38bd5465a39fff72897f98975b2a81819a94bafcaa545a557ff" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-analysis-phonetic" version="9.8.0-snapshot-1f8e08481c2">
-         <artifact name="lucene-analysis-phonetic-9.8.0-snapshot-1f8e08481c2.jar">
-            <sha256 value="729c7154affe8c42c053495eb9e3517e67ef61dc50af2e1e68b6d1afda0c30e6" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-analysis-phonetic" version="9.8.0">
+         <artifact name="lucene-analysis-phonetic-9.8.0.jar">
+            <sha256 value="bc539251065fc7ba4d59d70910cb664d2e4bf25047bd854e7348eb4d3db8e930" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-analysis-smartcn" version="9.8.0-snapshot-1f8e08481c2">
-         <artifact name="lucene-analysis-smartcn-9.8.0-snapshot-1f8e08481c2.jar">
-            <sha256 value="1b25b16d884e5cbe55f71a6063022f82a7369c60eeafc2992ad0d5a2edf7bba9" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-analysis-smartcn" version="9.8.0">
+         <artifact name="lucene-analysis-smartcn-9.8.0.jar">
+            <sha256 value="82f63d40db2aad15f748bf988214d44477167ec1a0388dd258c4c8a8f74797d2" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-analysis-stempel" version="9.8.0-snapshot-1f8e08481c2">
-         <artifact name="lucene-analysis-stempel-9.8.0-snapshot-1f8e08481c2.jar">
-            <sha256 value="ab3000e9c4d983efdde8b309e2e0b5cab1df45da2d8bf62e117d82cc168148c9" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-analysis-stempel" version="9.8.0">
+         <artifact name="lucene-analysis-stempel-9.8.0.jar">
+            <sha256 value="4ee9f4fccd710c8d51827b54747e4134f600fd00ad96ae9c3c6d97122807e18c" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-backward-codecs" version="9.8.0-snapshot-1f8e08481c2">
-         <artifact name="lucene-backward-codecs-9.8.0-snapshot-1f8e08481c2.jar">
-            <sha256 value="826101a6da192e6667697e08b73d14118ac0c1f1962815016825a16777d34e5d" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-backward-codecs" version="9.8.0">
+         <artifact name="lucene-backward-codecs-9.8.0.jar">
+            <sha256 value="c237eb8b74e8b5fd71e1618df060d8711338d50a3b08b2dc4fdfcc5aabf636f8" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-codecs" version="9.8.0-snapshot-1f8e08481c2">
-         <artifact name="lucene-codecs-9.8.0-snapshot-1f8e08481c2.jar">
-            <sha256 value="aa77965fe0e48d6ed3621d259125000a08adb74c9957fcc37b64aeb53e04e2bc" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-codecs" version="9.8.0">
+         <artifact name="lucene-codecs-9.8.0.jar">
+            <sha256 value="76fbd250f82fae0ae515462b307fd43a118f4ae0f658e40d5645c3af5bcd6566" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-core" version="9.8.0-snapshot-1f8e08481c2">
-         <artifact name="lucene-core-9.8.0-snapshot-1f8e08481c2.jar">
-            <sha256 value="293db6a57b161a902dbe3b0da1f5c4e6fa403b3139186fbece416e3c1e70eace" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-core" version="9.8.0">
+         <artifact name="lucene-core-9.8.0.jar">
+            <sha256 value="50b9f845b75dcfe287e2162b02b117740922cc7ccfdfba7298d020cae43299d3" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-expressions" version="9.8.0-snapshot-1f8e08481c2">
-         <artifact name="lucene-expressions-9.8.0-snapshot-1f8e08481c2.jar">
-            <sha256 value="77d8bea3bcf9edaade1bb179216502426feb59c2089496640abcee39e2ee8c52" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-expressions" version="9.8.0">
+         <artifact name="lucene-expressions-9.8.0.jar">
+            <sha256 value="d4879142ea809e8624f07646c9b0f6161cd946fcb6d5ee4d8692419d9a4eba47" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-grouping" version="9.8.0-snapshot-1f8e08481c2">
-         <artifact name="lucene-grouping-9.8.0-snapshot-1f8e08481c2.jar">
-            <sha256 value="fd9995a905269ede96104b4dd0444006797f17fc39face9522acfaa9009fb37f" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-grouping" version="9.8.0">
+         <artifact name="lucene-grouping-9.8.0.jar">
+            <sha256 value="cae9762d47f1c322dee23a69cf6f2e442b4074916dd07bc60bdb6555f2571a58" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-highlighter" version="9.8.0-snapshot-1f8e08481c2">
-         <artifact name="lucene-highlighter-9.8.0-snapshot-1f8e08481c2.jar">
-            <sha256 value="5a9b997479e13131abc86ea0ab6f6f3e58b31986e8b045f5eae4358faa8aa512" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-highlighter" version="9.8.0">
+         <artifact name="lucene-highlighter-9.8.0.jar">
+            <sha256 value="bc4ca0340b76f46c7e72bf8e014f47e5750ee0ab9301976f1add489a8a195660" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-join" version="9.8.0-snapshot-1f8e08481c2">
-         <artifact name="lucene-join-9.8.0-snapshot-1f8e08481c2.jar">
-            <sha256 value="260843f2cd88afbfd60e07dd25e3248c405fd5c7b9372076738d7976a3b18515" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-join" version="9.8.0">
+         <artifact name="lucene-join-9.8.0.jar">
+            <sha256 value="8a31c486756e41894ec4ea6d35630309a8f540c50452890a25f88292c84e29be" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-memory" version="9.8.0-snapshot-1f8e08481c2">
-         <artifact name="lucene-memory-9.8.0-snapshot-1f8e08481c2.jar">
-            <sha256 value="770c6444f0f7f70ca3bbece7512549cc8f3c4c417388535fc343287f80e364e4" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-memory" version="9.8.0">
+         <artifact name="lucene-memory-9.8.0.jar">
+            <sha256 value="37772283d4953125709b2bc83d5d86f4d86cbfac928dd4295fc07cd8d00431a9" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-misc" version="9.8.0-snapshot-1f8e08481c2">
-         <artifact name="lucene-misc-9.8.0-snapshot-1f8e08481c2.jar">
-            <sha256 value="89832548a74a23ade1828b5d49e7a291b86bb7510d61a1e8d6b8281c15aca9c8" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-misc" version="9.8.0">
+         <artifact name="lucene-misc-9.8.0.jar">
+            <sha256 value="4fe2225f753988899ac35b18b78229592e1da5baf42c0e25fe58216e2efb8a21" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-queries" version="9.8.0-snapshot-1f8e08481c2">
-         <artifact name="lucene-queries-9.8.0-snapshot-1f8e08481c2.jar">
-            <sha256 value="3586e809fcf10e94401570257db002e5b58a2bca7716d2b403719aa091da33f1" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-queries" version="9.8.0">
+         <artifact name="lucene-queries-9.8.0.jar">
+            <sha256 value="4ea1d334e8c4c226c78d5907e7e2aed693b62815542f29cf2c926f3fc2906218" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-queryparser" version="9.8.0-snapshot-1f8e08481c2">
-         <artifact name="lucene-queryparser-9.8.0-snapshot-1f8e08481c2.jar">
-            <sha256 value="86665bdd5a35feaf22b64939d7b0c644669ef03efe4c4952203a7e666ca66b0b" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-queryparser" version="9.8.0">
+         <artifact name="lucene-queryparser-9.8.0.jar">
+            <sha256 value="3f8e40d91efdcd3a6064e015f8767a27d3473cf6be69acd202fdded431b45ef3" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-sandbox" version="9.8.0-snapshot-1f8e08481c2">
-         <artifact name="lucene-sandbox-9.8.0-snapshot-1f8e08481c2.jar">
-            <sha256 value="8c000148a790ed30f1abecb08c1656d62ed42b9960e7dade4df2ab5d013ebe17" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-sandbox" version="9.8.0">
+         <artifact name="lucene-sandbox-9.8.0.jar">
+            <sha256 value="f02ba29237b4831b1ade605c1ec9dc895eac4046fe4965a7fe4a5a573785892c" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-spatial-extras" version="9.8.0-snapshot-1f8e08481c2">
-         <artifact name="lucene-spatial-extras-9.8.0-snapshot-1f8e08481c2.jar">
-            <sha256 value="56c734649ad224ab60af67f759c4ec898f7fe1b1c7064762440d5a70fdf0ddd9" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-spatial-extras" version="9.8.0">
+         <artifact name="lucene-spatial-extras-9.8.0.jar">
+            <sha256 value="3b4dfb5df4927777cbe4b48535c78d89b0faed5f3c6c9b7803bc8dda9399393d" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-spatial3d" version="9.8.0-snapshot-1f8e08481c2">
-         <artifact name="lucene-spatial3d-9.8.0-snapshot-1f8e08481c2.jar">
-            <sha256 value="6646f588161464d3fce6ae71aea7d3a929909593d2ae2c8450f34e999dcebc11" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-spatial3d" version="9.8.0">
+         <artifact name="lucene-spatial3d-9.8.0.jar">
+            <sha256 value="7d0f0486cb88eabad03b912b451cd152abb0e04189018818444357f8a81696a9" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-suggest" version="9.8.0-snapshot-1f8e08481c2">
-         <artifact name="lucene-suggest-9.8.0-snapshot-1f8e08481c2.jar">
-            <sha256 value="776d080b8de41f6e0fa1ce3e8c1a242861e3873c0f62b3f528535a216b5c22cf" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-suggest" version="9.8.0">
+         <artifact name="lucene-suggest-9.8.0.jar">
+            <sha256 value="e677de7a459889188fd8b5075d9c2bbe7c0180afdee6896e9f30a301b1f84fa7" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-test-framework" version="9.8.0-snapshot-1f8e08481c2">
-         <artifact name="lucene-test-framework-9.8.0-snapshot-1f8e08481c2.jar">
-            <sha256 value="c382d0728fd5de694aa94037401069da143c4f738745782e1c0a1276418a1f89" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-test-framework" version="9.8.0">
+         <artifact name="lucene-test-framework-9.8.0.jar">
+            <sha256 value="730217253819a5967bcfae032aca9614f10650ebedc1c5da782dd8eb4b7f4769" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.apache.maven" name="maven-model" version="3.6.2">