Repository: camel Updated Branches: refs/heads/master 968df9939 -> bff0d4fdf
CAMEL-8990: camel-guice - Upgrade to v4 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f7765a86 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f7765a86 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f7765a86 Branch: refs/heads/master Commit: f7765a864d2a0970237c74766ad0280003140c94 Parents: 968df99 Author: Andrea Cosentino <[email protected]> Authored: Thu Jul 23 17:31:37 2015 +0200 Committer: Andrea Cosentino <[email protected]> Committed: Thu Jul 23 17:31:37 2015 +0200 ---------------------------------------------------------------------- parent/pom.xml | 3 +-- platforms/karaf/features/src/main/resources/features.xml | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/f7765a86/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 79dc33e..998577c 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -196,8 +196,7 @@ <grizzly-websockets-version>2.3.21</grizzly-websockets-version> <groovy-version>2.4.4</groovy-version> <gson-version>2.3.1</gson-version> - <guice-bundle-version>3.0_1</guice-bundle-version> - <guice-version>3.0</guice-version> + <guice-version>4.0</guice-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/f7765a86/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 b26d74e..2759183 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-bundle-version}</bundle> + <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.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-bundle-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.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>
