Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #754 from coheigea/AMQ-8472 

AMQ-8472 - Switch to reload4j for logging
This commit is contained in:
Jean-Baptiste Onofré 2022-02-10 06:07:25 +01:00 committed by GitHub
parent 0b7ebc5ad1 1f01a61426
commit cade46f4a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
34 changed files with 139 additions and 193 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
activemq-all/pom.xml
View File

@ -69,7 +69,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-reload4j</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
@ -119,9 +119,9 @@
<include>org.apache.geronimo.specs:geronimo-j2ee-management_1.1_spec</include> <include>org.apache.geronimo.specs:geronimo-j2ee-management_1.1_spec</include>
<include>org.apache.geronimo.specs:geronimo-annotation_1.0_spec</include> <include>org.apache.geronimo.specs:geronimo-annotation_1.0_spec</include>
<include>org.slf4j:slf4j-api</include> <include>org.slf4j:slf4j-api</include>
<include>org.slf4j:slf4j-log4j12</include> <include>org.slf4j:slf4j-reload4j</include>
<include>org.slf4j:jcl-over-slf4j</include> <include>org.slf4j:jcl-over-slf4j</include>
<include>log4j:log4j</include> <include>ch.qos.reload4j:reload4j</include>
<include>org.springframework:spring-core</include> <include>org.springframework:spring-core</include>
<include>org.springframework:spring-beans</include> <include>org.springframework:spring-beans</include>
<include>org.springframework:spring-context</include> <include>org.springframework:spring-context</include>
@ -372,15 +372,15 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-reload4j</artifactId>
<version>${slf4j-version}</version> <version>${slf4j-version}</version>
<classifier>sources</classifier> <classifier>sources</classifier>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>log4j</groupId> <groupId>ch.qos.reload4j</groupId>
<artifactId>log4j</artifactId> <artifactId>reload4j</artifactId>
<version>${log4j-version}</version> <version>${reload4j-version}</version>
<classifier>sources</classifier> <classifier>sources</classifier>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>

2
activemq-amqp/pom.xml
View File

@ -136,7 +136,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-reload4j</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>

2
activemq-broker/pom.xml
View File

@ -80,7 +80,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-reload4j</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>

8
activemq-camel/pom.xml
View File

@ -186,13 +186,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-reload4j</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<optional>true</optional>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>

2
activemq-client/pom.xml
View File

@ -96,7 +96,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-reload4j</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>

7
activemq-console/pom.xml
View File

@ -105,12 +105,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-reload4j</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>

2
activemq-http/pom.xml
View File

@ -98,7 +98,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-reload4j</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>

7
activemq-itests-spring31/pom.xml
View File

@ -74,12 +74,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-reload4j</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>

13
activemq-jaas/pom.xml
View File

@ -87,6 +87,12 @@
<artifactId>apacheds-server-integ</artifactId> <artifactId>apacheds-server-integ</artifactId>
<version>${directory-version}</version> <version>${directory-version}</version>
<scope>test</scope> <scope>test</scope>
<exclusions>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
@ -99,18 +105,13 @@
<optional>true</optional> <optional>true</optional>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId> <artifactId>slf4j-api</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-reload4j</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>

2
activemq-jdbc-store/pom.xml
View File

@ -71,7 +71,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-reload4j</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>

7
activemq-jms-pool/pom.xml
View File

@ -102,12 +102,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-reload4j</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>

7
activemq-kahadb-store/pom.xml
View File

@ -132,12 +132,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-reload4j</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>

2
activemq-karaf-itest/pom.xml
View File

@ -134,7 +134,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-reload4j</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>

10
activemq-karaf/pom.xml
View File

@ -42,18 +42,10 @@
<dependency> <dependency>
<groupId>org.ops4j.pax.logging</groupId> <groupId>org.ops4j.pax.logging</groupId>
<artifactId>pax-logging-api</artifactId> <artifactId>pax-logging-api</artifactId>
<version>1.11.4</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.ops4j.pax.logging</groupId> <groupId>org.ops4j.pax.logging</groupId>
<artifactId>pax-logging-service</artifactId> <artifactId>pax-logging-service</artifactId>
<version>1.11.4</version>
<exclusions>
<exclusion>
<groupId>log4j</groupId>
<artifactId>apache-log4j-extras</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
@ -62,7 +54,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-reload4j</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>

15
activemq-leveldb-store/pom.xml
View File

