From e24116aae554ed19502f66951e7037d45ac9bd8c Mon Sep 17 00:00:00 2001
From: jbonofre <jbonofre@apache.org>
Date: Tue, 23 Mar 2021 16:07:02 +0100
Subject: [PATCH] [AMQ-8194] Upgrade to commons-lang3 3.12.0

(cherry picked from commit 1e2a0de5ccbff057ac0201b335ec30dc266eb0b5)
---
 activemq-console/pom.xml                                      | 4 ++--
 .../apache/activemq/transport/http/HttpMaxFrameSizeTest.java  | 2 +-
 activemq-karaf/src/main/resources/features-core.xml           | 2 +-
 activemq-leveldb-store/pom.xml                                | 4 ++--
 .../activemq/tool/sampler/AbstractPerformanceSampler.java     | 2 +-
 activemq-web-demo/pom.xml                                     | 4 ++--
 .../src/test/java/org/apache/activemq/web/AjaxTest.java       | 2 +-
 .../src/test/java/org/apache/activemq/web/RestTest.java       | 2 +-
 assembly/src/main/descriptors/common-bin.xml                  | 2 +-
 pom.xml                                                       | 2 +-
 10 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/activemq-console/pom.xml b/activemq-console/pom.xml
index 5bfdc3c08e..e6c5314204 100644
--- a/activemq-console/pom.xml
+++ b/activemq-console/pom.xml
@@ -132,8 +132,8 @@
       <artifactId>commons-collections</artifactId>
     </dependency>
     <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
       <version>${commons-lang-version}</version>
     </dependency>
     <dependency>
diff --git a/activemq-http/src/test/java/org/apache/activemq/transport/http/HttpMaxFrameSizeTest.java b/activemq-http/src/test/java/org/apache/activemq/transport/http/HttpMaxFrameSizeTest.java
index 28e4ebb6b5..f58c89c472 100644
--- a/activemq-http/src/test/java/org/apache/activemq/transport/http/HttpMaxFrameSizeTest.java
+++ b/activemq-http/src/test/java/org/apache/activemq/transport/http/HttpMaxFrameSizeTest.java
@@ -19,7 +19,7 @@ package org.apache.activemq.transport.http;
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.command.ActiveMQQueue;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/activemq-karaf/src/main/resources/features-core.xml b/activemq-karaf/src/main/resources/features-core.xml
index 911bd45cfd..3f5df8e471 100644
--- a/activemq-karaf/src/main/resources/features-core.xml
+++ b/activemq-karaf/src/main/resources/features-core.xml
@@ -56,7 +56,7 @@
       </conditional>
       <bundle dependency="true">mvn:commons-io/commons-io/${commons-io-version}</bundle>
       <bundle dependency="true">mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
-      <bundle dependency="true">mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
+      <bundle dependency="true">mvn:org.apache.commons/commons-lang3/${commons-lang-version}</bundle>
       <bundle dependency="true">mvn:commons-codec/commons-codec/1.9</bundle>
       <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.velocity/1.7_6</bundle>
       <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jasypt/1.9.2_1</bundle>
diff --git a/activemq-leveldb-store/pom.xml b/activemq-leveldb-store/pom.xml
index 31d79a8a02..c90f1d67ea 100644
--- a/activemq-leveldb-store/pom.xml
+++ b/activemq-leveldb-store/pom.xml
@@ -310,8 +310,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
       <version>${commons-lang-version}</version>
       <scope>test</scope>
     </dependency>
diff --git a/activemq-tooling/activemq-perf-maven-plugin/src/main/java/org/apache/activemq/tool/sampler/AbstractPerformanceSampler.java b/activemq-tooling/activemq-perf-maven-plugin/src/main/java/org/apache/activemq/tool/sampler/AbstractPerformanceSampler.java
index 9f3fa319a4..e3810c7f40 100644
--- a/activemq-tooling/activemq-perf-maven-plugin/src/main/java/org/apache/activemq/tool/sampler/AbstractPerformanceSampler.java
+++ b/activemq-tooling/activemq-perf-maven-plugin/src/main/java/org/apache/activemq/tool/sampler/AbstractPerformanceSampler.java
@@ -22,7 +22,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import org.apache.activemq.tool.ClientRunBasis;
 import org.apache.activemq.tool.properties.AbstractObjectProperties;
 import org.apache.activemq.tool.reports.PerformanceReportWriter;
