Replace commons-lang:commons-lang with org.apache.commons:commons-lang3

CHANGELOG.md

@@ -91,6 +91,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Bump `org.jsoup:jsoup` from 1.20.1 to 1.21.2 ([#19207](https://github.com/opensearch-project/OpenSearch/pull/19207))
 - Bump `org.apache.hadoop:hadoop-minicluster` from 3.4.1 to 3.4.2 ([#19203](https://github.com/opensearch-project/OpenSearch/pull/19203))
 - Bump `com.maxmind.geoip2:geoip2` from 4.3.1 to 4.4.0 ([#19205](https://github.com/opensearch-project/OpenSearch/pull/19205))
+- Replace commons-lang:commons-lang with org.apache.commons:commons-lang3 ([#19229](https://github.com/opensearch-project/OpenSearch/pull/19229))
 - Bump `org.jboss.xnio:xnio-nio` from 3.8.16.Final to 3.8.17.Final ([#19252](https://github.com/opensearch-project/OpenSearch/pull/19252))
 - Bump `actions/setup-java` from 4 to 5 ([#19143](https://github.com/opensearch-project/OpenSearch/pull/19143))
 - Bump `com.google.code.gson:gson` from 2.13.1 to 2.13.2 ([#19290](https://github.com/opensearch-project/OpenSearch/pull/19290)) ([#19293](https://github.com/opensearch-project/OpenSearch/pull/19293))

plugins/discovery-azure-classic/build.gradle

@@ -52,7 +52,7 @@ dependencies {
   api "commons-logging:commons-logging:${versions.commonslogging}"
   api "org.apache.logging.log4j:log4j-1.2-api:${versions.log4j}"
   api "commons-codec:commons-codec:${versions.commonscodec}"
-  api "commons-lang:commons-lang:2.6"
+  api "org.apache.commons:commons-lang3:${versions.commonslang}"
   api "commons-io:commons-io:${versions.commonsio}"
   api 'javax.mail:mail:1.4.7'
   api 'javax.inject:javax.inject:1'
@@ -126,6 +126,7 @@ tasks.named("thirdPartyAudit").configure {
   'javax.servlet.ServletContextEvent',
   'javax.servlet.ServletContextListener',
   'org.apache.avalon.framework.logger.Logger',
+  'org.apache.commons.lang.StringUtils',
   'org.apache.log.Hierarchy',
   'org.apache.log.Logger',
   'org.eclipse.persistence.descriptors.ClassDescriptor',

plugins/discovery-azure-classic/licenses/commons-lang3-3.18.0.jar.sha1

@@ -0,0 +1 @@
+fb14946f0e39748a6571de0635acbe44e7885491

plugins/discovery-azure-classic/licenses/javax.inject-1.jar.sha1

@@ -1 +1 @@
-6975da39a7040257bd51d21a231b76c915872d38
+6975da39a7040257bd51d21a231b76c915872d38

plugins/discovery-azure-classic/licenses/jaxb-impl-2.2.3-1.jar.sha1

@@ -1 +1 @@
-56baae106392040a45a06d4a41099173425da1e6
+56baae106392040a45a06d4a41099173425da1e6

plugins/discovery-azure-classic/licenses/jersey-client-1.13.jar.sha1

@@ -1 +1 @@
-0ec38c57a78940bf5f8f5971307ca89406849647
+0ec38c57a78940bf5f8f5971307ca89406849647

plugins/discovery-azure-classic/licenses/jersey-core-1.13.jar.sha1

@@ -1 +1 @@
-4326a56dc6b2d67b7313905c353e1af225bb164f
+4326a56dc6b2d67b7313905c353e1af225bb164f

plugins/discovery-azure-classic/licenses/jersey-json-1.13.jar.sha1

@@ -1 +1 @@
-f7346cce2c0e73afd39e2783c173ee134f79a0f9
+f7346cce2c0e73afd39e2783c173ee134f79a0f9

plugins/discovery-azure-classic/src/main/java/org/apache/commons/lang/StringUtils.java

@@ -0,0 +1,49 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
+
+package org.apache.commons.lang;
+
+import java.util.Collection;
+import java.util.Iterator;
+
+/**
+ * Minimal shim to satisfy Azure Classic which expects commons-lang 2.x.
+ * Delegates to commons-lang3.
+ */
+public final class StringUtils {
+    private StringUtils() {}
+
+    // === Overloads Azure Classic expects (commons-lang 2.x API) ===
+    public static String join(final Collection<?> collection, final String separator) {
+        if (collection == null) return null;
+        return org.apache.commons.lang3.StringUtils.join(collection, separator);
+    }
+
+    public static String join(final Iterator<?> iterator, final String separator) {
+        if (iterator == null) return null;
+        return org.apache.commons.lang3.StringUtils.join(iterator, separator);
+    }
+
+    public static String join(final Object[] array, final String separator) {
+        if (array == null) return null;
+        return org.apache.commons.lang3.StringUtils.join(array, separator);
+    }
+
+    public static String join(final Iterable<?> iterable, final String separator) {
+        if (iterable == null) return null;
+        return org.apache.commons.lang3.StringUtils.join(iterable, separator);
+    }
+
+    public static boolean isBlank(final String s) {
+        return org.apache.commons.lang3.StringUtils.isBlank(s);
+    }
+
+    public static boolean isEmpty(final String s) {
+        return org.apache.commons.lang3.StringUtils.isEmpty(s);
+    }
+}

plugins/identity-shiro/build.gradle

@@ -24,7 +24,7 @@ dependencies {
 
   implementation 'commons-beanutils:commons-beanutils:1.11.0'
   implementation 'commons-logging:commons-logging:1.2'
-  implementation 'commons-lang:commons-lang:2.6'
+  implementation "org.apache.commons:commons-lang3:${versions.commonslang}"
 
   implementation 'org.passay:passay:1.6.3'
 

plugins/identity-shiro/licenses/commons-lang3-3.18.0.jar.sha1

@@ -0,0 +1 @@
+fb14946f0e39748a6571de0635acbe44e7885491

plugins/identity-shiro/licenses/commons-lang3-NOTICE.txt

@@ -0,0 +1,5 @@
+Apache Commons Lang
+Copyright 2001-2022 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (https://www.apache.org/).