Author: davsclaus
Date: Fri Sep 2 09:42:16 2011
New Revision: 1164444
URL: http://svn.apache.org/viewvc?rev=1164444&view=rev
Log:
Merged revisions 1152755 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/components/camel-aws/pom.xml
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 2 09:42:16 2011
@@ -1 +1 @@
-/camel/trunk:1150651,1151054,1152170,1153620,1153812,1153829,1154684,1155230,1156108,1156260,1156277,1156479,1156524,1157348,1157798,1157831,1157878,1158153,1159171,1159174,1159326,1159457,1159460,1159606,1159682-1159683,1159867,1160547,1160637,1161010,1161082,1161524,1162309,1162395
+/camel/trunk:1150651,1151054,1152170,1152755,1153620,1153812,1153829,1154684,1155230,1156108,1156260,1156277,1156479,1156524,1157348,1157798,1157831,1157878,1158153,1159171,1159174,1159326,1159457,1159460,1159606,1159682-1159683,1159867,1160547,1160637,1161010,1161082,1161524,1162309,1162395
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.8.x/components/camel-aws/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-aws/pom.xml?rev=1164444&r1=1164443&r2=1164444&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-aws/pom.xml (original)
+++ camel/branches/camel-2.8.x/components/camel-aws/pom.xml Fri Sep 2 09:42:16
2011
@@ -48,7 +48,19 @@
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk</artifactId>
<version>1.1.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-core-asl</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-core-asl</artifactId>
+ <version>${jackson-version}</version>
+ </dependency>
+
<!-- for testing -->
<dependency>
