Repository: camel Updated Branches: refs/heads/camel-2.13.x 82816f88d -> 9ce8405c5 refs/heads/master 57bc5fb78 -> 34b347eaa
Some aws dependency upgrades and fix its osgi feature as its using jackson 2 now. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3bd3ce35 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3bd3ce35 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3bd3ce35 Branch: refs/heads/camel-2.13.x Commit: 3bd3ce354bdb7dec6f1e50c55857162c3338c065 Parents: 82816f8 Author: Claus Ibsen <davscl...@apache.org> Authored: Tue Apr 29 10:45:49 2014 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Fri May 2 08:19:21 2014 +0200 ---------------------------------------------------------------------- components/camel-aws/pom.xml | 24 ++++++++++++-------- .../features/src/main/resources/features.xml | 7 ++++-- 2 files changed, 19 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/3bd3ce35/components/camel-aws/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-aws/pom.xml b/components/camel-aws/pom.xml index c884c14..c1c2084 100644 --- a/components/camel-aws/pom.xml +++ b/components/camel-aws/pom.xml @@ -56,12 +56,16 @@ <version>${aws-java-sdk-version}</version> <exclusions> <exclusion> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-core-asl</artifactId> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> </exclusion> <exclusion> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-mapper-asl</artifactId> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + </exclusion> + <exclusion> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-annotations</artifactId> </exclusion> <exclusion> <groupId>commons-logging</groupId> @@ -82,14 +86,14 @@ </exclusions> </dependency> <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-core-asl</artifactId> - <version>${jackson-version}</version> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + <version>${jackson2-version}</version> </dependency> <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-mapper-asl</artifactId> - <version>${jackson-version}</version> + <groupId>com.fasterxml.jackson.module</groupId> + <artifactId>jackson-module-jaxb-annotations</artifactId> + <version>${jackson2-version}</version> </dependency> <dependency> <groupId>commons-logging</groupId> http://git-wip-us.apache.org/repos/asf/camel/blob/3bd3ce35/platforms/karaf/features/src/main/resources/features.xml ---------------------------------------------------------------------- diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml index 4d9e824..bdaad20 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -103,10 +103,13 @@ <feature name='camel-aws' version='${project.version}' resolver='(obr)' start-level='50'> <bundle dependency='true'>mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}</bundle> <bundle dependency='true'>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}</bundle> + <bundle dependency='true'>mvn:joda-time/joda-time/${jodatime-bundle-version}</bundle> + <bundle dependency='true'>mvn:javax.mail/mail/${javax-mail-version}</bundle> <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:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-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>
