CAMEL-8990: camel-guice - Upgrade to v4, guice 4.0 is already a bundle.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bff0d4fd Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bff0d4fd Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bff0d4fd Branch: refs/heads/master Commit: bff0d4fdf5f83d8be6a8c40b9803d3afcdc06769 Parents: f7765a8 Author: Andrea Cosentino <anco...@gmail.com> Authored: Thu Jul 23 17:46:55 2015 +0200 Committer: Andrea Cosentino <anco...@gmail.com> Committed: Thu Jul 23 17:46:55 2015 +0200 ---------------------------------------------------------------------- parent/pom.xml | 1 + platforms/karaf/features/src/main/resources/features.xml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/bff0d4fd/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 998577c..4c1c06d0 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -197,6 +197,7 @@ <groovy-version>2.4.4</groovy-version> <gson-version>2.3.1</gson-version> <guice-version>4.0</guice-version> + <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> http://git-wip-us.apache.org/repos/asf/camel/blob/bff0d4fd/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 2759183..21708a1 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -541,7 +541,7 @@ <bundle>mvn:org.apache.camel/camel-guava-eventbus/${project.version}</bundle> </feature> <feature name='camel-guice' version='${project.version}' resolver='(obr)' start-level='50'> - <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.guice/${guice-version}</bundle> + <bundle dependency='true'>mvn:com.google.inject/guice/${guice-version}</bundle> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax-inject/${javax-inject-bundle-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance-bundle-version}</bundle> <bundle dependency='true'>mvn:com.google.guava/guava/${google-guava-version}</bundle> @@ -670,7 +670,7 @@ <bundle dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle> <bundle dependency='true'>mvn:com.google.guava/guava/${google-guava-version}</bundle> <bundle dependency='true'>mvn:com.google.protobuf/protobuf-java/${protobuf-version}</bundle> - <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.guice/${guice-version}</bundle> + <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.guice/${guice-bundle-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsch/${jsch-bundle-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>
