From 9be48a27480db1c652842286ac07598159691dfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?JB=20Onofr=C3=A9?= Date: Wed, 8 Feb 2023 16:57:18 +0100 Subject: [PATCH] Revert "[AMQ-8572] Remove unsued commons-lang3 dependency" This reverts commit 4fa107e8969754e8b27c6a7f65d7c33ee311cad0. --- activemq-console/pom.xml | 5 +++++ activemq-http/pom.xml | 6 ++++++ activemq-karaf/src/main/resources/features-core.xml | 1 + activemq-web-demo/pom.xml | 6 ++++++ assembly/src/main/descriptors/common-bin.xml | 1 + pom.xml | 1 + 6 files changed, 20 insertions(+) diff --git a/activemq-console/pom.xml b/activemq-console/pom.xml index 19ae25efe3..202d408feb 100644 --- a/activemq-console/pom.xml +++ b/activemq-console/pom.xml @@ -131,6 +131,11 @@ commons-collections commons-collections + + org.apache.commons + commons-lang3 + ${commons-lang-version} + org.apache.servicemix.bundles org.apache.servicemix.bundles.josql diff --git a/activemq-http/pom.xml b/activemq-http/pom.xml index ba0556b6a6..6c0c6abde8 100644 --- a/activemq-http/pom.xml +++ b/activemq-http/pom.xml @@ -102,6 +102,12 @@ activemq-kahadb-store test + + org.apache.commons + commons-lang3 + ${commons-lang-version} + test + junit junit diff --git a/activemq-karaf/src/main/resources/features-core.xml b/activemq-karaf/src/main/resources/features-core.xml index 42a9a420b5..b7c312e671 100644 --- a/activemq-karaf/src/main/resources/features-core.xml +++ b/activemq-karaf/src/main/resources/features-core.xml @@ -48,6 +48,7 @@ activemq-client mvn:commons-io/commons-io/${commons-io-version} mvn:commons-collections/commons-collections/${commons-collections-version} + mvn:org.apache.commons/commons-lang3/${commons-lang-version} mvn:commons-codec/commons-codec/1.15 mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.velocity/1.7_6 mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jasypt/1.9.2_1 diff --git a/activemq-web-demo/pom.xml b/activemq-web-demo/pom.xml index aecff167b1..b73c65efba 100644 --- a/activemq-web-demo/pom.xml +++ b/activemq-web-demo/pom.xml @@ -223,6 +223,12 @@ junit test + + org.apache.commons + commons-lang3 + ${commons-lang-version} + test + diff --git a/assembly/src/main/descriptors/common-bin.xml b/assembly/src/main/descriptors/common-bin.xml index 5849117ab1..55ea978f74 100644 --- a/assembly/src/main/descriptors/common-bin.xml +++ b/assembly/src/main/descriptors/common-bin.xml @@ -192,6 +192,7 @@ org.apache.commons:commons-dbcp2 org.apache.commons:commons-pool2 commons-codec:commons-codec + org.apache.commons:commons-lang3 org.apache.logging.log4j:log4j-slf4j-impl org.apache.logging.log4j:log4j-api org.apache.logging.log4j:log4j-core diff --git a/pom.xml b/pom.xml index df3eda44ac..1f088aec0b 100644 --- a/pom.xml +++ b/pom.xml @@ -54,6 +54,7 @@ 1.3.3 2.9.0 2.11.0 + 3.12.0 1.2 2.11.1 1.0