Repository: camel Updated Branches: refs/heads/master d01138809 -> 757962c54
Upgrade camel-hdfs2 to a newer Hadoop version Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/757962c5 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/757962c5 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/757962c5 Branch: refs/heads/master Commit: 757962c54d62e34fc8c0418d1233a54295b39df5 Parents: d011388 Author: Claus Ibsen <davscl...@apache.org> Authored: Mon Oct 19 08:03:44 2015 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Mon Oct 19 08:03:44 2015 +0200 ---------------------------------------------------------------------- parent/pom.xml | 4 ++-- platforms/karaf/features/src/main/resources/features.xml | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/757962c5/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index effeabb..c523ada 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -202,8 +202,8 @@ <guice-bundle-version>3.0_1</guice-bundle-version> <hadoop-bundle-version>1.2.1_1</hadoop-bundle-version> <hadoop-version>1.2.1</hadoop-version> - <hadoop2-bundle-version>2.3.0_2</hadoop2-bundle-version> - <hadoop2-version>2.3.0</hadoop2-version> + <hadoop2-bundle-version>2.7.1_1</hadoop2-bundle-version> + <hadoop2-version>2.7.1</hadoop2-version> <hamcrest-version>1.3</hamcrest-version> <hapi-version>2.2</hapi-version> <hawtbuf-version>1.11</hawtbuf-version> http://git-wip-us.apache.org/repos/asf/camel/blob/757962c5/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 0906e13..39087b5 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -709,6 +709,8 @@ <bundle dependency='true'>mvn:io.netty/netty/${netty3-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.codehaus.jackson/jackson-jaxrs/${jackson-version}</bundle> + <bundle dependency='true'>mvn:org.codehaus.jackson/jackson-xc/${jackson-version}</bundle> <bundle dependency='true'>mvn:org.xerial.snappy/snappy-java/${snappy-version}</bundle> <bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle> <bundle dependency='true'>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