@ -123,14 +123,7 @@
<dependency> <dependency>
<groupId>org.linkedin</groupId> <groupId>org.linkedin</groupId>
<artifactId>org.linkedin.zookeeper-impl</artifactId> <artifactId>org.linkedin.zookeeper-impl</artifactId>
<version>${linkedin-zookeeper-version}</version>
<scope>provided</scope> <scope>provided</scope>
<exclusions>
<exclusion>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.linkedin</groupId> <groupId>org.linkedin</groupId>
@ -141,7 +134,6 @@
<dependency> <dependency>
<groupId>org.apache.zookeeper</groupId> <groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId> <artifactId>zookeeper</artifactId>
<version>${zookeeper-version}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
@ -282,12 +274,7 @@
<!-- Testing Dependencies --> <!-- Testing Dependencies -->
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-reload4j</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>

6
activemq-log4j-appender/pom.xml
View File

@ -36,8 +36,8 @@
<artifactId>activemq-client</artifactId> <artifactId>activemq-client</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>log4j</groupId> <groupId>ch.qos.reload4j</groupId>
<artifactId>log4j</artifactId> <artifactId>reload4j</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
@ -51,7 +51,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-reload4j</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>

7
activemq-mqtt/pom.xml
View File

@ -158,12 +158,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-reload4j</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>

8
activemq-osgi/pom.xml
View File

@ -528,15 +528,15 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-reload4j</artifactId>
<version>${slf4j-version}</version> <version>${slf4j-version}</version>
<classifier>sources</classifier> <classifier>sources</classifier>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>log4j</groupId> <groupId>ch.qos.reload4j</groupId>
<artifactId>log4j</artifactId> <artifactId>reload4j</artifactId>
<version>${log4j-version}</version> <version>${reload4j-version}</version>
<classifier>sources</classifier> <classifier>sources</classifier>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>

32
activemq-partition/pom.xml
View File

@ -52,13 +52,14 @@
<dependency> <dependency>
<groupId>org.linkedin</groupId> <groupId>org.linkedin</groupId>
<artifactId>org.linkedin.zookeeper-impl</artifactId> <artifactId>org.linkedin.zookeeper-impl</artifactId>
<version>${linkedin-zookeeper-version}</version> </dependency>
<exclusions> <dependency>
<exclusion> <groupId>ch.qos.reload4j</groupId>
<groupId>org.json</groupId> <artifactId>reload4j</artifactId>
<artifactId>json</artifactId> </dependency>
</exclusion> <dependency>
</exclusions> <groupId>org.slf4j</groupId>
<artifactId>slf4j-reload4j</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.linkedin</groupId> <groupId>org.linkedin</groupId>
@ -68,13 +69,6 @@
<dependency> <dependency>
<groupId>org.apache.zookeeper</groupId> <groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId> <artifactId>zookeeper</artifactId>
<version>${zookeeper-version}</version>
<exclusions>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<!-- For Optional Snappy Compression --> <!-- For Optional Snappy Compression -->
@ -92,16 +86,6 @@
</dependency> </dependency>
<!-- Testing Dependencies --> <!-- Testing Dependencies -->
<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> <dependency>
<groupId>org.apache.activemq</groupId> <groupId>org.apache.activemq</groupId>
<artifactId>activemq-broker</artifactId> <artifactId>activemq-broker</artifactId>

7
activemq-pool/pom.xml
View File

@ -96,12 +96,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-reload4j</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>

2
activemq-ra/pom.xml
View File

@ -76,7 +76,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-reload4j</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>

6
activemq-rar/pom.xml
View File

@ -339,13 +339,9 @@
<groupId>org.apache.activemq</groupId> <groupId>org.apache.activemq</groupId>
<artifactId>activemq-mqtt</artifactId> <artifactId>activemq-mqtt</artifactId>
</dependency> </dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-reload4j</artifactId>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>

7
activemq-runtime-config/pom.xml
View File

@ -79,12 +79,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-reload4j</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>

7
activemq-shiro/pom.xml
View File

@ -95,12 +95,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-reload4j</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>

15
activemq-spring/pom.xml
View File

