Author: hadrian
Date: Fri Apr 8 13:54:09 2011
New Revision: 1090251
URL: http://svn.apache.org/viewvc?rev=1090251&view=rev
Log:
CAMEL-3830. Upgrade to slf4j 1.6.1
Modified:
camel/branches/camel-2.7.x/ (props changed)
camel/branches/camel-2.7.x/components/camel-http/ (props changed)
camel/branches/camel-2.7.x/parent/pom.xml
Propchange: camel/branches/camel-2.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 8 13:54:09 2011
@@ -1 +1 @@
-/camel/trunk:1083696,1087276,1087612,1087856,1088583,1088916-1088917,1089275
+/camel/trunk:1083696,1087276,1087612,1087856,1088583,1088916-1088917,1089275,1090166
Propchange: camel/branches/camel-2.7.x/components/camel-http/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 8 13:54:09 2011
@@ -1 +1 @@
-/camel/trunk/components/camel-http:917526,1083696,1087276,1087612,1087856,1088583,1088916-1088917,1089275
+/camel/trunk/components/camel-http:917526,1083696,1087276,1087612,1087856,1088583,1088916-1088917,1089275,1090166
Modified: camel/branches/camel-2.7.x/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/parent/pom.xml?rev=1090251&r1=1090250&r2=1090251&view=diff
==============================================================================
--- camel/branches/camel-2.7.x/parent/pom.xml (original)
+++ camel/branches/camel-2.7.x/parent/pom.xml Fri Apr 8 13:54:09 2011
@@ -126,8 +126,7 @@
<scala-plugin-version>2.15.0</scala-plugin-version>
<servicemix-specs-version>1.7.0</servicemix-specs-version>
<shiro-bundle-version>1.1.0_1</shiro-bundle-version>
- <!-- pax-logging (osgi) dont support slf4j 1.6.x -->
- <slf4j-version>1.5.11</slf4j-version>
+ <slf4j-version>1.6.1</slf4j-version>
<smack-version>3.1.0</smack-version>
<snmp4j-version>1.8.1_3</snmp4j-version>
<smpp-version>2.1.0_1</smpp-version>
