CAMEL-7683: The SMX bundle is flawed have to use old commons-io and jax-rs which was really not needed
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0046232a Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0046232a Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0046232a Branch: refs/heads/master Commit: 0046232ae8315e23bd0d4e40f2336c43160248d6 Parents: 51564d6 Author: Claus Ibsen <davscl...@apache.org> Authored: Tue Jul 28 10:03:36 2015 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Tue Jul 28 10:03:36 2015 +0200 ---------------------------------------------------------------------- parent/pom.xml | 4 ++-- platforms/karaf/features/src/main/resources/features.xml | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/0046232a/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index aaf39eb..66a4fc8 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -208,8 +208,8 @@ <hawtdb-version>1.6</hawtdb-version> <hawtdispatch-version>1.21</hawtdispatch-version> <hazelcast-version>3.5</hazelcast-version> - <hbase-version>0.98.1-hadoop2</hbase-version> - <hbase-bundle-version>0.98.1-hadoop2</hbase-bundle-version> + <hbase-version>0.98.5-hadoop2</hbase-version> + <hbase-bundle-version>0.98.5-hadoop2_2</hbase-bundle-version> <hibernate-validator-version>5.2.0.Final</hibernate-validator-version> <!-- Spring 3.2.x and 4.0.x still stick to JPA 2.0. Hibernate 4.3.x upgraded to JPA 2.1. --> <hibernate-version>4.2.16.Final</hibernate-version> http://git-wip-us.apache.org/repos/asf/camel/blob/0046232a/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 21708a1..ea4d0c2 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -593,9 +593,12 @@ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient-bundle-version}</bundle> <bundle dependency='true'>mvn:org.apache.commons/commons-math/${commons-math-version}</bundle> <bundle dependency='true'>mvn:commons-net/commons-net/${commons-net-version}</bundle> + <!-- need to use old version of commons-io due SMX bundle bug --> + <bundle dependency='true'>mvn:commons-io/commons-io/1.4</bundle> <bundle dependency='true'>mvn:com.google.protobuf/protobuf-java/${protobuf-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.apache.servicemix.specs/org.apache.servicemix.specs.scripting-api-1.0/${servicemix-specs-version}</bundle> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty/${jetty6-bundle-version}</bundle> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax-inject/${javax-inject-bundle-version}</bundle>