-import org.apache.commons.lang.Validate;
+import org.apache.commons.lang3.Validate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/activemq-web-demo/pom.xml b/activemq-web-demo/pom.xml
index 290f3e24f0..e5f0954df8 100644
--- a/activemq-web-demo/pom.xml
+++ b/activemq-web-demo/pom.xml
@@ -219,8 +219,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
       <version>${commons-lang-version}</version>
       <scope>test</scope>
     </dependency>
diff --git a/activemq-web-demo/src/test/java/org/apache/activemq/web/AjaxTest.java b/activemq-web-demo/src/test/java/org/apache/activemq/web/AjaxTest.java
index 7af9fe53c4..8041e70549 100644
--- a/activemq-web-demo/src/test/java/org/apache/activemq/web/AjaxTest.java
+++ b/activemq-web-demo/src/test/java/org/apache/activemq/web/AjaxTest.java
@@ -32,7 +32,7 @@ import javax.jms.MessageProducer;
 import org.apache.activemq.transport.stomp.Stomp;
 import org.apache.activemq.transport.stomp.StompConnection;
 import org.apache.activemq.transport.stomp.StompFrame;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.eclipse.jetty.client.HttpClient;
 import org.eclipse.jetty.client.api.Request;
 import org.eclipse.jetty.client.api.Result;
diff --git a/activemq-web-demo/src/test/java/org/apache/activemq/web/RestTest.java b/activemq-web-demo/src/test/java/org/apache/activemq/web/RestTest.java
index 2ea0d0ad78..872f501b78 100644
--- a/activemq-web-demo/src/test/java/org/apache/activemq/web/RestTest.java
+++ b/activemq-web-demo/src/test/java/org/apache/activemq/web/RestTest.java
@@ -27,7 +27,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 import javax.jms.TextMessage;
 import javax.management.ObjectName;
 
-import org.apache.commons.lang.RandomStringUtils;
+import org.apache.commons.lang3.RandomStringUtils;
 import org.eclipse.jetty.client.HttpClient;
 import org.eclipse.jetty.client.api.Result;
 import org.eclipse.jetty.client.util.BufferingResponseListener;
diff --git a/assembly/src/main/descriptors/common-bin.xml b/assembly/src/main/descriptors/common-bin.xml
index d759634b3c..d37304e6e2 100644
--- a/assembly/src/main/descriptors/common-bin.xml
+++ b/assembly/src/main/descriptors/common-bin.xml
@@ -192,7 +192,7 @@
         <include>org.apache.commons:commons-pool2</include>
         <include>commons-codec:commons-codec</include>
         <include>commons-net:commons-net</include>
-        <include>commons-lang:commons-lang</include>
+        <include>org.apache.commons:commons-lang3</include>
         <include>org.slf4j:slf4j-log4j12</include>
         <include>log4j:log4j</include>
         <include>org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec</include>
diff --git a/pom.xml b/pom.xml
index 0865d20092..8f36ada7b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,7 +50,7 @@
     <commons-daemon-version>1.2.4</commons-daemon-version>
     <commons-dbcp2-version>2.8.0</commons-dbcp2-version>
     <commons-io-version>2.8.0</commons-io-version>
-    <commons-lang-version>2.6</commons-lang-version>
+    <commons-lang-version>3.12.0</commons-lang-version>
     <commons-logging-version>1.2</commons-logging-version>
     <commons-pool2-version>2.9.0</commons-pool2-version>
     <commons-primitives-version>1.0</commons-primitives-version>