Revert "[Backport 2.x] [Upgrade] Lucene 9.5.0 release (opensearch-pro…

…ject#6078) (opensearch-project#6116)"

This reverts commit 090ecab.

CHANGELOG.md

@@ -33,6 +33,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Bump `com.networknt:json-schema-validator` from 1.0.78 to 1.0.81 (#7460)
 - Bump Apache Lucene to 9.6.0 ([#7505](https:/opensearch-project/OpenSearch/pull/7505))
 - Bump `com.google.cloud:google-cloud-core-http` from 1.93.3 to 2.17.0 (#7488)
+- Update nebula-publishing-plugin to 19.2.0 ([#5704](https:/opensearch-project/OpenSearch/pull/5704))
+- Bumps `reactor-netty` from 1.1.1 to 1.1.2 ([#5878](https:/opensearch-project/OpenSearch/pull/5878))
+- OpenJDK Update (January 2023 Patch releases) ([#6075](https:/opensearch-project/OpenSearch/pull/6075))
+- Bumps `Mockito` from 4.7.0 to 5.1.0, `ByteBuddy` from 1.12.18 to 1.12.22 ([#6088](https:/opensearch-project/OpenSearch/pull/6088))
+- Bumps `joda` from 2.10.13 to 2.12.2 ([#6095](https:/opensearch-project/OpenSearch/pull/6095))
 
 ### Changed
 - Enable `./gradlew build` on MacOS by disabling bcw tests ([#7303](https:/opensearch-project/OpenSearch/pull/7303))

buildSrc/version.properties

@@ -1,5 +1,5 @@
 opensearch = 2.8.0
-lucene = 9.5.0
+lucene = 9.4.2
 
 bundled_jdk_vendor = adoptium
 bundled_jdk = 17.0.7+7

modules/analysis-common/src/test/java/org/opensearch/analysis/common/HighlighterWithAnalyzersTests.java

@@ -50,7 +50,6 @@
 import static org.opensearch.client.Requests.searchRequest;
 import static org.opensearch.common.xcontent.XContentFactory.jsonBuilder;
 import static org.opensearch.index.query.QueryBuilders.boolQuery;
-import static org.opensearch.index.query.QueryBuilders.matchAllQuery;
 import static org.opensearch.index.query.QueryBuilders.matchPhrasePrefixQuery;
 import static org.opensearch.index.query.QueryBuilders.matchPhraseQuery;
 import static org.opensearch.index.query.QueryBuilders.matchQuery;
@@ -62,7 +61,6 @@
 import static org.hamcrest.Matchers.anyOf;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.startsWith;
-import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertHitCount;
 
 public class HighlighterWithAnalyzersTests extends OpenSearchIntegTestCase {
  @Override
@@ -272,13 +270,9 @@ public void testPhrasePrefix() throws IOException {
  refresh();
  logger.info("--> highlighting and searching on field0");
 
- SearchSourceBuilder source = searchSource().query(matchAllQuery());
- SearchResponse searchResponse = client().search(searchRequest("first_test_index").source(source)).actionGet();
- assertHitCount(searchResponse, 2);
-
- source = searchSource().query(matchPhrasePrefixQuery("field0", "bro"))
+ SearchSourceBuilder source = searchSource().query(matchPhrasePrefixQuery("field0", "bro"))
  .highlighter(highlight().field("field0").order("score").preTags("<x>").postTags("</x>"));
- searchResponse = client().search(searchRequest("first_test_index").source(source)).actionGet();
+ SearchResponse searchResponse = client().search(searchRequest("first_test_index").source(source)).actionGet();
 
  assertHighlight(searchResponse, 0, "field0", 0, 1, equalTo("The quick <x>brown</x> fox jumps over the lazy dog"));
 
@@ -421,7 +415,6 @@ public void testPhrasePrefix() throws IOException {
  public static XContentBuilder type1TermVectorMapping() throws IOException {
  return XContentFactory.jsonBuilder()
  .startObject()
- .startObject("_doc")
  .startObject("properties")
  .startObject("field1")
  .field("type", "text")
@@ -432,7 +425,6 @@ public static XContentBuilder type1TermVectorMapping() throws IOException {
  .field("term_vector", "with_positions_offsets")
  .endObject()
  .endObject()
- .endObject()
  .endObject();
  }
 }

modules/lang-expression/build.gradle

@@ -37,7 +37,7 @@ opensearchplugin {
 
 dependencies {
  api "org.apache.lucene:lucene-expressions:${versions.lucene}"
- api "org.antlr:antlr4-runtime:${versions.antlr4}"
+ api 'org.antlr:antlr4-runtime:4.9.3'
  api "org.ow2.asm:asm:${versions.asm}"
  api "org.ow2.asm:asm-commons:${versions.asm}"
  api "org.ow2.asm:asm-tree:${versions.asm}"

modules/lang-expression/licenses/antlr4-runtime-4.9.3.jar.sha1

@@ -0,0 +1 @@
+81befc16ebedb8b8aea3e4c0835dd5ca7e8523a8

modules/lang-expression/licenses/lucene-expressions-9.4.2.jar.sha1

@@ -0,0 +1 @@
+f433ede87302221b48703a890e5f5701cf1b021d

modules/lang-painless/build.gradle

@@ -53,7 +53,7 @@ testClusters.all {
 }
 
 dependencies {
- api "org.antlr:antlr4-runtime:${versions.antlr4}"
+ api 'org.antlr:antlr4-runtime:4.9.3'
  api "org.ow2.asm:asm-util:${versions.asm}"
  api "org.ow2.asm:asm-tree:${versions.asm}"
  api "org.ow2.asm:asm-commons:${versions.asm}"
@@ -160,7 +160,7 @@ configurations {
 }
 
 dependencies {
- regenerate "org.antlr:antlr4:${versions.antlr4}"
+ regenerate 'org.antlr:antlr4:4.5.3'
 }
 
 String grammarPath = 'src/main/antlr'

modules/lang-painless/licenses/antlr4-runtime-4.9.3.jar.sha1

@@ -0,0 +1 @@
+81befc16ebedb8b8aea3e4c0835dd5ca7e8523a8