@ -90,14 +90,7 @@
<dependency> <dependency>
<groupId>org.linkedin</groupId> <groupId>org.linkedin</groupId>
<artifactId>org.linkedin.zookeeper-impl</artifactId> <artifactId>org.linkedin.zookeeper-impl</artifactId>
<version>${linkedin-zookeeper-version}</version>
<scope>provided</scope> <scope>provided</scope>
<exclusions>
<exclusion>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.linkedin</groupId> <groupId>org.linkedin</groupId>
@ -108,7 +101,6 @@
<dependency> <dependency>
<groupId>org.apache.zookeeper</groupId> <groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId> <artifactId>zookeeper</artifactId>
<version>${zookeeper-version}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -182,11 +174,6 @@
<artifactId>spring-jms</artifactId> <artifactId>spring-jms</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>org.jencks</groupId> <groupId>org.jencks</groupId>
<artifactId>jencks</artifactId> <artifactId>jencks</artifactId>
@ -195,7 +182,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-reload4j</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>

7
activemq-stomp/pom.xml
View File

@ -91,12 +91,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-reload4j</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>

2
activemq-tooling/activemq-perf-maven-plugin/pom.xml
View File

@ -78,7 +78,7 @@
</dependency> </dependency>
<!-- dependency> <!-- dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-reload4j</artifactId>
</dependency --> </dependency -->
</dependencies> </dependencies>

13
activemq-unit-tests/pom.xml
View File

@ -188,12 +188,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-reload4j</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -281,6 +276,12 @@
<artifactId>apacheds-server-integ</artifactId> <artifactId>apacheds-server-integ</artifactId>
<version>${directory-version}</version> <version>${directory-version}</version>
<scope>test</scope> <scope>test</scope>
<exclusions>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jmock</groupId> <groupId>org.jmock</groupId>

6
activemq-web-console/pom.xml
View File

@ -263,11 +263,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-reload4j</artifactId>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency> </dependency>
<!-- JSTL support --> <!-- JSTL support -->

2
activemq-web-demo/pom.xml
View File

@ -186,7 +186,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-reload4j</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>

2
activemq-web/pom.xml
View File

@ -130,7 +130,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-reload4j</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>

30
assembly/pom.xml
View File

@ -83,13 +83,6 @@
<dependency> <dependency>
<groupId>org.linkedin</groupId> <groupId>org.linkedin</groupId>
<artifactId>org.linkedin.zookeeper-impl</artifactId> <artifactId>org.linkedin.zookeeper-impl</artifactId>
<version>${linkedin-zookeeper-version}</version>
<exclusions>
<exclusion>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.linkedin</groupId> <groupId>org.linkedin</groupId>
@ -99,13 +92,6 @@
<dependency> <dependency>
<groupId>org.apache.zookeeper</groupId> <groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId> <artifactId>zookeeper</artifactId>
<version>${zookeeper-version}</version>
<exclusions>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
@ -258,8 +244,8 @@
<artifactId>xpp3</artifactId> <artifactId>xpp3</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>log4j</groupId> <groupId>ch.qos.reload4j</groupId>
<artifactId>log4j</artifactId> <artifactId>reload4j</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.geronimo.specs</groupId> <groupId>org.apache.geronimo.specs</groupId>
@ -371,7 +357,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-reload4j</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
@ -444,6 +430,16 @@
<groupId>io.fabric8.insight</groupId> <groupId>io.fabric8.insight</groupId>
<artifactId>insight-log4j</artifactId> <artifactId>insight-log4j</artifactId>
<version>${insight-version}</version> <version>${insight-version}</version>
<exclusions>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.ops4j.pax.url</groupId> <groupId>org.ops4j.pax.url</groupId>

4
assembly/src/main/descriptors/common-bin.xml
View File

@ -193,8 +193,8 @@
<include>commons-codec:commons-codec</include> <include>commons-codec:commons-codec</include>
<include>commons-net:commons-net</include> <include>commons-net:commons-net</include>
<include>org.apache.commons:commons-lang3</include> <include>org.apache.commons:commons-lang3</include>
<include>org.slf4j:slf4j-log4j12</include> <include>org.slf4j:slf4j-reload4j</include>
<include>log4j:log4j</include> <include>ch.qos.reload4j:reload4j</include>
<include>org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec</include> <include>org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec</include>
<include>org.apache.httpcomponents:httpclient</include> <include>org.apache.httpcomponents:httpclient</include>
<include>org.apache.httpcomponents:httpcore</include> <include>org.apache.httpcomponents:httpcore</include>

69
pom.xml
View File

