You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ma...@apache.org on 2016/04/20 15:15:15 UTC
[2/2] activemq-artemis git commit: Update to use one version of slf4j
defined at the top level pom
Update to use one version of slf4j defined at the top level pom
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/a3ffa9aa
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/a3ffa9aa
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/a3ffa9aa
Branch: refs/heads/master
Commit: a3ffa9aa34f803f418840bf4177cea7094f3b112
Parents: cb8d3b7
Author: Paul Gallagher <pg...@redhat.com>
Authored: Tue Apr 19 16:10:22 2016 +0100
Committer: Martyn Taylor <mt...@redhat.com>
Committed: Wed Apr 20 14:14:45 2016 +0100
----------------------------------------------------------------------
examples/features/perf/perf/pom.xml | 1 -
examples/features/standard/security-ldap/pom.xml | 1 -
examples/pom.xml | 1 -
examples/protocols/openwire/chat/pom.xml | 1 -
.../protocols/openwire/message-listener/pom.xml | 1 -
.../protocols/openwire/message-recovery/pom.xml | 1 -
examples/protocols/openwire/pom.xml | 1 -
examples/protocols/openwire/queue/pom.xml | 1 -
pom.xml | 18 +++++++++++++++++-
tests/activemq5-unit-tests/pom.xml | 2 --
10 files changed, 17 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a3ffa9aa/examples/features/perf/perf/pom.xml
----------------------------------------------------------------------
diff --git a/examples/features/perf/perf/pom.xml b/examples/features/perf/perf/pom.xml
index 3616808..0132fd5 100644
--- a/examples/features/perf/perf/pom.xml
+++ b/examples/features/perf/perf/pom.xml
@@ -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 -->
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a3ffa9aa/examples/features/standard/security-ldap/pom.xml
----------------------------------------------------------------------
diff --git a/examples/features/standard/security-ldap/pom.xml b/examples/features/standard/security-ldap/pom.xml
index 584c3a6..5ec2684 100644
--- a/examples/features/standard/security-ldap/pom.xml
+++ b/examples/features/standard/security-ldap/pom.xml
@@ -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>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a3ffa9aa/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index 77c82f9..1d70848 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -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>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a3ffa9aa/examples/protocols/openwire/chat/pom.xml
----------------------------------------------------------------------
diff --git a/examples/protocols/openwire/chat/pom.xml b/examples/protocols/openwire/chat/pom.xml
index a8fe484..20ffc3f 100644
--- a/examples/protocols/openwire/chat/pom.xml
+++ b/examples/protocols/openwire/chat/pom.xml
@@ -54,7 +54,6 @@ under the License.
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-nop</artifactId>
- <version>${slf4j-version}</version>
</dependency>
</dependencies>
<profiles>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a3ffa9aa/examples/protocols/openwire/message-listener/pom.xml
----------------------------------------------------------------------
diff --git a/examples/protocols/openwire/message-listener/pom.xml b/examples/protocols/openwire/message-listener/pom.xml
index 94c4c61..a9e0bf2 100644
--- a/examples/protocols/openwire/message-listener/pom.xml
+++ b/examples/protocols/openwire/message-listener/pom.xml
@@ -49,7 +49,6 @@ under the License.
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-nop</artifactId>
- <version>${slf4j-version}</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a3ffa9aa/examples/protocols/openwire/message-recovery/pom.xml
----------------------------------------------------------------------
diff --git a/examples/protocols/openwire/message-recovery/pom.xml b/examples/protocols/openwire/message-recovery/pom.xml
index f3dd9ee..f1dd1d7 100644
--- a/examples/protocols/openwire/message-recovery/pom.xml
+++ b/examples/protocols/openwire/message-recovery/pom.xml
@@ -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 -->
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a3ffa9aa/examples/protocols/openwire/pom.xml
----------------------------------------------------------------------
diff --git a/examples/protocols/openwire/pom.xml b/examples/protocols/openwire/pom.xml
index 2eaa218..d9b1525 100644
--- a/examples/protocols/openwire/pom.xml
+++ b/examples/protocols/openwire/pom.xml
@@ -34,7 +34,6 @@ under the License.
<properties>
<activemq.basedir>${project.basedir}/../../..</activemq.basedir>
- <slf4j-version>1.7.10</slf4j-version>
</properties>
<profiles>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a3ffa9aa/examples/protocols/openwire/queue/pom.xml
----------------------------------------------------------------------
diff --git a/examples/protocols/openwire/queue/pom.xml b/examples/protocols/openwire/queue/pom.xml
index 7c12616..1c8c267 100644
--- a/examples/protocols/openwire/queue/pom.xml
+++ b/examples/protocols/openwire/queue/pom.xml
@@ -49,7 +49,6 @@ under the License.
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-nop</artifactId>
- <version>${slf4j-version}</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a3ffa9aa/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 205e72c..292aa14 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a3ffa9aa/tests/activemq5-unit-tests/pom.xml
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/pom.xml b/tests/activemq5-unit-tests/pom.xml
index 9eee81c..0a4bdb4 100644
--- a/tests/activemq5-unit-tests/pom.xml
+++ b/tests/activemq5-unit-tests/pom.xml
@@ -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>