Author: davsclaus
Date: Mon Oct 1 14:55:14 2012
New Revision: 1392370
URL: http://svn.apache.org/viewvc?rev=1392370&view=rev
Log:
Upgraded aws to support jackson 1.9, and include mapper as well.
Modified:
camel/branches/camel-2.10.x/components/camel-aws/pom.xml
camel/branches/camel-2.10.x/parent/pom.xml
camel/branches/camel-2.10.x/platforms/karaf/features/pom.xml
camel/branches/camel-2.10.x/platforms/karaf/features/src/main/resources/features.xml
Modified: camel/branches/camel-2.10.x/components/camel-aws/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-aws/pom.xml?rev=1392370&r1=1392369&r2=1392370&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-aws/pom.xml (original)
+++ camel/branches/camel-2.10.x/components/camel-aws/pom.xml Mon Oct 1
14:55:14 2012
@@ -18,14 +18,12 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
-
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-parent</artifactId>
+ <artifactId>components</artifactId>
<version>2.10.2-SNAPSHOT</version>
- <relativePath>../../parent</relativePath>
</parent>
<groupId>org.apache.camel</groupId>
@@ -54,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>
@@ -77,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/branches/camel-2.10.x/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/parent/pom.xml?rev=1392370&r1=1392369&r2=1392370&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/parent/pom.xml (original)
+++ camel/branches/camel-2.10.x/parent/pom.xml Mon Oct 1 14:55:14 2012
@@ -44,7 +44,8 @@
<atomikos-trascations-version>3.7.0</atomikos-trascations-version>
<avro-version>1.6.2</avro-version>
<avro-bundle-version>1.6.1_1</avro-bundle-version>
- <aws-java-sdk-version>1.3.10</aws-java-sdk-version>
+ <aws-java-sdk-bundle-version>1.3.14_1</aws-java-sdk-bundle-version>
+ <aws-java-sdk-version>1.3.14</aws-java-sdk-version>
<axiom-version>1.2.12</axiom-version>
<beanio-version>2.0.1</beanio-version>
<bouncycastle-version>1.46</bouncycastle-version>
Modified: camel/branches/camel-2.10.x/platforms/karaf/features/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/platforms/karaf/features/pom.xml?rev=1392370&r1=1392369&r2=1392370&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/platforms/karaf/features/pom.xml (original)
+++ camel/branches/camel-2.10.x/platforms/karaf/features/pom.xml Mon Oct 1
14:55:14 2012
@@ -39,7 +39,6 @@
<aopalliance-bundle-version>1.0_6</aopalliance-bundle-version>
<asm2-bundle-version>2.2.3_5</asm2-bundle-version>
<avalon-bundle-version>4.3.1_1</avalon-bundle-version>
- <aws-java-sdk-bundle-version>1.3.10_1</aws-java-sdk-bundle-version>
<bcel-bundle-version>5.2_4</bcel-bundle-version>
<bcpg-jdk16-bundle-version>1.46_2</bcpg-jdk16-bundle-version>
<cglib-version>2.1_3_7</cglib-version>
Modified:
camel/branches/camel-2.10.x/platforms/karaf/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/platforms/karaf/features/src/main/resources/features.xml?rev=1392370&r1=1392369&r2=1392370&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/platforms/karaf/features/src/main/resources/features.xml
(original)
+++
camel/branches/camel-2.10.x/platforms/karaf/features/src/main/resources/features.xml
Mon Oct 1 14:55:14 2012
@@ -203,6 +203,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>
