Merge branch 'seg-rep/checkpoint-publish' of https://github.com/Rishi…

…kesh1159/OpenSearch into seg-rep/checkpoint-publish

Signed-off-by: Rishikesh1159 <[email protected]>

MAINTAINERS.md

@@ -1,4 +1,7 @@
-## Maintainers
+- [Current Maintainers](#current-maintainers)
+- [Emeritus](#emeritus)
+
+## Current Maintainers
 
 | Maintainer | GitHub ID | Affiliation |
 | --------------- | --------- | ----------- |
@@ -8,12 +11,10 @@
 | Andriy Redko | [reta](https://github.com/reta) | Aiven |
 | Charlotte Henkle | [CEHENKLE](https://github.com/CEHENKLE) | Amazon |
 | Daniel "dB." Doubrovkine | [dblock](https://github.com/dblock) | Amazon |
-| Gopala Krishna Ambareesh | [krishna-ggk](https://github.com/krishna-ggk) |Amazon |
 | Himanshu Setia | [setiah](https://github.com/setiah) | Amazon |
-| Itiyama Sadana | [itiyamas](https://github.com/itiyamas) | Amazon |
 | Kartik Ganesh | [kartg](https://github.com/kartg) | Amazon |
+| Kunal Kotwani | [kotwanikunal](https://github.com/kotwanikunal) | Amazon |
 | Marc Handalian | [mch2](https://github.com/mch2) | Amazon |
-| Megha Sai Kavikondala | [meghasaik](https://github.com/meghasaik) | Amazon |
 | Nick Knize | [nknize](https://github.com/nknize) | Amazon |
 | Owais Kazi | [owaiskazi19](https://github.com/owaiskazi19) | Amazon |
 | Rabi Panda | [adnapibar](https://github.com/adnapibar) | Amazon |
@@ -23,7 +24,12 @@
 | Shweta Thareja |[shwetathareja](https://github.com/shwetathareja) | Amazon |
 | Tianli Feng | [tlfeng](https://github.com/tlfeng) | Amazon |
 | Vacha Shah | [VachaShah](https://github.com/VachaShah) | Amazon |
-| Vengadanathan Srinivasan | [vengadanathan-s](https://github.com/vengadanathan-s) | Amazon |
 | Xue Zhou | [xuezhou25](https://github.com/xuezhou25) | Amazon |
 
+## Emeritus
+
+| Maintainer | GitHub ID | Affiliation |
+| --------------- | --------- | ----------- |
+| Megha Sai Kavikondala | [meghasaik](https://github.com/meghasaik) | Amazon |
+
 [This document](https://github.com/opensearch-project/.github/blob/main/MAINTAINERS.md) explains what maintainers do in this repo, and how they should be doing it. If you're interested in contributing, see [CONTRIBUTING](CONTRIBUTING.md).

build.gradle

@@ -48,7 +48,7 @@ plugins {
   id 'lifecycle-base'
   id 'opensearch.docker-support'
   id 'opensearch.global-build-info'
-  id "com.diffplug.spotless" version "6.4.2" apply false
+  id "com.diffplug.spotless" version "6.5.1" apply false
   id "org.gradle.test-retry" version "1.3.2" apply false
   id "test-report-aggregation"
   id 'jacoco-report-aggregation'
@@ -278,6 +278,7 @@ allprojects {
     // see https://discuss.gradle.org/t/add-custom-javadoc-option-that-does-not-take-an-argument/5959
     javadoc.options.encoding = 'UTF8'
     javadoc.options.addStringOption('Xdoclint:all,-missing', '-quiet')
+    javadoc.options.tags = ["opensearch.internal", "opensearch.api", "opensearch.experimental"]
   }
 
   // support for reproducible builds
@@ -387,7 +388,7 @@ gradle.projectsEvaluated {
       }
     }
   }
-  
+
   dependencies {
     subprojects.findAll { it.pluginManager.hasPlugin('java') }.forEach {
       testReportAggregation it
@@ -413,7 +414,7 @@ subprojects {
 // eclipse configuration
 allprojects {
   apply plugin: 'eclipse'
-  
+
   // Name all the non-root projects after their path so that paths get grouped together when imported into eclipse.
   if (path != ':') {
     eclipse.project.name = path
@@ -573,12 +574,12 @@ subprojects {
 
 reporting {
   reports {
-    testAggregateTestReport(AggregateTestReport) { 
+    testAggregateTestReport(AggregateTestReport) {
       testType = TestSuiteType.UNIT_TEST
     }
   }
 }
 
 tasks.named(JavaBasePlugin.CHECK_TASK_NAME) {
-  dependsOn tasks.named('testAggregateTestReport', TestReport) 
+  dependsOn tasks.named('testAggregateTestReport', TestReport)
 }

buildSrc/build.gradle

@@ -122,7 +122,7 @@ dependencies {
   testFixturesApi "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${props.getProperty('randomizedrunner')}"
   testFixturesApi gradleApi()
   testFixturesApi gradleTestKit()
-  testImplementation 'com.github.tomakehurst:wiremock-jre8-standalone:2.32.0'
+  testImplementation 'com.github.tomakehurst:wiremock-jre8-standalone:2.33.2'
   testImplementation "org.mockito:mockito-core:${props.getProperty('mockito')}"
   integTestImplementation('org.spockframework:spock-core:2.1-groovy-3.0') {
     exclude module: "groovy"

distribution/packages/build.gradle

@@ -355,7 +355,7 @@ tasks.register('buildDeb', Deb) {
 }
 
 tasks.register('buildNoJdkDeb', Deb) {
-  configure(commonDebConfig(true, 'x64'))
+  configure(commonDebConfig(false, 'x64'))
 }
 
 Closure commonRpmConfig(boolean jdk, String architecture) {

gradle/missing-javadoc.gradle

@@ -162,7 +162,6 @@ configure([
   project(":qa:os"),
   project(":qa:wildfly"),
   project(":rest-api-spec"),
-  project(":server"),
   project(":test:external-modules:test-delayed-aggs"),
   project(":test:fixtures:azure-fixture"),
   project(":test:fixtures:gcs-fixture"),
@@ -177,6 +176,14 @@ configure([
   }
 }
 
+configure(project(":server")) {
+  project.tasks.withType(MissingJavadocTask) {
+    isExcluded = true
+    // TODO: reenable after fixing missing javadocs
+    javadocMissingLevel = "class"
+  }
+}
+
 class MissingJavadocTask extends DefaultTask {
   @InputFiles
   @SkipWhenEmpty
@@ -274,6 +281,10 @@ class MissingJavadocTask extends DefaultTask {
     if (!classpath.isEmpty()) {
       opts << [ '-classpath', classpath.asPath ]
     }
+
+    opts << [ '-tag', 'opensearch.experimental:a:WARNING: This API is experimental and might change in incompatible ways in the next release.' ]
+    opts << [ '-tag', 'opensearch.internal:a:NOTE: This API is for internal purposes only and might change in incompatible ways in the next release.' ]
+
     opts << [ '-doclet', "org.opensearch.missingdoclet.MissingDoclet" ]
     opts << [ '-docletpath', docletpath.asPath ]
     opts << [ '--missing-level', javadocMissingLevel ]

plugins/analysis-ukrainian/build.gradle

@@ -37,7 +37,7 @@ opensearchplugin {
 dependencies {
   api "org.apache.lucene:lucene-analysis-morfologik:${versions.lucene}"
   api "org.carrot2:morfologik-stemming:2.1.8"
-  api "org.carrot2:morfologik-fsa:2.1.8"
+  api "org.carrot2:morfologik-fsa:2.1.9"
   api "ua.net.nlp:morfologik-ukrainian-search:4.9.1"
 }
 

plugins/analysis-ukrainian/licenses/morfologik-fsa-2.1.9.jar.sha1

@@ -0,0 +1 @@
+a12005eacfbbbe256fd4d41f80f6e3675d7e314e

plugins/ingest-attachment/build.gradle

@@ -38,19 +38,26 @@ opensearchplugin {
 }
 
 versions << [
-  'tika'  : '1.24.1',
-  'pdfbox': '2.0.24',
-  'poi'   : '4.1.2',
+  'tika'  : '2.4.0',
+  'pdfbox': '2.0.25',
+  'poi'   : '5.2.2',
   'mime4j': '0.8.3'
 ]
 
 dependencies {
   // mandatory for tika
   api "org.apache.tika:tika-core:${versions.tika}"
-  // build against Jackson 2.9.5, but still works on our current version
   api "org.apache.tika:tika-parsers:${versions.tika}"
+  // Required for the various document parsers
+  api "org.apache.tika:tika-parsers-standard-package:${versions.tika}"
+  // Required for language detection
+  api "org.apache.tika:tika-langdetect-optimaize:${versions.tika}"
+  // Optimaize libraries/dependencies
+  runtimeOnly "com.optimaize.languagedetector:language-detector:0.6"
+  runtimeOnly 'com.google.guava:guava:18.0'
+  // Other dependencies
   api 'org.tukaani:xz:1.8'
-  api 'commons-io:commons-io:2.7'
+  api 'commons-io:commons-io:2.11.0'
   api "org.slf4j:slf4j-api:${versions.slf4j}"
 
   // character set detection
@@ -70,9 +77,9 @@ dependencies {
   // OpenOffice
   api "org.apache.poi:poi-ooxml:${versions.poi}"
   api "org.apache.poi:poi:${versions.poi}"
-  api "org.apache.poi:poi-ooxml-schemas:${versions.poi}"
+  api "org.apache.poi:poi-ooxml-lite:${versions.poi}"
   api "commons-codec:commons-codec:${versions.commonscodec}"
-  api 'org.apache.xmlbeans:xmlbeans:3.0.1'
+  api 'org.apache.xmlbeans:xmlbeans:5.0.3'
   api 'org.apache.commons:commons-collections4:4.1'
   // MS Office
   api "org.apache.poi:poi-scratchpad:${versions.poi}"
@@ -82,7 +89,7 @@ dependencies {
   api "org.apache.james:apache-mime4j-core:${versions.mime4j}"
   api "org.apache.james:apache-mime4j-dom:${versions.mime4j}"
   // EPUB books
-  api 'org.apache.commons:commons-lang3:3.9'
+  api 'org.apache.commons:commons-lang3:3.12.0'
   // Microsoft Word files with visio diagrams
   api 'org.apache.commons:commons-math3:3.6.1'
   // POIs dependency
@@ -97,6 +104,8 @@ restResources {
 
 tasks.named("dependencyLicenses").configure {
   mapping from: /apache-mime4j-.*/, to: 'apache-mime4j'
+  mapping from: /tika-.*/, to: 'tika-parsers'
+  mapping from: /poi-ooxml-.*/, to: 'poi-ooxml'
 }
 
 forbiddenPatterns {
@@ -109,6 +118,13 @@ forbiddenPatterns {
 
 thirdPartyAudit {
   ignoreMissingClasses()
+  ignoreViolations(
+    'com.google.common.cache.Striped64',
+    'com.google.common.cache.Striped64$1',
+    'com.google.common.cache.Striped64$Cell',
+    'com.google.common.primitives.UnsignedBytes$LexicographicalComparatorHolder$UnsafeComparator',
+    'com.google.common.primitives.UnsignedBytes$LexicographicalComparatorHolder$UnsafeComparator$1'
+  )
 }
 
 if (BuildParams.inFipsJvm) {

plugins/ingest-attachment/licenses/commons-io-2.11.0.jar.sha1

@@ -0,0 +1 @@
+a2503f302b11ebde7ebc3df41daebe0e4eea3689

plugins/ingest-attachment/licenses/commons-lang3-3.12.0.jar.sha1

@@ -0,0 +1 @@
+c6842c86792ff03b9f1d1fe2aab8dc23aa6c6f0e

plugins/ingest-attachment/licenses/fontbox-2.0.25.jar.sha1

@@ -0,0 +1 @@
+f6644a1eb1d165eded719a88bf7bdcff91740b98

plugins/ingest-attachment/licenses/guava-18.0.jar.sha1

@@ -0,0 +1 @@
+cce0823396aa693798f8882e64213b1772032b09