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.

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

[Backport] [2.18] Update Apache Lucene to 9.12.1 (#16846) #16870

Merged
merged 2 commits into from
Dec 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 .ci/bwcVersions
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ BWC_VERSION:
- "1.3.18"
- "1.3.19"
- "1.3.20"
- "1.3.21"
- "2.0.0"
- "2.0.1"
- "2.0.2"
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
### Added

### Dependencies
- Bump Apache Lucene from 9.12.0 to 9.12.1 ([#16846](https://github.com/opensearch-project/OpenSearch/pull/16846))

### Changed

Expand Down
2 changes: 1 addition & 1 deletion buildSrc/version.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
opensearch = 2.18.1
lucene = 9.12.0
lucene = 9.12.1

bundled_jdk_vendor = adoptium
bundled_jdk = 21.0.5+11
Expand Down
1 change: 0 additions & 1 deletion libs/core/licenses/lucene-core-9.12.0.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions libs/core/licenses/lucene-core-9.12.1.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
91447c90c1180122142773b5baddaf8547124794
3 changes: 2 additions & 1 deletion libs/core/src/main/java/org/opensearch/Version.java
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ public class Version implements Comparable<Version>, ToXContentFragment {
public static final Version V_1_3_18 = new Version(1031899, org.apache.lucene.util.Version.LUCENE_8_10_1);
public static final Version V_1_3_19 = new Version(1031999, org.apache.lucene.util.Version.LUCENE_8_10_1);
public static final Version V_1_3_20 = new Version(1032099, org.apache.lucene.util.Version.LUCENE_8_10_1);
public static final Version V_1_3_21 = new Version(1032199, org.apache.lucene.util.Version.LUCENE_8_10_1);
public static final Version V_2_0_0 = new Version(2000099, org.apache.lucene.util.Version.LUCENE_9_1_0);
public static final Version V_2_0_1 = new Version(2000199, org.apache.lucene.util.Version.LUCENE_9_1_0);
public static final Version V_2_0_2 = new Version(2000299, org.apache.lucene.util.Version.LUCENE_9_1_0);
Expand Down Expand Up @@ -142,7 +143,7 @@ public class Version implements Comparable<Version>, ToXContentFragment {
public static final Version V_2_17_1 = new Version(2170199, org.apache.lucene.util.Version.LUCENE_9_11_1);
public static final Version V_2_17_2 = new Version(2170299, org.apache.lucene.util.Version.LUCENE_9_11_1);
public static final Version V_2_18_0 = new Version(2180099, org.apache.lucene.util.Version.LUCENE_9_12_0);
public static final Version V_2_18_1 = new Version(2180199, org.apache.lucene.util.Version.LUCENE_9_12_0);
public static final Version V_2_18_1 = new Version(2180199, org.apache.lucene.util.Version.LUCENE_9_12_1);
public static final Version CURRENT = V_2_18_1;

public static Version fromId(int id) {
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
667ee99f31c8e42eac70b0adcf8deb4232935430

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
abaef4767ad64289e62abdd4606bf6ed2ddea0fd

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
635c41143b896f402589d29e33695dcfabae9cc5

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
e265410a6a4d9cd23b2e9c73321e6bd307bc1422

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3787b8edc0cfad21998abc6aeb9d2cbf152b4b26

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
e935f600bf153c46f5725198ca9352c32025f274

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
c4e1c94b1adbd1cb9dbdc0d3c2d2c33beabfc777

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d8e4716dab6d829e7b37a8b185cbd242650aeb9e
1 change: 0 additions & 1 deletion server/licenses/lucene-analysis-common-9.12.0.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-analysis-common-9.12.1.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
86836497e35c1ab33259d9864ceb280c0016075e
1 change: 0 additions & 1 deletion server/licenses/lucene-backward-codecs-9.12.0.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-backward-codecs-9.12.1.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d0e79d06a0ed021663737e4df777ab7b80cd28c4
1 change: 0 additions & 1 deletion server/licenses/lucene-core-9.12.0.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-core-9.12.1.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
91447c90c1180122142773b5baddaf8547124794
1 change: 0 additions & 1 deletion server/licenses/lucene-grouping-9.12.0.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-grouping-9.12.1.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
e4bc3d0aa7eec4f41b4f350de0263a8d5625d2b3
1 change: 0 additions & 1 deletion server/licenses/lucene-highlighter-9.12.0.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-highlighter-9.12.1.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2eeedfcec47dd65969f36e88931ed452291dd43e
1 change: 0 additions & 1 deletion server/licenses/lucene-join-9.12.0.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-join-9.12.1.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3c5e9ff2925a8373ae0d35c1d0a7b2465cebec9f
1 change: 0 additions & 1 deletion server/licenses/lucene-memory-9.12.0.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-memory-9.12.1.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
e80eecfb1dcc324140387c8357c81e12c2a01937
1 change: 0 additions & 1 deletion server/licenses/lucene-misc-9.12.0.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-misc-9.12.1.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
4e65d01d1c23f3f49dc325d552701bbefafee7ee
1 change: 0 additions & 1 deletion server/licenses/lucene-queries-9.12.0.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-queries-9.12.1.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
14f24315041b686683dba4bc679ca7dc6a505906
1 change: 0 additions & 1 deletion server/licenses/lucene-queryparser-9.12.0.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-queryparser-9.12.1.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
aa6df09a99f8881d843e9863aa1713dc9f3ed24f
1 change: 0 additions & 1 deletion server/licenses/lucene-sandbox-9.12.0.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-sandbox-9.12.1.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1a66485629d60779f039fc26360f4374ef1496e7
1 change: 0 additions & 1 deletion server/licenses/lucene-spatial-extras-9.12.0.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-spatial-extras-9.12.1.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0a7379410eff21676472adc8ea76a57891ec83c2
1 change: 0 additions & 1 deletion server/licenses/lucene-spatial3d-9.12.0.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-spatial3d-9.12.1.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d2fdea4edabb1f616f494999651c43abfd0aa124
1 change: 0 additions & 1 deletion server/licenses/lucene-suggest-9.12.0.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-suggest-9.12.1.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0660e0996ec7653fe0c13c608137e264645eecac
Loading