CAMEL-7755 Fixed bunch of karaf feature issue
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/72dd7a08 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/72dd7a08 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/72dd7a08 Branch: refs/heads/master Commit: 72dd7a0857ebf1894b419ac1d81443ca69be5bae Parents: 621aaa4 Author: Willem Jiang <willem.ji...@gmail.com> Authored: Fri Aug 29 15:49:16 2014 +0800 Committer: Willem Jiang <willem.ji...@gmail.com> Committed: Fri Aug 29 17:20:01 2014 +0800 ---------------------------------------------------------------------- parent/pom.xml | 5 +++-- platforms/karaf/features/src/main/resources/features.xml | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/72dd7a08/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 5d49a26..a2eec91 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -61,6 +61,7 @@ <avalon-version>4.3.1</avalon-version> <avro-version>1.7.6</avro-version> <avro-bundle-version>1.7.6_2</avro-bundle-version> + <avro-ipc-bundle-version>1.7.6_1</avro-ipc-bundle-version> <aws-java-sdk-bundle-version>1.8.3_1</aws-java-sdk-bundle-version> <aws-java-sdk-version>1.8.3</aws-java-sdk-version> <axiom-version>1.2.14</axiom-version> @@ -105,7 +106,7 @@ <commons-lang-version-xmljson>2.5</commons-lang-version-xmljson> <commons-lang3-version>3.1</commons-lang3-version> <commons-logging-version>1.1.3</commons-logging-version> - <commons-math-version>2.2</commons-math-version> + <commons-math-version>3.2</commons-math-version> <commons-net-version>3.3</commons-net-version> <commons-pool-version>1.6</commons-pool-version> <commons-vfs2-version>2.0</commons-vfs2-version> @@ -389,7 +390,7 @@ <spring-batch-version>2.2.5.RELEASE</spring-batch-version> <spring-castor-bundle-version>1.2.0</spring-castor-bundle-version> <spring-data-commons-version>1.5.0.RELEASE</spring-data-commons-version> - <spring-data-redis-version>1.3.0.RELEASE</spring-data-redis-version> + <spring-data-redis-version>1.3.4.RELEASE</spring-data-redis-version> <spring-integration-version>2.2.6.RELEASE</spring-integration-version> <spring-javaconfig-version>1.0.0-20090215</spring-javaconfig-version> <spring-ldap-version>1.3.1.RELEASE</spring-ldap-version> http://git-wip-us.apache.org/repos/asf/camel/blob/72dd7a08/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 1eb1d03..acc6ad3 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -104,7 +104,7 @@ <bundle dependency='true'>mvn:io.netty/netty/${netty3-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.paranamer/${paranamer-bundle-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.avro/${avro-bundle-version}</bundle> - <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.avro-ipc/${avro-bundle-version}</bundle> + <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.avro-ipc/${avro-ipc-bundle-version}</bundle> <bundle dependency='true'>mvn:org.apache.commons/commons-compress/${commons-compress-version}</bundle> <bundle dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty/${jetty6-bundle-version}</bundle> @@ -483,7 +483,7 @@ <bundle dependency='true'>mvn:org.codehaus.jettison/jettison/${jettison-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.paranamer/${paranamer-bundle-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.avro/${avro-bundle-version}</bundle> - <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.avro-ipc/${avro-bundle-version}</bundle> + <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.avro-ipc/${avro-ipc-bundle-version}</bundle> <bundle dependency='true'>mvn:javax.jmdns/jmdns/3.4.1</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.libthrift/0.9.0_1</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/2.0.8_6</bundle>