@ -87,9 +87,9 @@
<leveldb-api-version>0.9</leveldb-api-version> <leveldb-api-version>0.9</leveldb-api-version>
<leveldb-version>0.9</leveldb-version> <leveldb-version>0.9</leveldb-version>
<leveldbjni-version>1.8</leveldbjni-version> <leveldbjni-version>1.8</leveldbjni-version>
<log4j-version>1.2.17</log4j-version>
<mockito-version>3.8.0</mockito-version> <mockito-version>3.8.0</mockito-version>
<owasp-dependency-check-version>5.2.4</owasp-dependency-check-version> <owasp-dependency-check-version>5.2.4</owasp-dependency-check-version>
<pax-logging-version>1.11.14</pax-logging-version>
<mqtt-client-version>1.16</mqtt-client-version> <mqtt-client-version>1.16</mqtt-client-version>
<org-apache-derby-version>10.14.2.0</org-apache-derby-version> <org-apache-derby-version>10.14.2.0</org-apache-derby-version>
<osgi-version>6.0.0</osgi-version> <osgi-version>6.0.0</osgi-version>
@ -99,6 +99,7 @@
<qpid-jms-version>0.58.0</qpid-jms-version> <qpid-jms-version>0.58.0</qpid-jms-version>
<qpid-jms-netty-version>4.1.63.Final</qpid-jms-netty-version> <qpid-jms-netty-version>4.1.63.Final</qpid-jms-netty-version>
<qpid-jms-proton-version>0.33.8</qpid-jms-proton-version> <qpid-jms-proton-version>0.33.8</qpid-jms-proton-version>
<reload4j-version>1.2.19</reload4j-version>
<netty-all-version>4.1.63.Final</netty-all-version> <netty-all-version>4.1.63.Final</netty-all-version>
<regexp-version>1.3</regexp-version> <regexp-version>1.3</regexp-version>
<rome-version>1.16.0</rome-version> <rome-version>1.16.0</rome-version>
@ -106,7 +107,7 @@
<scala-version>2.11.11</scala-version> <scala-version>2.11.11</scala-version>
<shiro-version>1.8.0</shiro-version> <shiro-version>1.8.0</shiro-version>
<scalatest-version>3.0.8</scalatest-version> <scalatest-version>3.0.8</scalatest-version>
<slf4j-version>1.7.32</slf4j-version> <slf4j-version>1.7.36</slf4j-version>
<snappy-version>1.1.2</snappy-version> <snappy-version>1.1.2</snappy-version>
<spring-version>4.3.30.RELEASE</spring-version> <spring-version>4.3.30.RELEASE</spring-version>
<taglibs-version>1.2.5</taglibs-version> <taglibs-version>1.2.5</taglibs-version>
@ -487,6 +488,28 @@
</exclusions> </exclusions>
</dependency> </dependency>
<dependency>
<groupId>org.ops4j.pax.logging</groupId>
<artifactId>pax-logging-api</artifactId>
<version>${pax-logging-version}</version>
</dependency>
<dependency>
<groupId>org.ops4j.pax.logging</groupId>
<artifactId>pax-logging-service</artifactId>
<version>${pax-logging-version}</version>
<exclusions>
<exclusion>
<groupId>log4j</groupId>
<artifactId>apache-log4j-extras</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.ops4j.pax.logging</groupId>
<artifactId>pax-logging-log4j2</artifactId>
<version>${pax-logging-version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.apache.geronimo.specs</groupId> <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId> <artifactId>geronimo-jms_1.1_spec</artifactId>
@ -597,6 +620,40 @@
<artifactId>zookeeper</artifactId> <artifactId>zookeeper</artifactId>
<version>${zookeeper-version}</version> <version>${zookeeper-version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
<version>${zookeeper-version}</version>
<exclusions>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.linkedin</groupId>
<artifactId>org.linkedin.zookeeper-impl</artifactId>
<version>${linkedin-zookeeper-version}</version>
<exclusions>
<exclusion>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
</exclusion>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- zeroconf transport --> <!-- zeroconf transport -->
<dependency> <dependency>
@ -660,9 +717,9 @@
<!-- Used to configure the activemq logs --> <!-- Used to configure the activemq logs -->
<dependency> <dependency>
<groupId>log4j</groupId> <groupId>ch.qos.reload4j</groupId>
<artifactId>log4j</artifactId> <artifactId>reload4j</artifactId>
<version>${log4j-version}</version> <version>${reload4j-version}</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
@ -1006,7 +1063,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-reload4j</artifactId>
<version>${slf4j-version}</version> <version>${slf4j-version}</version>
</dependency> </dependency>
<dependency> <dependency>