Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove --enable-preview feature flag since Apache Lucene now patches class files #5642

Merged
merged 1 commit into from
Dec 28, 2022
+24 −29
Merged

Remove --enable-preview feature flag since Apache Lucene now patches class files #5642

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Changed http code on create index API with bad input raising NotXContentException from 500 to 400 ([#4773](https://github.com/opensearch-project/OpenSearch/pull/4773))
- Change http code for DecommissioningFailedException from 500 to 400 ([#5283](https://github.com/opensearch-project/OpenSearch/pull/5283))
- Pre conditions check before updating weighted routing metadata ([#4955](https://github.com/opensearch-project/OpenSearch/pull/4955))
- Remove --enable-preview feature flag since Apache Lucene now patches class files ([#5642](https://github.com/opensearch-project/OpenSearch/pull/5642))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since the above changelog entry "Allow mmap to use new JDK-19 preview APIs" was never included a release, should the net result be the removal of that line and no new line here?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I think we could remove that, will take care of the changelog, thanks @andrross


### Deprecated

Expand Down
3 changes: 0 additions & 3 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion buildSrc/version.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 0 additions & 3 deletions distribution/src/config/jvm.options
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions modules/lang-expression/licenses/lucene-expressions-9.5.0-snapshot-0878271.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
6912f9f9ceebbe5a54795035984709a4ada115e8
1 change: 0 additions & 1 deletion modules/lang-expression/licenses/lucene-expressions-9.5.0-snapshot-6700b7e.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/analysis-icu/licenses/lucene-analysis-icu-9.5.0-snapshot-0878271.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
477512b093aa1dd55ea9340c3a16128f6722161b
1 change: 0 additions & 1 deletion plugins/analysis-icu/licenses/lucene-analysis-icu-9.5.0-snapshot-6700b7e.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.5.0-snapshot-0878271.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
89e9389e166bbd5e774d4b62acd75bf37481062e
1 change: 0 additions & 1 deletion plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.5.0-snapshot-6700b7e.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/analysis-nori/licenses/lucene-analysis-nori-9.5.0-snapshot-0878271.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
928c3eb74edf7ab62ea7d0948703f2867299cb56
1 change: 0 additions & 1 deletion plugins/analysis-nori/licenses/lucene-analysis-nori-9.5.0-snapshot-6700b7e.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.5.0-snapshot-0878271.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2d5640fe3a99b9af4c469243032b89dba32f7ab2
1 change: 0 additions & 1 deletion plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.5.0-snapshot-6700b7e.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.5.0-snapshot-0878271.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
44c3ceefd4999b046b935d8737c26c1a835c8d5a
1 change: 0 additions & 1 deletion plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.5.0-snapshot-6700b7e.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.5.0-snapshot-0878271.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
6da2070b19949a397e45f2b54a739cef403d0c94
1 change: 0 additions & 1 deletion plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.5.0-snapshot-6700b7e.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions ...ns/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.5.0-snapshot-0878271.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1803e928dd330599048b71386456fb90acbed5c1
1 change: 0 additions & 1 deletion ...ns/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.5.0-snapshot-6700b7e.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-analysis-common-9.5.0-snapshot-0878271.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
92c380f063c5b75efd6b3c48dffc942bfe21360f
1 change: 0 additions & 1 deletion server/licenses/lucene-analysis-common-9.5.0-snapshot-6700b7e.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-backward-codecs-9.5.0-snapshot-0878271.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2f0f211b1ed0447135f84a36935625e9a33a98e5
1 change: 0 additions & 1 deletion server/licenses/lucene-backward-codecs-9.5.0-snapshot-6700b7e.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-core-9.5.0-snapshot-0878271.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1f8895d068b5d98c16d48f267a772d0243148040
1 change: 0 additions & 1 deletion server/licenses/lucene-core-9.5.0-snapshot-6700b7e.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-grouping-9.5.0-snapshot-0878271.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
f12819e51f145624ef7b1fd93aaa543cec13e3aa
1 change: 0 additions & 1 deletion server/licenses/lucene-grouping-9.5.0-snapshot-6700b7e.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-highlighter-9.5.0-snapshot-0878271.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ed88cca26580a32234e3f605cf963703ea99eb60
1 change: 0 additions & 1 deletion server/licenses/lucene-highlighter-9.5.0-snapshot-6700b7e.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-join-9.5.0-snapshot-0878271.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
f51934b2362e827d9f467507624b773153f0ca01
1 change: 0 additions & 1 deletion server/licenses/lucene-join-9.5.0-snapshot-6700b7e.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-memory-9.5.0-snapshot-0878271.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
54744097c6882a498c08ffd8a42b54da00c9420c
1 change: 0 additions & 1 deletion server/licenses/lucene-memory-9.5.0-snapshot-6700b7e.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-misc-9.5.0-snapshot-0878271.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
b9061dea1178e0cac86147d7b69fc53bf2f8ee58
1 change: 0 additions & 1 deletion server/licenses/lucene-misc-9.5.0-snapshot-6700b7e.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-queries-9.5.0-snapshot-0878271.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
eca07717c0ee563c5337222fd1a1b7ef5f03f34f
1 change: 0 additions & 1 deletion server/licenses/lucene-queries-9.5.0-snapshot-6700b7e.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-queryparser-9.5.0-snapshot-0878271.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
4d1ed21bc62940c4545778dc5f6249b67d08b095
1 change: 0 additions & 1 deletion server/licenses/lucene-queryparser-9.5.0-snapshot-6700b7e.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-sandbox-9.5.0-snapshot-0878271.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
c564c73080cff226a131847b4361bc9c2155f00c
1 change: 0 additions & 1 deletion server/licenses/lucene-sandbox-9.5.0-snapshot-6700b7e.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-spatial-extras-9.5.0-snapshot-0878271.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
7a654fcc671e0372a9becd7c7cbd9a1f43569106
1 change: 0 additions & 1 deletion server/licenses/lucene-spatial-extras-9.5.0-snapshot-6700b7e.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-spatial3d-9.5.0-snapshot-0878271.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
33c9c43eac6b4924155eeff03d2231c2bed9b169
1 change: 0 additions & 1 deletion server/licenses/lucene-spatial3d-9.5.0-snapshot-6700b7e.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-suggest-9.5.0-snapshot-0878271.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
95a69fd51377d964d16057a4a9501665a2ca9a7a
1 change: 0 additions & 1 deletion server/licenses/lucene-suggest-9.5.0-snapshot-6700b7e.jar.sha1
View file
Open in desktop

This file was deleted.