Merge branch '1.x' into 1.x-backport2178

Signed-off-by: Andreas <apre@gmx.at>
opensearch-project · Mar 7, 2022 · a2bc84c · a2bc84c
2 parents a729d51 + 50c1da1
commit a2bc84c
Show file tree

Hide file tree

Showing 65 changed files with 1,461 additions and 183 deletions.
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
@@ -102,7 +102,7 @@ dependencies {
 
   api localGroovy()
 
-  api 'commons-codec:commons-codec:1.13'
+  api 'commons-codec:commons-codec:1.15'
   api 'org.apache.commons:commons-compress:1.21'
   api 'org.apache.ant:ant:1.10.12'
   api 'com.netflix.nebula:gradle-extra-configurations-plugin:3.0.3'

diff --git a/buildSrc/src/integTest/java/org/opensearch/gradle/precommit/ThirdPartyAuditTaskIT.java b/buildSrc/src/integTest/java/org/opensearch/gradle/precommit/ThirdPartyAuditTaskIT.java
@@ -71,7 +71,7 @@ public void testWithEmptyRules() {
             "-PcompileOnlyVersion=0.0.1",
             "-PcompileGroup=other.gradle:dummy-io",
             "-PcompileVersion=0.0.1"
-        ).buildAndFail();
+        ).build();
     }
 
     public void testViolationFoundAndCompileOnlyIgnored() {

diff --git a/buildSrc/src/main/java/org/opensearch/gradle/precommit/ThirdPartyAuditPrecommitPlugin.java b/buildSrc/src/main/java/org/opensearch/gradle/precommit/ThirdPartyAuditPrecommitPlugin.java
@@ -51,7 +51,7 @@ public class ThirdPartyAuditPrecommitPlugin extends PrecommitPlugin {
     public TaskProvider<? extends Task> createTask(Project project) {
         project.getPlugins().apply(CompileOnlyResolvePlugin.class);
         project.getConfigurations().create("forbiddenApisCliJar");
-        project.getDependencies().add("forbiddenApisCliJar", "de.thetaphi:forbiddenapis:2.7");
+        project.getDependencies().add("forbiddenApisCliJar", "de.thetaphi:forbiddenapis:3.2");
 
         Configuration jdkJarHellConfig = project.getConfigurations().create(JDK_JAR_HELL_CONFIG_NAME);
         if (BuildParams.isInternal() && project.getPath().equals(":libs:opensearch-core") == false) {

diff --git a/buildSrc/src/testKit/thirdPartyAudit/build.gradle b/buildSrc/src/testKit/thirdPartyAudit/build.gradle
@@ -40,7 +40,7 @@ repositories {
 }
 
 dependencies {
-  forbiddenApisCliJar 'de.thetaphi:forbiddenapis:2.7'
+  forbiddenApisCliJar 'de.thetaphi:forbiddenapis:3.2'
   jdkJarHell 'org.opensearch:opensearch-core:current'
   compileOnly "org.${project.properties.compileOnlyGroup}:${project.properties.compileOnlyVersion}"
   implementation "org.${project.properties.compileGroup}:${project.properties.compileVersion}"

diff --git a/distribution/docker/src/docker/Dockerfile b/distribution/docker/src/docker/Dockerfile
@@ -64,7 +64,7 @@ FROM ${base_image}
 ENV OPENSEARCH_CONTAINER true
 
 RUN  sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-Linux-* && \\
-     sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-Linux-* && \\
+     sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.epel.cloud|g' /etc/yum.repos.d/CentOS-Linux-* && \\
      for iter in {1..10}; do \\
       ${package_manager} update --setopt=tsflags=nodocs -y && \\
       ${package_manager} install --setopt=tsflags=nodocs -y \\

diff --git a/distribution/tools/plugin-cli/build.gradle b/distribution/tools/plugin-cli/build.gradle
@@ -38,7 +38,7 @@ dependencies {
   api "org.bouncycastle:bcpg-fips:1.0.5.1"
   api "org.bouncycastle:bc-fips:1.0.2.1"
   testImplementation project(":test:framework")
-  testImplementation 'com.google.jimfs:jimfs:1.1'
+  testImplementation 'com.google.jimfs:jimfs:1.2'
   testRuntimeOnly 'com.google.guava:guava:31.0.1-jre'
 }
 

diff --git a/modules/ingest-geoip/build.gradle b/modules/ingest-geoip/build.gradle
@@ -71,10 +71,8 @@ tasks.named("thirdPartyAudit").configure {
   ignoreMissingClasses(
           // geoip WebServiceClient needs apache http client, but we're not using WebServiceClient:
           'org.apache.http.HttpEntity',
-          'org.apache.http.HttpHost',
           'org.apache.http.HttpResponse',
           'org.apache.http.StatusLine',
-          'org.apache.http.auth.UsernamePasswordCredentials',
           'org.apache.http.client.config.RequestConfig$Builder',
           'org.apache.http.client.config.RequestConfig',
           'org.apache.http.client.methods.CloseableHttpResponse',

diff --git a/modules/lang-expression/build.gradle b/modules/lang-expression/build.gradle
@@ -37,10 +37,10 @@ opensearchplugin {
 
 dependencies {
   api "org.apache.lucene:lucene-expressions:${versions.lucene}"
-  api 'org.antlr:antlr4-runtime:4.5.1-1'
+  api 'org.antlr:antlr4-runtime:4.9.3'
   api 'org.ow2.asm:asm:9.2'
   api 'org.ow2.asm:asm-commons:5.0.4'
-  api 'org.ow2.asm:asm-tree:5.0.4'
+  api 'org.ow2.asm:asm-tree:9.2'
 }
 restResources {
   restApi {

diff --git a/modules/lang-expression/licenses/antlr4-runtime-4.5.1-1.jar.sha1 b/modules/lang-expression/licenses/antlr4-runtime-4.5.1-1.jar.sha1
diff --git a/modules/lang-expression/licenses/antlr4-runtime-4.9.3.jar.sha1 b/modules/lang-expression/licenses/antlr4-runtime-4.9.3.jar.sha1
@@ -0,0 +1 @@
+81befc16ebedb8b8aea3e4c0835dd5ca7e8523a8
diff --git a/modules/lang-expression/licenses/asm-tree-5.0.4.jar.sha1 b/modules/lang-expression/licenses/asm-tree-5.0.4.jar.sha1
diff --git a/modules/lang-expression/licenses/asm-tree-9.2.jar.sha1 b/modules/lang-expression/licenses/asm-tree-9.2.jar.sha1
@@ -0,0 +1 @@
+d96c99a30f5e1a19b0e609dbb19a44d8518ac01e
diff --git a/modules/transport-netty4/build.gradle b/modules/transport-netty4/build.gradle
@@ -149,10 +149,7 @@ thirdPartyAudit {
     // from io.netty.handler.ssl.util.BouncyCastleSelfSignedCertGenerator (netty)
     'org.bouncycastle.cert.X509v3CertificateBuilder',
     'org.bouncycastle.cert.jcajce.JcaX509CertificateConverter',
-    'org.bouncycastle.cert.jcajce.JcaX509v3CertificateBuilder',
-    'org.bouncycastle.jce.provider.BouncyCastleProvider',
     'org.bouncycastle.operator.jcajce.JcaContentSignerBuilder',
-    'org.bouncycastle.asn1.x500.X500Name',
 
     // from io.netty.handler.ssl.JettyNpnSslEngine (netty)
     'org.eclipse.jetty.npn.NextProtoNego$ClientProvider',

diff --git a/plugins/analysis-ukrainian/build.gradle b/plugins/analysis-ukrainian/build.gradle
@@ -36,7 +36,7 @@ opensearchplugin {
 
 dependencies {
   api "org.apache.lucene:lucene-analyzers-morfologik:${versions.lucene}"
-  api "org.carrot2:morfologik-stemming:2.1.1"
+  api "org.carrot2:morfologik-stemming:2.1.8"
   api "org.carrot2:morfologik-fsa:2.1.1"
   api "ua.net.nlp:morfologik-ukrainian-search:4.9.1"
 }

diff --git a/plugins/analysis-ukrainian/licenses/morfologik-stemming-2.1.1.jar.sha1 b/plugins/analysis-ukrainian/licenses/morfologik-stemming-2.1.1.jar.sha1
diff --git a/plugins/analysis-ukrainian/licenses/morfologik-stemming-2.1.8.jar.sha1 b/plugins/analysis-ukrainian/licenses/morfologik-stemming-2.1.8.jar.sha1
@@ -0,0 +1 @@
+409fa92db4cfb0f90a33d303732a4882cee3d1e7
diff --git a/plugins/discovery-azure-classic/licenses/jaxb-api-2.2.2.jar.sha1 b/plugins/discovery-azure-classic/licenses/jaxb-api-2.2.2.jar.sha1
diff --git a/plugins/discovery-azure-classic/licenses/jaxb-api-2.3.1.jar.sha1 b/plugins/discovery-azure-classic/licenses/jaxb-api-2.3.1.jar.sha1
@@ -0,0 +1 @@
+8531ad5ac454cc2deb9d4d32c40c4d7451939b5d
diff --git a/plugins/discovery-ec2/build.gradle b/plugins/discovery-ec2/build.gradle
@@ -134,17 +134,8 @@ tasks.named("thirdPartyAudit").configure {
   ignoreMissingClasses(
           // classes are missing
           'javax.jms.Message',
-          'com.amazonaws.jmespath.JmesPathEvaluationVisitor',
           'com.amazonaws.jmespath.JmesPathExpression',
-          'com.amazonaws.jmespath.JmesPathField',
-          'com.amazonaws.jmespath.JmesPathFlatten',
-          'com.amazonaws.jmespath.JmesPathIdentity',
-          'com.amazonaws.jmespath.JmesPathLengthFunction',
-          'com.amazonaws.jmespath.JmesPathLiteral',
-          'com.amazonaws.jmespath.JmesPathProjection',
-          'com.amazonaws.jmespath.JmesPathSubExpression',
           'com.amazonaws.jmespath.ObjectMapperSingleton',
-          'com.amazonaws.jmespath.OpGreaterThan',
           'software.amazon.ion.IonReader',
           'software.amazon.ion.IonSystem',
           'software.amazon.ion.IonType',

diff --git a/plugins/repository-azure/build.gradle b/plugins/repository-azure/build.gradle
@@ -119,25 +119,16 @@ thirdPartyAudit {
     'io.micrometer.core.instrument.search.Search',
     'io.netty.channel.epoll.Epoll',
     'io.netty.channel.epoll.EpollDatagramChannel',
-    'io.netty.channel.epoll.EpollDomainDatagramChannel',
-    'io.netty.channel.epoll.EpollDomainSocketChannel',
-    'io.netty.channel.epoll.EpollEventLoopGroup',
-    'io.netty.channel.epoll.EpollServerDomainSocketChannel',
     'io.netty.channel.epoll.EpollServerSocketChannel',
     'io.netty.channel.epoll.EpollSocketChannel',
     'io.netty.channel.kqueue.KQueue',
     'io.netty.channel.kqueue.KQueueDatagramChannel',
-    'io.netty.channel.kqueue.KQueueDomainDatagramChannel',
-    'io.netty.channel.kqueue.KQueueDomainSocketChannel',
-    'io.netty.channel.kqueue.KQueueEventLoopGroup',
-    'io.netty.channel.kqueue.KQueueServerDomainSocketChannel',
     'io.netty.channel.kqueue.KQueueServerSocketChannel',
     'io.netty.channel.kqueue.KQueueSocketChannel',
     'io.netty.handler.codec.haproxy.HAProxyMessage',
     'io.netty.handler.codec.haproxy.HAProxyMessageDecoder',
     'io.netty.incubator.channel.uring.IOUring',
     'io.netty.incubator.channel.uring.IOUringDatagramChannel',
-    'io.netty.incubator.channel.uring.IOUringEventLoopGroup',
     'io.netty.incubator.channel.uring.IOUringServerSocketChannel',
     'io.netty.incubator.channel.uring.IOUringSocketChannel',
     'javax.activation.DataHandler',
@@ -167,7 +158,6 @@ thirdPartyAudit {
     'javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter',
     'javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter$DEFAULT',
     'javax.xml.bind.annotation.adapters.XmlJavaTypeAdapters',
-    'kotlin.TypeCastException',
     'kotlin.collections.ArraysKt',
     'kotlin.jvm.JvmClassMappingKt',
     'kotlin.jvm.functions.Function0',

diff --git a/plugins/repository-gcs/build.gradle b/plugins/repository-gcs/build.gradle
@@ -165,39 +165,23 @@ thirdPartyAudit {
     'org.apache.http.client.RedirectHandler',
     'org.apache.http.client.RequestDirector',
     'org.apache.http.client.UserTokenHandler',
-    'org.apache.http.client.methods.HttpDelete',
     'org.apache.http.client.methods.HttpEntityEnclosingRequestBase',
-    'org.apache.http.client.methods.HttpGet',
-    'org.apache.http.client.methods.HttpHead',
-    'org.apache.http.client.methods.HttpOptions',
-    'org.apache.http.client.methods.HttpPost',
-    'org.apache.http.client.methods.HttpPut',
     'org.apache.http.client.methods.HttpRequestBase',
-    'org.apache.http.client.methods.HttpTrace',
     'org.apache.http.config.SocketConfig',
     'org.apache.http.config.SocketConfig$Builder',
     'org.apache.http.conn.ClientConnectionManager',
     'org.apache.http.conn.ConnectionKeepAliveStrategy',
     'org.apache.http.conn.params.ConnManagerParams',
-    'org.apache.http.conn.params.ConnPerRouteBean',
     'org.apache.http.conn.params.ConnRouteParams',
     'org.apache.http.conn.routing.HttpRoutePlanner',
     'org.apache.http.conn.scheme.PlainSocketFactory',
-    'org.apache.http.conn.scheme.Scheme',
     'org.apache.http.conn.scheme.SchemeRegistry',
-    'org.apache.http.conn.ssl.SSLConnectionSocketFactory',
     'org.apache.http.conn.ssl.SSLSocketFactory',
     'org.apache.http.conn.ssl.X509HostnameVerifier',
     'org.apache.http.entity.AbstractHttpEntity',
     'org.apache.http.impl.client.DefaultHttpClient',
-    'org.apache.http.impl.client.DefaultHttpRequestRetryHandler',
     'org.apache.http.impl.client.HttpClientBuilder',
     'org.apache.http.impl.conn.PoolingHttpClientConnectionManager',
-    'org.apache.http.impl.conn.ProxySelectorRoutePlanner',
-    'org.apache.http.impl.conn.SystemDefaultRoutePlanner',
-    'org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager',
-    'org.apache.http.message.BasicHttpResponse',
-    'org.apache.http.params.BasicHttpParams',
     'org.apache.http.params.HttpConnectionParams',
     'org.apache.http.params.HttpParams',
     'org.apache.http.params.HttpProtocolParams',

diff --git a/plugins/repository-hdfs/build.gradle b/plugins/repository-hdfs/build.gradle
@@ -83,7 +83,7 @@ dependencies {
   api 'net.minidev:json-smart:2.4.7'
   api 'org.apache.zookeeper:zookeeper:3.7.0'
   api "io.netty:netty-all:${versions.netty}"
-  implementation 'com.fasterxml.woodstox:woodstox-core:6.1.1'
+  implementation 'com.fasterxml.woodstox:woodstox-core:6.2.8'
   implementation 'org.codehaus.woodstox:stax2-api:4.2.1'
 
   hdfsFixture project(':test:fixtures:hdfs-fixture')

diff --git a/plugins/repository-hdfs/licenses/woodstox-core-6.1.1.jar.sha1 b/plugins/repository-hdfs/licenses/woodstox-core-6.1.1.jar.sha1
diff --git a/plugins/repository-hdfs/licenses/woodstox-core-6.2.8.jar.sha1 b/plugins/repository-hdfs/licenses/woodstox-core-6.2.8.jar.sha1
@@ -0,0 +1 @@
+670748292899c53b1963730d9eb7f8ab71314e90
diff --git a/plugins/transport-nio/build.gradle b/plugins/transport-nio/build.gradle
@@ -82,10 +82,7 @@ thirdPartyAudit {
     // from io.netty.handler.ssl.util.BouncyCastleSelfSignedCertGenerator (netty)
     'org.bouncycastle.cert.X509v3CertificateBuilder',
     'org.bouncycastle.cert.jcajce.JcaX509CertificateConverter',
-    'org.bouncycastle.cert.jcajce.JcaX509v3CertificateBuilder',
-    'org.bouncycastle.jce.provider.BouncyCastleProvider',
     'org.bouncycastle.operator.jcajce.JcaContentSignerBuilder',
-    'org.bouncycastle.asn1.x500.X500Name',
 
     // from io.netty.handler.ssl.JettyNpnSslEngine (netty)
     'org.eclipse.jetty.npn.NextProtoNego$ClientProvider',

diff --git a/server/build.gradle b/server/build.gradle
@@ -227,7 +227,6 @@ tasks.named("thirdPartyAudit").configure {
             'com.fasterxml.jackson.databind.ObjectMapper',
 
             // from log4j
-            'com.conversantmedia.util.concurrent.DisruptorBlockingQueue',
             'com.conversantmedia.util.concurrent.SpinPolicy',
             'com.fasterxml.jackson.annotation.JsonInclude$Include',
             'com.fasterxml.jackson.databind.DeserializationContext',
@@ -251,8 +250,6 @@ tasks.named("thirdPartyAudit").configure {
             'com.fasterxml.jackson.databind.node.ObjectNode',
             'org.fusesource.jansi.Ansi',
             'org.fusesource.jansi.AnsiRenderer$Code',
-            'com.lmax.disruptor.BlockingWaitStrategy',
-            'com.lmax.disruptor.BusySpinWaitStrategy',
             'com.lmax.disruptor.EventFactory',
             'com.lmax.disruptor.EventTranslator',
             'com.lmax.disruptor.EventTranslatorTwoArg',
@@ -262,10 +259,7 @@ tasks.named("thirdPartyAudit").configure {
             'com.lmax.disruptor.RingBuffer',
             'com.lmax.disruptor.Sequence',
             'com.lmax.disruptor.SequenceReportingEventHandler',
-            'com.lmax.disruptor.SleepingWaitStrategy',
-            'com.lmax.disruptor.TimeoutBlockingWaitStrategy',
             'com.lmax.disruptor.WaitStrategy',
-            'com.lmax.disruptor.YieldingWaitStrategy',
             'com.lmax.disruptor.dsl.Disruptor',
             'com.lmax.disruptor.dsl.ProducerType',
             'javax.jms.Connection',
@@ -284,23 +278,17 @@ tasks.named("thirdPartyAudit").configure {
             'javax.mail.Transport',
             'javax.mail.internet.InternetAddress',
             'javax.mail.internet.InternetHeaders',
-            'javax.mail.internet.MimeBodyPart',
             'javax.mail.internet.MimeMessage',
             'javax.mail.internet.MimeMultipart',
             'javax.mail.internet.MimeUtility',
-            'javax.mail.util.ByteArrayDataSource',
             'org.apache.commons.compress.compressors.CompressorStreamFactory',
             'org.apache.commons.compress.utils.IOUtils',
             'org.apache.commons.csv.CSVFormat',
             'org.apache.commons.csv.QuoteMode',
-            'org.apache.kafka.clients.producer.KafkaProducer',
             'org.apache.kafka.clients.producer.Producer',
-            'org.apache.kafka.clients.producer.ProducerRecord',
             'org.apache.kafka.clients.producer.RecordMetadata',
             'org.codehaus.stax2.XMLStreamWriter2',
             'org.jctools.queues.MpscArrayQueue',
-            'org.osgi.framework.AdaptPermission',
-            'org.osgi.framework.AdminPermission',
             'org.osgi.framework.Bundle',
             'org.osgi.framework.BundleActivator',
             'org.osgi.framework.BundleContext',