Repository: qpid-jms Updated Branches: refs/heads/master 7923a0eb7 -> 729162d5b
QPIDJMS-47: include slf4j-log4j in binary archive, as used for examples, easing initial use for non-maven users Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/6e32ccd7 Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/6e32ccd7 Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/6e32ccd7 Branch: refs/heads/master Commit: 6e32ccd7b63cbd24be7a0c894ebdfeb5a43e4787 Parents: 7923a0e Author: Robert Gemmell <[email protected]> Authored: Mon May 11 14:12:11 2015 +0100 Committer: Robert Gemmell <[email protected]> Committed: Mon May 11 14:12:11 2015 +0100 ---------------------------------------------------------------------- apache-qpid-jms/pom.xml | 5 +++++ apache-qpid-jms/src/main/assembly/LICENSE | 2 +- apache-qpid-jms/src/main/assembly/bin.xml | 13 +++++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/6e32ccd7/apache-qpid-jms/pom.xml ---------------------------------------------------------------------- diff --git a/apache-qpid-jms/pom.xml b/apache-qpid-jms/pom.xml index 2cbe51a..8ea8761 100644 --- a/apache-qpid-jms/pom.xml +++ b/apache-qpid-jms/pom.xml @@ -35,6 +35,11 @@ <groupId>org.apache.qpid</groupId> <artifactId>qpid-jms-discovery</artifactId> </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <optional>true</optional> + </dependency> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/6e32ccd7/apache-qpid-jms/src/main/assembly/LICENSE ---------------------------------------------------------------------- diff --git a/apache-qpid-jms/src/main/assembly/LICENSE b/apache-qpid-jms/src/main/assembly/LICENSE index 19995e9..1c79982 100644 --- a/apache-qpid-jms/src/main/assembly/LICENSE +++ b/apache-qpid-jms/src/main/assembly/LICENSE @@ -207,7 +207,7 @@ # Third Party Dependency Licensing Information: ############################################### -This product bundles the SLF4J API, which is distributed under +This product bundles SLF4J-API and SLF4J-LOG4J, which are distributed under the MIT licence: Copyright (c) 2004-2013 QOS.ch http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/6e32ccd7/apache-qpid-jms/src/main/assembly/bin.xml ---------------------------------------------------------------------- diff --git a/apache-qpid-jms/src/main/assembly/bin.xml b/apache-qpid-jms/src/main/assembly/bin.xml index 7f72cdf..50ae502 100644 --- a/apache-qpid-jms/src/main/assembly/bin.xml +++ b/apache-qpid-jms/src/main/assembly/bin.xml @@ -44,6 +44,19 @@ <dependencySet> <outputDirectory>/lib</outputDirectory> <useProjectArtifact>false</useProjectArtifact> + <useTransitiveFiltering>true</useTransitiveFiltering> + <excludes> + <exclude>org.slf4j:slf4j-log4j12</exclude> + </excludes> + </dependencySet> + + <dependencySet> + <outputDirectory>/lib/optional</outputDirectory> + <useProjectArtifact>false</useProjectArtifact> + <useTransitiveFiltering>true</useTransitiveFiltering> + <includes> + <include>org.slf4j:slf4j-log4j12</include> + </includes> </dependencySet> </dependencySets> <moduleSets> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
