JAMES-1966 get rid of commons-logging, we use slf4j bridge instead
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/6b877e14 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/6b877e14 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/6b877e14 Branch: refs/heads/master Commit: 6b877e14a390d24ee0cbd268bc18775b53f534ef Parents: c1b777d Author: Matthieu Baechler <matthieu.baech...@gmail.com> Authored: Thu Mar 16 09:04:03 2017 +0100 Committer: benwa <btell...@linagora.com> Committed: Tue Mar 21 17:55:53 2017 +0700 ---------------------------------------------------------------------- mailet/pom.xml | 6 ++++++ protocols/pom.xml | 6 ++++++ server/container/guice/jpa-smtp/pom.xml | 6 ++++++ server/mailet/mailets/pom.xml | 4 ++++ server/pom.xml | 4 ++++ server/queue/queue-activemq/pom.xml | 6 ++++++ 6 files changed, 32 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/6b877e14/mailet/pom.xml ---------------------------------------------------------------------- diff --git a/mailet/pom.xml b/mailet/pom.xml index cf8836d..3985dda 100644 --- a/mailet/pom.xml +++ b/mailet/pom.xml @@ -179,6 +179,12 @@ <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient-osgi</artifactId> <version>${httpclient-osgi.version}</version> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.assertj</groupId> http://git-wip-us.apache.org/repos/asf/james-project/blob/6b877e14/protocols/pom.xml ---------------------------------------------------------------------- diff --git a/protocols/pom.xml b/protocols/pom.xml index ef82131..33f566c 100644 --- a/protocols/pom.xml +++ b/protocols/pom.xml @@ -194,6 +194,12 @@ <groupId>org.apache.james</groupId> <artifactId>apache-jsieve-core</artifactId> <version>${jsieve.version}</version> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> </dependency> <!-- http://git-wip-us.apache.org/repos/asf/james-project/blob/6b877e14/server/container/guice/jpa-smtp/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/guice/jpa-smtp/pom.xml b/server/container/guice/jpa-smtp/pom.xml index 2e712b7..e10c620 100644 --- a/server/container/guice/jpa-smtp/pom.xml +++ b/server/container/guice/jpa-smtp/pom.xml @@ -239,6 +239,12 @@ <groupId>com.jayway.restassured</groupId> <artifactId>rest-assured</artifactId> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>com.nurkiewicz.asyncretry</groupId> http://git-wip-us.apache.org/repos/asf/james-project/blob/6b877e14/server/mailet/mailets/pom.xml ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/pom.xml b/server/mailet/mailets/pom.xml index 958ad2a..3f2ddcd 100644 --- a/server/mailet/mailets/pom.xml +++ b/server/mailet/mailets/pom.xml @@ -136,6 +136,10 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + </dependency> <!-- <dependency> <groupId>org.apache.james</groupId> http://git-wip-us.apache.org/repos/asf/james-project/blob/6b877e14/server/pom.xml ---------------------------------------------------------------------- diff --git a/server/pom.xml b/server/pom.xml index 261346d..62f2bed 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -1096,6 +1096,10 @@ <artifactId>commons-beanutils-core</artifactId> <groupId>commons-beanutils</groupId> </exclusion> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> </exclusions> </dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/6b877e14/server/queue/queue-activemq/pom.xml ---------------------------------------------------------------------- diff --git a/server/queue/queue-activemq/pom.xml b/server/queue/queue-activemq/pom.xml index 978e5bf..9cd81cc 100644 --- a/server/queue/queue-activemq/pom.xml +++ b/server/queue/queue-activemq/pom.xml @@ -66,6 +66,12 @@ <groupId>org.apache.activemq</groupId> <artifactId>activemq-spring</artifactId> <version>${activemq.version}</version> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.springframework</groupId> --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
