Repository: activemq-artemis Updated Branches: refs/heads/master f46fa8b92 -> d11b622f1
ARTEMIS-1144 Use the org.jboss.slf4j:slf4j-jboss-logmanager binding to allow slf4j to bind to the jboss-logmanager/jul Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/b1e4204a Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/b1e4204a Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/b1e4204a Branch: refs/heads/master Commit: b1e4204a10054b726755245078eb9bb591bc6611 Parents: f46fa8b Author: James Perkins <[email protected]> Authored: Wed May 3 15:51:46 2017 -0700 Committer: Clebert Suconic <[email protected]> Committed: Fri May 5 09:46:04 2017 -0400 ---------------------------------------------------------------------- artemis-distribution/pom.xml | 4 ++++ artemis-distribution/src/main/assembly/dep.xml | 1 + pom.xml | 7 +++++++ 3 files changed, 12 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b1e4204a/artemis-distribution/pom.xml ---------------------------------------------------------------------- diff --git a/artemis-distribution/pom.xml b/artemis-distribution/pom.xml index 044775f..2cc03ea 100644 --- a/artemis-distribution/pom.xml +++ b/artemis-distribution/pom.xml @@ -142,6 +142,10 @@ <groupId>org.jboss.logmanager</groupId> <artifactId>jboss-logmanager</artifactId> </dependency> + <dependency> + <groupId>org.jboss.slf4j</groupId> + <artifactId>slf4j-jboss-logmanager</artifactId> + </dependency> <dependency> <groupId>io.airlift</groupId> <artifactId>airline</artifactId> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b1e4204a/artemis-distribution/src/main/assembly/dep.xml ---------------------------------------------------------------------- diff --git a/artemis-distribution/src/main/assembly/dep.xml b/artemis-distribution/src/main/assembly/dep.xml index 8e3dd93..6b3430e 100644 --- a/artemis-distribution/src/main/assembly/dep.xml +++ b/artemis-distribution/src/main/assembly/dep.xml @@ -78,6 +78,7 @@ <include>org.apache.geronimo.specs:geronimo-jta_1.1_spec</include> <include>org.jboss.logmanager:jboss-logmanager</include> <include>org.jboss.logging:jboss-logging</include> + <include>org.jboss.slf4j:slf4j-jboss-logmanager</include> <include>io.netty:netty-all</include> <include>org.apache.qpid:proton-j</include> <include>org.apache.activemq:activemq-client</include> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b1e4204a/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index cef2592..779014c 100644 --- a/pom.xml +++ b/pom.xml @@ -92,6 +92,7 @@ <javax.inject.version>1</javax.inject.version> <hawtbuff.version>1.11</hawtbuff.version> <jb.logmanager.version>2.0.3.Final</jb.logmanager.version> + <jb.slf4j-jboss-logmanager.version>1.0.3.GA</jb.slf4j-jboss-logmanager.version> <airlift.version>0.7</airlift.version> <geronimo.annotation.1.1.spec.version>1.0.1</geronimo.annotation.1.1.spec.version> <geronimo.ejb.3.0.spec.version>1.0.1</geronimo.ejb.3.0.spec.version> @@ -366,6 +367,12 @@ <!-- License: Apache 2.0 --> </dependency> <dependency> + <groupId>org.jboss.slf4j</groupId> + <artifactId>slf4j-jboss-logmanager</artifactId> + <version>${jb.slf4j-jboss-logmanager.version}</version> + <!-- License: Apache 2.0 --> + </dependency> + <dependency> <groupId>net.java.dev.javacc</groupId> <artifactId>javacc</artifactId> <version>4.0</version>
