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:43:15 UTC
[1/2] camel git commit: Lets allow using guice v4 outside OSGi
Repository: camel
Updated Branches:
refs/heads/camel-2.17.x dd9d722f8 -> aaa68989d
Lets allow using guice v4 outside OSGi
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/aaa68989
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/aaa68989
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/aaa68989
Branch: refs/heads/camel-2.17.x
Commit: aaa68989df73bb20777cdc2ef2950b2652db3718
Parents: 869906f
Author: Andrea Cosentino <an...@gmail.com>
Authored: Fri Apr 15 11:25:28 2016 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Fri Apr 15 11:40:25 2016 +0200
----------------------------------------------------------------------
components/camel-jclouds/pom.xml | 2 +-
parent/pom.xml | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/aaa68989/components/camel-jclouds/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-jclouds/pom.xml b/components/camel-jclouds/pom.xml
index 308e80a..2e0a6bf 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>
- <guice3-version>${guice-version}</guice3-version>
+ <guice-version>${guice3-version}</guice-version>
</properties>
<dependencies>
http://git-wip-us.apache.org/repos/asf/camel/blob/aaa68989/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 8b5034d..8d14985 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -213,7 +213,8 @@
<grizzly-websockets-version>2.3.24</grizzly-websockets-version>
<groovy-version>2.4.6</groovy-version>
<gson-version>2.6.2</gson-version>
- <guice-version>3.0</guice-version>
+ <guice-version>4.0</guice-version>
+ <guice3-version>3.0</guice3-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>
[2/2] camel git commit: Use Guice 3.0 to allow camel-guice working in
OSGi
Posted by ac...@apache.org.
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/869906f5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/869906f5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/869906f5
Branch: refs/heads/camel-2.17.x
Commit: 869906f5e2db34201819185c1a5dc601df7c1e92
Parents: dd9d722
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:40:25 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 | 2 +-
4 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/869906f5/components/camel-jclouds/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-jclouds/pom.xml b/components/camel-jclouds/pom.xml
index 2e0a6bf..308e80a 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/869906f5/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 71fb56b..8b5034d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -213,8 +213,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/869906f5/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 8bfcd1c..38208e1 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -586,7 +586,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/869906f5/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 002bac2..35876ed 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
@@ -37,4 +37,4 @@ public class CamelGuiceTest extends AbstractFeatureTest {
return configure(COMPONENT);
}
-}
\ No newline at end of file
+}