Author: janstey
Date: Thu Dec 4 07:37:19 2008
New Revision: 723358
URL: http://svn.apache.org/viewvc?rev=723358&view=rev
Log:
Merged revisions 723357 via svnmerge from
https://svn.apache.org/repos/asf/activemq/camel/trunk
........
r723357 | janstey | 2008-12-04 12:01:37 -0330 (Thu, 04 Dec 2008) | 1 line
CAMEL-1146 - Exclude slf4j from mina so we don't have two versions on the
classpath.
........
Modified:
activemq/camel/branches/camel-1.x/ (props changed)
activemq/camel/branches/camel-1.x/components/camel-mina/pom.xml
Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: activemq/camel/branches/camel-1.x/components/camel-mina/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-mina/pom.xml?rev=723358&r1=723357&r2=723358&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/components/camel-mina/pom.xml (original)
+++ activemq/camel/branches/camel-1.x/components/camel-mina/pom.xml Thu Dec 4
07:37:19 2008
@@ -46,6 +46,16 @@
<dependency>
<groupId>org.apache.mina</groupId>
<artifactId>mina-core</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
