You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2016/04/15 11:15:08 UTC
camel git commit: Use Guice 3.0 to allow camel-guice working in OSGi
Repository: camel
Updated Branches:
refs/heads/master 75e543ed3 -> 08ddcb86c
Use Guice 3.0 to allow camel-guice working in OSGi
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/08ddcb86
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/08ddcb86
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/08ddcb86
Branch: refs/heads/master
Commit: 08ddcb86ce12244b0f5123fc6aeb900ec72b2c87
Parents: 75e543e
Author: Andrea Cosentino <an...@gmail.com>
Authored: Fri Apr 15 10:53:42 2016 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Fri Apr 15 11:14:46 2016 +0200
----------------------------------------------------------------------
components/camel-jclouds/pom.xml | 2 +-
parent/pom.xml | 3 +--
platforms/karaf/features/src/main/resources/features.xml | 2 +-
.../test/java/org/apache/camel/itest/karaf/CamelGuiceTest.java | 4 +---
4 files changed, 4 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/08ddcb86/components/camel-jclouds/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-jclouds/pom.xml b/components/camel-jclouds/pom.xml
index 84bbdff..5d0152d 100644
--- a/components/camel-jclouds/pom.xml
+++ b/components/camel-jclouds/pom.xml
@@ -41,7 +41,7 @@
<!-- jclouds requires guice 3 -->
<google-guava-version>${jclouds-google-guava-version}</google-guava-version>
- <guice-version>${guice3-version}</guice-version>
+ <guice3-version>${guice-version}</guice3-version>
</properties>
<dependencies>
http://git-wip-us.apache.org/repos/asf/camel/blob/08ddcb86/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index f5054a8..3648d87 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -210,8 +210,7 @@
<grizzly-websockets-version>2.3.24</grizzly-websockets-version>
<groovy-version>2.4.6</groovy-version>
<gson-version>2.6.2</gson-version>
- <guice3-version>3.0</guice3-version>
- <guice-version>4.0</guice-version>
+ <guice-version>3.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>
http://git-wip-us.apache.org/repos/asf/camel/blob/08ddcb86/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 040774d..f25c311 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -598,7 +598,7 @@
<feature name='camel-guice' version='${project.version}' resolver='(obr)' start-level='50'>
<details>camel-guice currently do not work in OSGi</details>
<feature version='${project.version}'>camel-core</feature>
- <bundle dependency='true'>mvn:com.google.inject/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.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>
http://git-wip-us.apache.org/repos/asf/camel/blob/08ddcb86/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGuiceTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGuiceTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGuiceTest.java
index efbf70b..b59cb17 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGuiceTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGuiceTest.java
@@ -17,13 +17,11 @@
package org.apache.camel.itest.karaf;
import org.apache.camel.test.karaf.AbstractFeatureTest;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
-@Ignore("camel-guice does not work in OSGi")
public class CamelGuiceTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelGuiceTest.class);
@@ -33,4 +31,4 @@ public class CamelGuiceTest extends AbstractFeatureTest {
installCamelFeature(COMPONENT);
}
-}
\ No newline at end of file
+}