Remove --enable-preview feature flag since Apache Lucene now patches …

…class files Signed-off-by: Andriy Redko <[email protected]>
opensearch-project · Dec 27, 2022 · bb221b7 · bb221b7
1 parent ea1cc9d
commit bb221b7
Show file tree

Hide file tree

Showing 47 changed files with 23 additions and 29 deletions.
diff --git a/build.gradle b/build.gradle
@@ -413,9 +413,6 @@ gradle.projectsEvaluated {
         if (BuildParams.runtimeJavaVersion > JavaVersion.VERSION_17) {
           task.jvmArgs += ["-Djava.security.manager=allow"]
         }
-        if (BuildParams.runtimeJavaVersion >= JavaVersion.VERSION_19) {
-          task.jvmArgs += ["--enable-preview"]
-        }
       }
     }
 

diff --git a/buildSrc/version.properties b/buildSrc/version.properties
@@ -1,5 +1,5 @@
 opensearch        = 3.0.0
-lucene            = 9.5.0-snapshot-6700b7e
+lucene            = 9.5.0-snapshot-0878271
 
 bundled_jdk_vendor = adoptium
 bundled_jdk = 19.0.1+10

diff --git a/distribution/src/config/jvm.options b/distribution/src/config/jvm.options
@@ -78,6 +78,3 @@ ${error.file}
 
 # Explicitly allow security manager (https://bugs.openjdk.java.net/browse/JDK-8270380)
 18-:-Djava.security.manager=allow
