camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r1392364 - in /camel/trunk: components/camel-aws/pom.xml platforms/karaf/features/src/main/resources/features.xml
Date Mon, 01 Oct 2012 14:48:12 GMT
Author: davsclaus
Date: Mon Oct  1 14:48:11 2012
New Revision: 1392364

URL: http://svn.apache.org/viewvc?rev=1392364&view=rev
Log:
camel-aws should have the jackson mapper included.

Modified:
    camel/trunk/components/camel-aws/pom.xml
    camel/trunk/platforms/karaf/features/src/main/resources/features.xml

Modified: camel/trunk/components/camel-aws/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-aws/pom.xml?rev=1392364&r1=1392363&r2=1392364&view=diff
==============================================================================
--- camel/trunk/components/camel-aws/pom.xml (original)
+++ camel/trunk/components/camel-aws/pom.xml Mon Oct  1 14:48:11 2012
@@ -52,6 +52,10 @@
                     <artifactId>jackson-core-asl</artifactId>
                 </exclusion>
                 <exclusion>
+                    <groupId>org.codehaus.jackson</groupId>
+                    <artifactId>jackson-mapper-asl</artifactId>
+                </exclusion>
+                <exclusion>
                     <groupId>commons-logging</groupId>
                     <artifactId>commons-logging</artifactId>
                 </exclusion>
@@ -75,6 +79,11 @@
             <version>${jackson-version}</version>
         </dependency>
         <dependency>
+            <groupId>org.codehaus.jackson</groupId>
+            <artifactId>jackson-mapper-asl</artifactId>
+            <version>${jackson-version}</version>
+        </dependency>
+        <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
         </dependency>

Modified: camel/trunk/platforms/karaf/features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features.xml?rev=1392364&r1=1392363&r2=1392364&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml (original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Mon Oct  1 14:48:11
2012
@@ -211,6 +211,7 @@
     <bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
     <bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix-specs-version}</bundle>
     <bundle dependency='true'>mvn:org.codehaus.jackson/jackson-core-asl/${jackson-version}</bundle>
+    <bundle dependency='true'>mvn:org.codehaus.jackson/jackson-mapper-asl/${jackson-version}</bundle>
     <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aws-java-sdk/${aws-java-sdk-bundle-version}</bundle>
     <feature version='${project.version}'>camel-core</feature>
     <bundle>mvn:org.apache.camel/camel-aws/${project.version}</bundle>



Mime
View raw message