Author: cmueller
Date: Sat Oct 27 16:12:35 2012
New Revision: 1402817
URL: http://svn.apache.org/viewvc?rev=1402817&view=rev
Log:
CAMEL-5740: Upgrade to slf4j 1.7.2
Modified:
camel/trunk/camel-core/pom.xml
camel/trunk/components/camel-blueprint/pom.xml
camel/trunk/components/camel-cache/pom.xml
camel/trunk/components/camel-cdi/pom.xml
camel/trunk/components/camel-cometd/pom.xml
camel/trunk/components/camel-sjms/pom.xml
camel/trunk/components/camel-spring-javaconfig/pom.xml
camel/trunk/components/camel-spring-ws/pom.xml
camel/trunk/components/camel-spring/pom.xml
camel/trunk/components/camel-websocket/pom.xml
camel/trunk/parent/pom.xml
camel/trunk/platforms/karaf/commands/pom.xml
Modified: camel/trunk/camel-core/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/pom.xml?rev=1402817&r1=1402816&r2=1402817&view=diff
==============================================================================
--- camel/trunk/camel-core/pom.xml (original)
+++ camel/trunk/camel-core/pom.xml Sat Oct 27 16:12:35 2012
@@ -38,6 +38,7 @@
<camel.osgi.import>
!org.apache.camel.*,
!com.googlecode.concurrentlinkedhashmap,
+ ${camel.osgi.import.defaults},
org.apache.xalan.xsltc.trax;resolution:=optional,
javax.activation;resolution:=optional,
javax.xml.bind;resolution:=optional,
Modified: camel/trunk/components/camel-blueprint/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-blueprint/pom.xml?rev=1402817&r1=1402816&r2=1402817&view=diff
==============================================================================
--- camel/trunk/components/camel-blueprint/pom.xml (original)
+++ camel/trunk/components/camel-blueprint/pom.xml Sat Oct 27 16:12:35 2012
@@ -33,6 +33,7 @@
<camel.osgi.import>
!org.apache.camel.blueprint.*,
!org.apache.camel.util.blueprint.*,
+ ${camel.osgi.import.defaults},
org.apache.camel.*;${camel.osgi.import.strict.version},
org.osgi.service.event*;resolution:=optional,
org.apache.aries*;version="[0.3,2)",
Modified: camel/trunk/components/camel-cache/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cache/pom.xml?rev=1402817&r1=1402816&r2=1402817&view=diff
==============================================================================
--- camel/trunk/components/camel-cache/pom.xml (original)
+++ camel/trunk/components/camel-cache/pom.xml Sat Oct 27 16:12:35 2012
@@ -34,6 +34,7 @@
<camel.osgi.import>
!org.apache.camel.component.cache.*,
!org.apache.camel.processor.cache.*,
+ ${camel.osgi.import.defaults},
*
</camel.osgi.import>
<camel.osgi.export.pkg>
Modified: camel/trunk/components/camel-cdi/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cdi/pom.xml?rev=1402817&r1=1402816&r2=1402817&view=diff
==============================================================================
--- camel/trunk/components/camel-cdi/pom.xml (original)
+++ camel/trunk/components/camel-cdi/pom.xml Sat Oct 27 16:12:35 2012
@@ -34,6 +34,7 @@
<camel.osgi.import>
!org.apache.camel.cdi.*,
!org.apache.deltaspike.cdise.api.*,
+ ${camel.osgi.import.defaults},
org.apache.deltaspike.core.api.*;resolution:=optional,
*
</camel.osgi.import>
Modified: camel/trunk/components/camel-cometd/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cometd/pom.xml?rev=1402817&r1=1402816&r2=1402817&view=diff
==============================================================================
--- camel/trunk/components/camel-cometd/pom.xml (original)
+++ camel/trunk/components/camel-cometd/pom.xml Sat Oct 27 16:12:35 2012
@@ -31,6 +31,12 @@
<properties>
<camel.osgi.export.pkg>org.apache.camel.component.cometd.*</camel.osgi.export.pkg>
+ <camel.osgi.import.pkg>
+ !org.apache.camel.component.cometd.*,
+
org.eclipse.jetty.util.ssl;version="[7.6,8.2)";resolution:=optional,
+ ${camel.osgi.import.defaults},
+ *
+ </camel.osgi.import.pkg>
</properties>
<dependencies>
Modified: camel/trunk/components/camel-sjms/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-sjms/pom.xml?rev=1402817&r1=1402816&r2=1402817&view=diff
==============================================================================
--- camel/trunk/components/camel-sjms/pom.xml (original)
+++ camel/trunk/components/camel-sjms/pom.xml Sat Oct 27 16:12:35 2012
@@ -41,6 +41,7 @@
<camel.osgi.import.pkg>
!org.apache.camel.component.sjms.*,
org.apache.camel.*;${camel.osgi.import.camel.version},
+ ${camel.osgi.import.defaults},
*
</camel.osgi.import.pkg>
<camel.osgi.private.pkg>
Modified: camel/trunk/components/camel-spring-javaconfig/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-javaconfig/pom.xml?rev=1402817&r1=1402816&r2=1402817&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-javaconfig/pom.xml (original)
+++ camel/trunk/components/camel-spring-javaconfig/pom.xml Sat Oct 27 16:12:35
2012
@@ -32,12 +32,6 @@
<properties>
<camel.osgi.export.pkg>org.apache.camel.spring.javaconfig.*</camel.osgi.export.pkg>
- <camel.osgi.import>
- !org.apache.camel.spring.javaconfig.*,
- org.apache.camel.*;${camel.osgi.import.camel.version},
- org.springframework.*;version="[3,4)",
- *
- </camel.osgi.import>
<!-- The test module has the dependency of Spring 3.1.1, but the module
can run with Spring 3.0.x out of box -->
<spring-version>3.1.1.RELEASE</spring-version>
</properties>
Modified: camel/trunk/components/camel-spring-ws/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-ws/pom.xml?rev=1402817&r1=1402816&r2=1402817&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-ws/pom.xml (original)
+++ camel/trunk/components/camel-spring-ws/pom.xml Sat Oct 27 16:12:35 2012
@@ -32,18 +32,9 @@
<properties>
<camel.osgi.export.pkg>org.apache.camel.component.spring.ws.*</camel.osgi.export.pkg>
- <camel.osgi.import>
- !org.apache.camel.component.spring.ws.*,
- org.apache.camel.*;${camel.osgi.import.camel.version},
- org.springframework.ws.*;version="[2,3)",
- org.springframework.xml.*;version="[2,3)",
- org.springframework.*;version="[3,4)",
- *
- </camel.osgi.import>
</properties>
<dependencies>
-
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core</artifactId>
Modified: camel/trunk/components/camel-spring/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/pom.xml?rev=1402817&r1=1402816&r2=1402817&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/pom.xml (original)
+++ camel/trunk/components/camel-spring/pom.xml Sat Oct 27 16:12:35 2012
@@ -37,10 +37,10 @@
!org.apache.camel.component.event,
!org.apache.camel.language.spel,
org.apache.camel.*;${camel.osgi.import.strict.version},
+ ${camel.osgi.import.defaults},
org.osgi.framework;version="[1.3,2)",
org.osgi.service.event;resolution:=optional,
org.springframework.osgi.*;version="[1.2,2)",
- org.springframework.*;version="[3,4)",
*
</camel.osgi.import>
<camel.osgi.export>
Modified: camel/trunk/components/camel-websocket/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-websocket/pom.xml?rev=1402817&r1=1402816&r2=1402817&view=diff
==============================================================================
--- camel/trunk/components/camel-websocket/pom.xml (original)
+++ camel/trunk/components/camel-websocket/pom.xml Sat Oct 27 16:12:35 2012
@@ -36,6 +36,7 @@
</camel.osgi.export.pkg>
<camel.osgi.import.pkg>
!org.apache.camel.component.websocket.*,
+
org.eclipse.jetty.util.ssl;version="[7.6,8.2)";resolution:=optional,
${camel.osgi.import.defaults},
*
</camel.osgi.import.pkg>
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1402817&r1=1402816&r2=1402817&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Sat Oct 27 16:12:35 2012
@@ -291,8 +291,8 @@
<servicemix-specs-version>1.9.0</servicemix-specs-version>
<servlet-api-2.5-version>1.1.2</servlet-api-2.5-version>
<shiro-version>1.2.1</shiro-version>
- <slf4j-api-version>1.6.6</slf4j-api-version>
- <slf4j-version>1.6.6</slf4j-version>
+ <slf4j-api-version>1.7.2</slf4j-api-version>
+ <slf4j-version>1.7.2</slf4j-version>
<smack-bundle-version>3.2.1_1</smack-bundle-version>
<smack-version>3.2.1</smack-version>
<snappy-bundle-version>1.0.4.1_1</snappy-bundle-version>
@@ -356,6 +356,8 @@
<camel.osgi.import.strict.version>version="[$(version;===;${camel.osgi.version.clean}),$(version;==+;${camel.osgi.version.clean}))"</camel.osgi.import.strict.version>
<camel.osgi.import.default.version>[$(version;==;$(@)),$(version;+;$(@)))</camel.osgi.import.default.version>
<camel.osgi.import.defaults>
+ org.springframework.ws.*;version="[2,3)",
+ org.springframework.xml.*;version="[2,3)",
org.springframework.*;version="[3,4)",
org.apache.commons.logging.*;version="[1.1,2)",
org.apache.cxf.*;version="${cxf-version-range}",
@@ -365,12 +367,12 @@
org.apache.velocity.*;version="[1.6.2,2)",
org.apache.xmlbeans.*;version="[2.4,3)",
org.eclipse.jetty.*;version="[7.5,8.2)",
- org.eclipse.jetty.util.ssl;version="[7.6,8.2)";resolution:=optional,
com.thoughtworks.xstream.*;version="[1.3,2)",
org.antlr.stringtemplate.*;version="[3.0,4)",
org.jivesoftware.smack.*;version="[3.0,4)",
org.ccil.cowan.tagsoup.*;version="[1.2,2)",
org.mortbay.cometd.*;version="[6.1,7)",
+ org.slf4j.*;version="[1.6,2)",
net.sf.flatpack.*;version="[3.1.1,4)",
net.sf.saxon.*;version="[9.3.0,9.5)",
freemarker.*;version="[2.3.15,3)",
Modified: camel/trunk/platforms/karaf/commands/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/commands/pom.xml?rev=1402817&r1=1402816&r2=1402817&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/commands/pom.xml (original)
+++ camel/trunk/platforms/karaf/commands/pom.xml Sat Oct 27 16:12:35 2012
@@ -31,7 +31,7 @@
<name>Camel :: Platforms :: Apache Karaf :: Commands</name>
<properties>
-
<camel.osgi.export.pkg>org.apache.camel.karaf.commands*</camel.osgi.export.pkg>
+
<camel.osgi.export.pkg>org.apache.camel.karaf.commands.*</camel.osgi.export.pkg>
</properties>
<dependencies>
@@ -79,6 +79,7 @@
org.apache.felix.service.command;version="[0.6,1)",
org.apache.felix.gogo.commands;version="[0.6,1)",
org.apache.karaf.shell.console;version="[2.2,4)",
+ org.slf4j.*;version="[1.6,2)",
*
</Import-Package>
<Private-Package>