-
-# Allow mmap to use new JDK-19 preview APIs in Apache Lucene 9.4 (https://github.com/opensearch-project/OpenSearch/issues/4637)
-19-:--enable-preview
diff --git a/modules/lang-expression/licenses/lucene-expressions-9.5.0-snapshot-0878271.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-9.5.0-snapshot-0878271.jar.sha1
@@ -0,0 +1 @@
+6912f9f9ceebbe5a54795035984709a4ada115e8
diff --git a/modules/lang-expression/licenses/lucene-expressions-9.5.0-snapshot-6700b7e.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-9.5.0-snapshot-6700b7e.jar.sha1
diff --git a/plugins/analysis-icu/licenses/lucene-analysis-icu-9.5.0-snapshot-0878271.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analysis-icu-9.5.0-snapshot-0878271.jar.sha1
@@ -0,0 +1 @@
+477512b093aa1dd55ea9340c3a16128f6722161b
diff --git a/plugins/analysis-icu/licenses/lucene-analysis-icu-9.5.0-snapshot-6700b7e.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analysis-icu-9.5.0-snapshot-6700b7e.jar.sha1
diff --git a/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.5.0-snapshot-0878271.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.5.0-snapshot-0878271.jar.sha1
@@ -0,0 +1 @@
+89e9389e166bbd5e774d4b62acd75bf37481062e
diff --git a/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.5.0-snapshot-6700b7e.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.5.0-snapshot-6700b7e.jar.sha1
diff --git a/plugins/analysis-nori/licenses/lucene-analysis-nori-9.5.0-snapshot-0878271.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analysis-nori-9.5.0-snapshot-0878271.jar.sha1
@@ -0,0 +1 @@
+928c3eb74edf7ab62ea7d0948703f2867299cb56
diff --git a/plugins/analysis-nori/licenses/lucene-analysis-nori-9.5.0-snapshot-6700b7e.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analysis-nori-9.5.0-snapshot-6700b7e.jar.sha1
diff --git a/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.5.0-snapshot-0878271.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.5.0-snapshot-0878271.jar.sha1
@@ -0,0 +1 @@
+2d5640fe3a99b9af4c469243032b89dba32f7ab2
diff --git a/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.5.0-snapshot-6700b7e.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.5.0-snapshot-6700b7e.jar.sha1
diff --git a/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.5.0-snapshot-0878271.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.5.0-snapshot-0878271.jar.sha1
@@ -0,0 +1 @@
+44c3ceefd4999b046b935d8737c26c1a835c8d5a
diff --git a/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.5.0-snapshot-6700b7e.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.5.0-snapshot-6700b7e.jar.sha1
diff --git a/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.5.0-snapshot-0878271.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.5.0-snapshot-0878271.jar.sha1
@@ -0,0 +1 @@
+6da2070b19949a397e45f2b54a739cef403d0c94
diff --git a/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.5.0-snapshot-6700b7e.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.5.0-snapshot-6700b7e.jar.sha1
diff --git a/...ns/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.5.0-snapshot-0878271.jar.sha1 b/...ns/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.5.0-snapshot-0878271.jar.sha1
@@ -0,0 +1 @@
+1803e928dd330599048b71386456fb90acbed5c1
diff --git a/...ns/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.5.0-snapshot-6700b7e.jar.sha1 b/...ns/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.5.0-snapshot-6700b7e.jar.sha1
diff --git a/server/licenses/lucene-analysis-common-9.5.0-snapshot-0878271.jar.sha1 b/server/licenses/lucene-analysis-common-9.5.0-snapshot-0878271.jar.sha1
@@ -0,0 +1 @@
+92c380f063c5b75efd6b3c48dffc942bfe21360f
diff --git a/server/licenses/lucene-analysis-common-9.5.0-snapshot-6700b7e.jar.sha1 b/server/licenses/lucene-analysis-common-9.5.0-snapshot-6700b7e.jar.sha1
diff --git a/server/licenses/lucene-backward-codecs-9.5.0-snapshot-0878271.jar.sha1 b/server/licenses/lucene-backward-codecs-9.5.0-snapshot-0878271.jar.sha1
@@ -0,0 +1 @@
+2f0f211b1ed0447135f84a36935625e9a33a98e5
diff --git a/server/licenses/lucene-backward-codecs-9.5.0-snapshot-6700b7e.jar.sha1 b/server/licenses/lucene-backward-codecs-9.5.0-snapshot-6700b7e.jar.sha1
diff --git a/server/licenses/lucene-core-9.5.0-snapshot-0878271.jar.sha1 b/server/licenses/lucene-core-9.5.0-snapshot-0878271.jar.sha1
@@ -0,0 +1 @@
+1f8895d068b5d98c16d48f267a772d0243148040
diff --git a/server/licenses/lucene-core-9.5.0-snapshot-6700b7e.jar.sha1 b/server/licenses/lucene-core-9.5.0-snapshot-6700b7e.jar.sha1
diff --git a/server/licenses/lucene-grouping-9.5.0-snapshot-0878271.jar.sha1 b/server/licenses/lucene-grouping-9.5.0-snapshot-0878271.jar.sha1
@@ -0,0 +1 @@
+f12819e51f145624ef7b1fd93aaa543cec13e3aa
diff --git a/server/licenses/lucene-grouping-9.5.0-snapshot-6700b7e.jar.sha1 b/server/licenses/lucene-grouping-9.5.0-snapshot-6700b7e.jar.sha1
diff --git a/server/licenses/lucene-highlighter-9.5.0-snapshot-0878271.jar.sha1 b/server/licenses/lucene-highlighter-9.5.0-snapshot-0878271.jar.sha1
@@ -0,0 +1 @@
+ed88cca26580a32234e3f605cf963703ea99eb60
diff --git a/server/licenses/lucene-highlighter-9.5.0-snapshot-6700b7e.jar.sha1 b/server/licenses/lucene-highlighter-9.5.0-snapshot-6700b7e.jar.sha1
diff --git a/server/licenses/lucene-join-9.5.0-snapshot-0878271.jar.sha1 b/server/licenses/lucene-join-9.5.0-snapshot-0878271.jar.sha1
@@ -0,0 +1 @@
+f51934b2362e827d9f467507624b773153f0ca01
diff --git a/server/licenses/lucene-join-9.5.0-snapshot-6700b7e.jar.sha1 b/server/licenses/lucene-join-9.5.0-snapshot-6700b7e.jar.sha1
diff --git a/server/licenses/lucene-memory-9.5.0-snapshot-0878271.jar.sha1 b/server/licenses/lucene-memory-9.5.0-snapshot-0878271.jar.sha1
@@ -0,0 +1 @@
+54744097c6882a498c08ffd8a42b54da00c9420c
diff --git a/server/licenses/lucene-memory-9.5.0-snapshot-6700b7e.jar.sha1 b/server/licenses/lucene-memory-9.5.0-snapshot-6700b7e.jar.sha1
diff --git a/server/licenses/lucene-misc-9.5.0-snapshot-0878271.jar.sha1 b/server/licenses/lucene-misc-9.5.0-snapshot-0878271.jar.sha1
@@ -0,0 +1 @@
+b9061dea1178e0cac86147d7b69fc53bf2f8ee58
diff --git a/server/licenses/lucene-misc-9.5.0-snapshot-6700b7e.jar.sha1 b/server/licenses/lucene-misc-9.5.0-snapshot-6700b7e.jar.sha1
diff --git a/server/licenses/lucene-queries-9.5.0-snapshot-0878271.jar.sha1 b/server/licenses/lucene-queries-9.5.0-snapshot-0878271.jar.sha1
@@ -0,0 +1 @@
+eca07717c0ee563c5337222fd1a1b7ef5f03f34f
diff --git a/server/licenses/lucene-queries-9.5.0-snapshot-6700b7e.jar.sha1 b/server/licenses/lucene-queries-9.5.0-snapshot-6700b7e.jar.sha1
diff --git a/server/licenses/lucene-queryparser-9.5.0-snapshot-0878271.jar.sha1 b/server/licenses/lucene-queryparser-9.5.0-snapshot-0878271.jar.sha1
@@ -0,0 +1 @@
+4d1ed21bc62940c4545778dc5f6249b67d08b095
diff --git a/server/licenses/lucene-queryparser-9.5.0-snapshot-6700b7e.jar.sha1 b/server/licenses/lucene-queryparser-9.5.0-snapshot-6700b7e.jar.sha1
diff --git a/server/licenses/lucene-sandbox-9.5.0-snapshot-0878271.jar.sha1 b/server/licenses/lucene-sandbox-9.5.0-snapshot-0878271.jar.sha1
@@ -0,0 +1 @@
+c564c73080cff226a131847b4361bc9c2155f00c
diff --git a/server/licenses/lucene-sandbox-9.5.0-snapshot-6700b7e.jar.sha1 b/server/licenses/lucene-sandbox-9.5.0-snapshot-6700b7e.jar.sha1
diff --git a/server/licenses/lucene-spatial-extras-9.5.0-snapshot-0878271.jar.sha1 b/server/licenses/lucene-spatial-extras-9.5.0-snapshot-0878271.jar.sha1
@@ -0,0 +1 @@
+7a654fcc671e0372a9becd7c7cbd9a1f43569106
diff --git a/server/licenses/lucene-spatial-extras-9.5.0-snapshot-6700b7e.jar.sha1 b/server/licenses/lucene-spatial-extras-9.5.0-snapshot-6700b7e.jar.sha1
diff --git a/server/licenses/lucene-spatial3d-9.5.0-snapshot-0878271.jar.sha1 b/server/licenses/lucene-spatial3d-9.5.0-snapshot-0878271.jar.sha1
@@ -0,0 +1 @@
+33c9c43eac6b4924155eeff03d2231c2bed9b169
diff --git a/server/licenses/lucene-spatial3d-9.5.0-snapshot-6700b7e.jar.sha1 b/server/licenses/lucene-spatial3d-9.5.0-snapshot-6700b7e.jar.sha1
diff --git a/server/licenses/lucene-suggest-9.5.0-snapshot-0878271.jar.sha1 b/server/licenses/lucene-suggest-9.5.0-snapshot-0878271.jar.sha1
@@ -0,0 +1 @@
+95a69fd51377d964d16057a4a9501665a2ca9a7a
diff --git a/server/licenses/lucene-suggest-9.5.0-snapshot-6700b7e.jar.sha1 b/server/licenses/lucene-suggest-9.5.0-snapshot-6700b7e.jar.sha1