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

Update to use one version of slf4j defined at the top level pom

This commit is contained in:
Paul Gallagher 2016-04-19 16:10:22 +01:00 committed by Martyn Taylor
parent cb8d3b78e6
commit a3ffa9aa34
10 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
examples/features/perf/perf/pom.xml
View File

@ -49,7 +49,6 @@ under the License.
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-nop</artifactId>
<version>${slf4j-version}</version>
</dependency>
<dependency>
<!-- this is to have the ServerUtil -->

1
examples/features/standard/security-ldap/pom.xml
View File

@ -57,7 +57,6 @@ under the License.
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.7.7</version>
</dependency>
<dependency>
<groupId>org.apache.directory.server</groupId>

1
examples/pom.xml
View File

@ -33,7 +33,6 @@ under the License.
<name>ActiveMQ Artemis Examples</name>
<properties>
<slf4j-version>1.7.10</slf4j-version>
<activemq5-version>5.12.0</activemq5-version>
<udp-address>231.7.7.7</udp-address>
<activemq.basedir>${project.basedir}/..</activemq.basedir>

1
examples/protocols/openwire/chat/pom.xml
View File

@ -54,7 +54,6 @@ under the License.
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-nop</artifactId>
<version>${slf4j-version}</version>
</dependency>
</dependencies>
<profiles>

1
examples/protocols/openwire/message-listener/pom.xml
View File

@ -49,7 +49,6 @@ under the License.
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-nop</artifactId>
<version>${slf4j-version}</version>
</dependency>
</dependencies>

1
examples/protocols/openwire/message-recovery/pom.xml
View File

@ -49,7 +49,6 @@ under the License.
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-nop</artifactId>
<version>${slf4j-version}</version>
</dependency>
<dependency>
<!-- this is to have the ServerUtil -->

1
examples/protocols/openwire/pom.xml
View File

@ -34,7 +34,6 @@ under the License.
<properties>
<activemq.basedir>${project.basedir}/../../..</activemq.basedir>
<slf4j-version>1.7.10</slf4j-version>
</properties>
<profiles>

1
examples/protocols/openwire/queue/pom.xml
View File

@ -49,7 +49,6 @@ under the License.
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-nop</artifactId>
<version>${slf4j-version}</version>
</dependency>
</dependencies>

18
pom.xml
View File

@ -70,6 +70,7 @@
<staging.siteURL>scp://people.apache.org/x1/www/activemq.apache.org</staging.siteURL>
<netty.version>4.0.32.Final</netty.version>
<jetty.version>9.2.11.v20150529</jetty.version>
<slf4j.version>1.7.12</slf4j.version>
<maven.assembly.plugin.version>2.4</maven.assembly.plugin.version>
<activemq.version.versionName>${project.version}</activemq.version.versionName>
<activemq.version.majorVersion>1</activemq.version.majorVersion>
@ -357,6 +358,21 @@
<version>1.1.1</version>
<!-- License: Apache 2.0 -->
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<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-->
@ -406,7 +422,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.12</version>
<version>${slf4j.version}</version>
<!-- License: MIT -->
</dependency>

2
tests/activemq5-unit-tests/pom.xml
View File

@ -39,7 +39,6 @@
<commons-net-version>3.3</commons-net-version>
<xbean-version>3.18</xbean-version>
<hamcrest-version>1.3</hamcrest-version>
<slf4j-version>1.7.10</slf4j-version>
<jasypt-version>1.9.2</jasypt-version>
<directory-version>2.0.0-M6</directory-version>
<activeio-core-version>3.1.4</activeio-core-version>
@ -213,7 +212,6 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>${slf4j-version}</version>
<scope>test</scope>
</dependency>