activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gtu...@apache.org
Subject [activemq-artemis] branch main updated: no jira - remove unused log4j dependency
Date Tue, 08 Jun 2021 09:19:23 GMT
This is an automated email from the ASF dual-hosted git repository.

gtully pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git


The following commit(s) were added to refs/heads/main by this push:
     new 0857660  no jira - remove unused log4j dependency
0857660 is described below

commit 085766033ba24b786f3357264767a57c7d92a35e
Author: gtully <gary.tully@gmail.com>
AuthorDate: Fri Jun 4 15:23:40 2021 +0100

    no jira - remove unused log4j dependency
---
 artemis-hawtio/activemq-branding/pom.xml | 11 ++++++-----
 artemis-hawtio/artemis-plugin/pom.xml    | 10 ----------
 artemis-hawtio/pom.xml                   |  6 ------
 pom.xml                                  | 13 -------------
 tests/activemq5-unit-tests/pom.xml       | 12 ------------
 tests/integration-tests/pom.xml          |  6 ++++++
 6 files changed, 12 insertions(+), 46 deletions(-)

diff --git a/artemis-hawtio/activemq-branding/pom.xml b/artemis-hawtio/activemq-branding/pom.xml
index b20f634..c34c7bf 100644
--- a/artemis-hawtio/activemq-branding/pom.xml
+++ b/artemis-hawtio/activemq-branding/pom.xml
@@ -72,6 +72,12 @@
         <dependency>
             <groupId>io.hawt</groupId>
             <artifactId>hawtio-plugin-mbean</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!-- servlet API is provided by the container -->
@@ -87,11 +93,6 @@
             <artifactId>slf4j-api</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-            <scope>provided</scope>
-        </dependency>
       <dependency>
           <groupId>com.google.errorprone</groupId>
           <artifactId>error_prone_core</artifactId>
diff --git a/artemis-hawtio/artemis-plugin/pom.xml b/artemis-hawtio/artemis-plugin/pom.xml
index cdb7ce4..c388cf2 100644
--- a/artemis-hawtio/artemis-plugin/pom.xml
+++ b/artemis-hawtio/artemis-plugin/pom.xml
@@ -92,16 +92,6 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
         <groupId>com.google.errorprone</groupId>
         <artifactId>error_prone_core</artifactId>
     </dependency>
diff --git a/artemis-hawtio/pom.xml b/artemis-hawtio/pom.xml
index e9ffbef..67ceeed 100644
--- a/artemis-hawtio/pom.xml
+++ b/artemis-hawtio/pom.xml
@@ -80,12 +80,6 @@
                 <version>${slf4j-version}</version>
                 <scope>provided</scope>
             </dependency>
-            <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-log4j12</artifactId>
-                <version>${slf4j-version}</version>
-                <scope>provided</scope>
-            </dependency>
 
         </dependencies>
     </dependencyManagement>
diff --git a/pom.xml b/pom.xml
index f82dd19..7233f95 100644
--- a/pom.xml
+++ b/pom.xml
@@ -357,14 +357,6 @@
              <scope>provided</scope>
             <optional>true</optional>
          </dependency>
-         <!--needed to compile the logging jar-->
-         <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>1.2.16</version>
-            <scope>compile</scope>
-            <!-- License: Apache 2.0 -->
-         </dependency>
          <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
@@ -519,11 +511,6 @@
              <artifactId>slf4j-nop</artifactId>
              <version>${slf4j.version}</version>
          </dependency>
-         <dependency>
-             <groupId>org.slf4j</groupId>
-             <artifactId>slf4j-log4j12</artifactId>
-             <version>${slf4j.version}</version>
-         </dependency>
          <!-- ## End Examples Dependencies ## -->
 
          <!--needed to compile the bootstrap jar-->
diff --git a/tests/activemq5-unit-tests/pom.xml b/tests/activemq5-unit-tests/pom.xml
index ec2d10a..69bbcec 100644
--- a/tests/activemq5-unit-tests/pom.xml
+++ b/tests/activemq5-unit-tests/pom.xml
@@ -223,18 +223,6 @@
       </dependency>
 
       <dependency>
-         <groupId>org.slf4j</groupId>
-         <artifactId>slf4j-log4j12</artifactId>
-         <scope>test</scope>
-      </dependency>
-
-      <dependency>
-         <groupId>log4j</groupId>
-         <artifactId>log4j</artifactId>
-         <scope>test</scope>
-       </dependency>
-
-      <dependency>
          <groupId>org.springframework</groupId>
          <artifactId>spring-test</artifactId>
          <version>${spring-version}</version>
diff --git a/tests/integration-tests/pom.xml b/tests/integration-tests/pom.xml
index 5618d76..6800e44 100644
--- a/tests/integration-tests/pom.xml
+++ b/tests/integration-tests/pom.xml
@@ -397,6 +397,12 @@
          <groupId>org.apache.hadoop</groupId>
          <artifactId>hadoop-minikdc</artifactId>
          <version>3.3.0</version>
+         <exclusions>
+            <exclusion>
+               <groupId>org.slf4j</groupId>
+               <artifactId>slf4j-log4j12</artifactId>
+            </exclusion>
+         </exclusions>
          <scope>test</scope>
       </dependency>
       <dependency>

Mime
View raw message