You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jb...@apache.org on 2021/03/24 06:51:09 UTC
[activemq] branch activemq-5.15.x updated: [AMQ-8194] Upgrade to
commons-lang3 3.12.0
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch activemq-5.15.x
in repository https://gitbox.apache.org/repos/asf/activemq.git
The following commit(s) were added to refs/heads/activemq-5.15.x by this push:
new 9011b17 [AMQ-8194] Upgrade to commons-lang3 3.12.0
9011b17 is described below
commit 9011b173b2a7ab794753562ec7b73b7292dcc8fd
Author: jbonofre <jb...@apache.org>
AuthorDate: Tue Mar 23 16:07:02 2021 +0100
[AMQ-8194] Upgrade to commons-lang3 3.12.0
(cherry picked from commit 1e2a0de5ccbff057ac0201b335ec30dc266eb0b5)
---
activemq-console/pom.xml | 4 ++--
.../java/org/apache/activemq/transport/http/HttpMaxFrameSizeTest.java | 2 +-
activemq-karaf/src/main/resources/features-core.xml | 2 +-
activemq-leveldb-store/pom.xml | 4 ++--
.../org/apache/activemq/tool/sampler/AbstractPerformanceSampler.java | 2 +-
activemq-web-demo/pom.xml | 4 ++--
activemq-web-demo/src/test/java/org/apache/activemq/web/AjaxTest.java | 2 +-
activemq-web-demo/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 8be7315..5e805bf 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 28e4ebb..f58c89c 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 911bd45..3f5df8e 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 1e57515..e1194d4 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 9f3fa31..e3810c7 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 173ee35..75578c1 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 7af9fe5..8041e70 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 2ea0d0a..872f501 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 3e66930..b83c06b 100644
--- a/assembly/src/main/descriptors/common-bin.xml
+++ b/assembly/src/main/descriptors/common-bin.xml
@@ -187,7 +187,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 3549235..5b3e8fe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,7 +54,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>