From c6d4f90f3674e6ee75bf605b9562e05ef316e872 Mon Sep 17 00:00:00 2001
From: Sayan Bhattacharya <sayan.bhattacharya@hyland.com>
Date: Tue, 23 Sep 2025 15:24:00 +0530
Subject: [PATCH] ACS-9936 bump commons-lang3 and remove commons-lang (#2199)

---
 pom.xml                                       | 10 +---
 search-services/alfresco-search/pom.xml       |  4 --
 .../RewriteFacetParametersComponent.java      |  2 +-
 .../src/main/resources/licenses/notice.txt    | 57 +++++++++----------
 4 files changed, 31 insertions(+), 42 deletions(-)

diff --git a/pom.xml b/pom.xml
index d7f3dd28f..cbae23f72 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,7 @@
    <properties>
       <maven.build.sourceVersion>11</maven.build.sourceVersion>
       <solr.base.version>6.6.5</solr.base.version>
-      <solr.version>${solr.base.version}-patched.21</solr.version>
+      <solr.version>${solr.base.version}-patched.22</solr.version>
       <!-- The location to download the solr zip file from. -->
       <!-- <solr.zip>https://archive.apache.org/dist/lucene/solr/${solr.version}/solr-${solr.version}.zip</solr.zip> -->
       <!-- Solr startup scripts do not work with any Java version higher than 9 so the scripts have been patched -->
@@ -61,8 +61,7 @@
 
       <dependency.google.guava.version>33.1.0-jre</dependency.google.guava.version>
       <dependency.apache-commons-compress.version>1.26.1</dependency.apache-commons-compress.version>
-      <dependency.apache-commons-lang3.version>3.12.0</dependency.apache-commons-lang3.version>
-      <dependency.apache-commons-lang.version>2.6</dependency.apache-commons-lang.version>
+      <dependency.apache-commons-lang3.version>3.18.0</dependency.apache-commons-lang3.version>
       <dependency.jakarta.xml.bind-api.version>3.0.1</dependency.jakarta.xml.bind-api.version>
       <dependency.restlet.version>2.3.12</dependency.restlet.version>
       <dependency.httpclient.version>4.5.14</dependency.httpclient.version>
@@ -218,11 +217,6 @@
             <artifactId>alfresco-xmlfactory</artifactId>
             <version>${dependency.alfresco.xml-factory.version}</version>
          </dependency>
-         <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-            <version>${dependency.apache-commons-lang.version}</version>
-         </dependency>
          <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-core</artifactId>
diff --git a/search-services/alfresco-search/pom.xml b/search-services/alfresco-search/pom.xml
index bbccdde22..a18dd2bf2 100644
--- a/search-services/alfresco-search/pom.xml
+++ b/search-services/alfresco-search/pom.xml
@@ -354,10 +354,6 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
         </dependency>
-        <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
diff --git a/search-services/alfresco-search/src/main/java/org/alfresco/solr/component/RewriteFacetParametersComponent.java b/search-services/alfresco-search/src/main/java/org/alfresco/solr/component/RewriteFacetParametersComponent.java
index 7e556b461..3ce889b16 100644
--- a/search-services/alfresco-search/src/main/java/org/alfresco/solr/component/RewriteFacetParametersComponent.java
+++ b/search-services/alfresco-search/src/main/java/org/alfresco/solr/component/RewriteFacetParametersComponent.java
@@ -39,7 +39,7 @@ import com.google.common.collect.HashBiMap;
 import org.alfresco.solr.AlfrescoSolrDataModel;
 import org.alfresco.solr.AlfrescoSolrDataModel.FieldUse;
 import org.alfresco.solr.query.MimetypeGroupingQParserPlugin;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.solr.common.params.CommonParams;
 import org.apache.solr.common.params.ModifiableSolrParams;
 import org.apache.solr.common.params.ShardParams;
diff --git a/search-services/packaging/src/main/resources/licenses/notice.txt b/search-services/packaging/src/main/resources/licenses/notice.txt
index 28ad3fa76..53b0263e7 100644
--- a/search-services/packaging/src/main/resources/licenses/notice.txt
+++ b/search-services/packaging/src/main/resources/licenses/notice.txt
@@ -38,7 +38,7 @@ apiguardian-api-1.1.2.jar https://github.com/apiguardian-team/apiguardian
 xml-resolver-1.2.jar    https://github.com/FasterXML/jackson
 neethi-3.2.1.jar http://ws.apache.org/commons/neethi/
 commons-logging-1.2.jar http://jakarta.apache.org/commons/
-commons-lang3-3.12.0.jar http://jakarta.apache.org/commons/
+commons-lang3-3.18.0.jar http://jakarta.apache.org/commons/
 commons-compress-1.26.1.jar https://commons.apache.org/proper/commons-compress/
 chemistry-opencmis-commons-impl-1.1.0.jar      http://chemistry.apache.org/
 chemistry-opencmis-commons-api-1.1.0.jar       http://chemistry.apache.org/
@@ -152,7 +152,6 @@ calcite-core-1.32.0.jar
 calcite-linq4j-1.32.0.jar
 avatica-core-1.22.0.jar
 avatica-metrics-1.22.0.jar
-commons-lang-2.6.jar
 commons-math3-3.4.1.jar
 curator-client-2.8.0.jar
 curator-framework-2.8.0.jar
@@ -180,28 +179,28 @@ jsonic-1.2.7.jar
 jul-to-slf4j-1.7.7.jar
 juniversalchardet-1.0.3.jar
 langdetect-1.1-20120112.jar
-lucene-analyzers-common-6.6.5-patched.21.jar
-lucene-analyzers-icu-6.6.5-patched.21.jar
-lucene-analyzers-kuromoji-6.6.5-patched.21.jar
-lucene-analyzers-morfologik-6.6.5-patched.21.jar
-lucene-analyzers-phonetic-6.6.5-patched.21.jar
-lucene-analyzers-smartcn-6.6.5-patched.21.jar
-lucene-analyzers-stempel-6.6.5-patched.21.jar
-lucene-backward-codecs-6.6.5-patched.21.jar
-lucene-classification-6.6.5-patched.21.jar
-lucene-codecs-6.6.5-patched.21.jar
-lucene-core-6.6.5-patched.21.jar
-lucene-expressions-6.6.5-patched.21.jar
-lucene-grouping-6.6.5-patched.21.jar
-lucene-highlighter-6.6.5-patched.21.jar
-lucene-join-6.6.5-patched.21.jar
-lucene-memory-6.6.5-patched.21.jar
-lucene-misc-6.6.5-patched.21.jar
-lucene-queries-6.6.5-patched.21.jar
-lucene-queryparser-6.6.5-patched.21.jar
-lucene-sandbox-6.6.5-patched.21.jar
-lucene-spatial-extras-6.6.5-patched.21.jar
-lucene-suggest-6.6.5-patched.21.jar
+lucene-analyzers-common-6.6.5-patched.22.jar
+lucene-analyzers-icu-6.6.5-patched.22.jar
+lucene-analyzers-kuromoji-6.6.5-patched.22.jar
+lucene-analyzers-morfologik-6.6.5-patched.22.jar
+lucene-analyzers-phonetic-6.6.5-patched.22.jar
+lucene-analyzers-smartcn-6.6.5-patched.22.jar
+lucene-analyzers-stempel-6.6.5-patched.22.jar
+lucene-backward-codecs-6.6.5-patched.22.jar
+lucene-classification-6.6.5-patched.22.jar
+lucene-codecs-6.6.5-patched.22.jar
+lucene-core-6.6.5-patched.22.jar
+lucene-expressions-6.6.5-patched.22.jar
+lucene-grouping-6.6.5-patched.22.jar
+lucene-highlighter-6.6.5-patched.22.jar
+lucene-join-6.6.5-patched.22.jar
+lucene-memory-6.6.5-patched.22.jar
+lucene-misc-6.6.5-patched.22.jar
+lucene-queries-6.6.5-patched.22.jar
+lucene-queryparser-6.6.5-patched.22.jar
+lucene-sandbox-6.6.5-patched.22.jar
+lucene-spatial-extras-6.6.5-patched.22.jar
+lucene-suggest-6.6.5-patched.22.jar
 metrics-core-3.2.2.jar
 metrics-ganglia-3.2.2.jar
 metrics-graphite-3.2.2.jar
@@ -215,11 +214,11 @@ protobuf-java-3.25.5.jar
 rome-1.5.1.jar
 slf4j-api-1.7.7.jar
 slf4j-log4j12-1.7.7.jar
-solr-analysis-extras-6.6.5-patched.21.jar
-solr-clustering-6.6.5-patched.21.jar
-solr-core-6.6.5-patched.21.jar
-solr-langid-6.6.5-patched.21.jar
-solr-solrj-6.6.5-patched.21.jar
+solr-analysis-extras-6.6.5-patched.22.jar
+solr-clustering-6.6.5-patched.22.jar
+solr-core-6.6.5-patched.22.jar
+solr-langid-6.6.5-patched.22.jar
+solr-solrj-6.6.5-patched.22.jar
 spatial4j-0.6.jar
 start.jar
 stax2-api-3.1.4.jar