Skip to content

Commit 39ac2df

Browse files
authored
Update to Apache Lucene 9.11.0-snapshot-fb97840 (#13195)
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
1 parent 416083c commit 39ac2df

File tree

49 files changed

+40
-30
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+40
-30
lines changed

buildSrc/version.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
opensearch = 3.0.0
2-
lucene = 9.11.0-snapshot-8a555eb
2+
lucene = 9.11.0-snapshot-fb97840
33

44
bundled_jdk_vendor = adoptium
55
bundled_jdk = 21.0.2+13

libs/core/licenses/lucene-core-9.11.0-snapshot-8a555eb.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
53a828e3e88f55c83979cd3df0704617cc9edb9a

modules/lang-expression/licenses/lucene-expressions-9.11.0-snapshot-8a555eb.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ab914b48665f484315b78e4b6787aa42f5966bb6

plugins/analysis-icu/licenses/lucene-analysis-icu-9.11.0-snapshot-8a555eb.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
f9cd7bec33c8cf3b891976cb674ffe9c97f8747f

plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.11.0-snapshot-8a555eb.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
c244a56bf7cd171a19379c96f1d20c477a34578d

plugins/analysis-nori/licenses/lucene-analysis-nori-9.11.0-snapshot-8a555eb.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
da26df43f2b0d7c2dfecbf208cae0772a5e382ca

plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.11.0-snapshot-8a555eb.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
f752ffa5ee4697b04643214236138f3defdee2f4

plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.11.0-snapshot-8a555eb.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
73fe44fe755aef72e7293b2ffdd934beb631429d

plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.11.0-snapshot-8a555eb.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
c2b48831b25e1c7e8f683a63d1505c2d133256d3

plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.11.0-snapshot-8a555eb.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
757f8b29f103f82b6fb6948634e93dd497c9d7a8

server/build.gradle

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -411,14 +411,21 @@ tasks.register("downloadSnapshot", Copy) {
411411
def groupId = "org.opensearch"
412412
def artifactId = "opensearch"
413413

414-
repositories {
415-
maven {
416-
url mavenSnapshotRepoUrl
417-
}
418-
}
414+
def repos = project.getRepositories();
415+
MavenArtifactRepository opensearchRepo = repos.maven(repo -> {
416+
repo.setName("opensearch-snapshots");
417+
repo.setUrl(mavenSnapshotRepoUrl);
418+
});
419+
420+
repos.exclusiveContent(exclusiveRepo -> {
421+
exclusiveRepo.filter(descriptor -> descriptor.includeGroup(groupId));
422+
exclusiveRepo.forRepositories(opensearchRepo);
423+
});
419424

420425
configurations {
421-
snapshotArtifact
426+
snapshotArtifact {
427+
exclude group: 'org.apache.lucene'
428+
}
422429
}
423430

424431
dependencies {

server/licenses/lucene-analysis-common-9.11.0-snapshot-8a555eb.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
cd0afb5da5dcb4c7498bd1ee7f7bab0e289404b8

server/licenses/lucene-backward-codecs-9.11.0-snapshot-8a555eb.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
88888315cd60e565960ae2e6fed2af0df077a2a2

server/licenses/lucene-core-9.11.0-snapshot-8a555eb.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
53a828e3e88f55c83979cd3df0704617cc9edb9a

server/licenses/lucene-grouping-9.11.0-snapshot-8a555eb.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
d1f54a816c9d85e890a862a2dffdc734ece2770c

server/licenses/lucene-highlighter-9.11.0-snapshot-8a555eb.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1e7c9336fa86fb866fcd76ea5d6283c804b4d580

server/licenses/lucene-join-9.11.0-snapshot-8a555eb.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
17be4fc1f9feca0dac84a37d54dca4b32df4c619

server/licenses/lucene-memory-9.11.0-snapshot-8a555eb.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
7350675a2cf386c0f003b667b61db614f03bb984

server/licenses/lucene-misc-9.11.0-snapshot-8a555eb.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
c5c8bd120d5985ab6bd4e5f89efe08c226c0a323

server/licenses/lucene-queries-9.11.0-snapshot-8a555eb.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
2e1975ac26e9172722f734bf0f5583317e5eb16a

server/licenses/lucene-queryparser-9.11.0-snapshot-8a555eb.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
c8cf3d5dd4d0538b38e4e88bb865bc59d835d887

server/licenses/lucene-sandbox-9.11.0-snapshot-8a555eb.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
5a3a7a138ff4978f3ddb186d9786e6cb4793b291

server/licenses/lucene-spatial-extras-9.11.0-snapshot-8a555eb.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
dc71e0125c66d29a1bffc1ddeab4b96526e737c8

server/licenses/lucene-spatial3d-9.11.0-snapshot-8a555eb.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
aef4c04d353092a438eee302521fe34188b7c4df

server/licenses/lucene-suggest-9.11.0-snapshot-8a555eb.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
86f68cacd85f99b4ddcda3aff7c873349ba59381

test/framework/src/main/java/org/opensearch/indices/analysis/AnalysisFactoryTestCase.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,9 @@ public abstract class AnalysisFactoryTestCase extends OpenSearchTestCase {
222222
.put("persianstem", Void.class)
223223
// https://github.com/apache/lucene/pull/12169
224224
.put("word2vecsynonym", Void.class)
225+
// https://github.com/apache/lucene/pull/12915
226+
.put("japanesehiraganauppercase", Void.class)
227+
.put("japanesekatakanauppercase", Void.class)
225228
.immutableMap();
226229

227230
static final Map<String, Class<?>> KNOWN_CHARFILTERS = new MapBuilder<String, Class<?>>()

0 commit comments

Comments
 (0)