Browse files

CAMEL-4209 Made the camel-guice feature to work

git-svn-id: https://svn.apache.org/repos/asf/camel/trunk@1429313 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
1 parent 75c8bbc commit dba7dccc10548a5a15d74b971b39996f68e6e76d @WillemJiang WillemJiang committed Jan 5, 2013
View
2 components/camel-guice/pom.xml
@@ -32,7 +32,7 @@
<properties>
<camel.osgi.export.pkg>org.apache.camel.guice.*</camel.osgi.export.pkg>
<camel.osgi.import.additional>
- com.google.inject*;version="[1.2,3)"
+ com.google.inject*;version="[1.2,4)"
</camel.osgi.import.additional>
</properties>
View
2 ...onents/camel-guice/src/main/java/org/apache/camel/guice/support/CloseFailedException.java
@@ -26,8 +26,6 @@
* Indicates that an attempt to close an injector or scope failed closing one or
* more bindings.
*
- * @author james.strachan@gmail.com (James Strachan)
- * @version
*/
public class CloseFailedException extends IOException {
private static final long serialVersionUID = 4794716198859801415L;
View
3 parent/pom.xml
@@ -142,7 +142,7 @@
<google-guava-version>13.0.1</google-guava-version>
<groovy-version>2.0.6</groovy-version>
<gson-version>2.2.2</gson-version>
- <guice-bundle-version>3.0_2</guice-bundle-version>
+ <guice-bundle-version>3.0_1-SNAPSHOT</guice-bundle-version>
<guice-version>3.0</guice-version>
<hadoop-bundle-version>1.0.4_1</hadoop-bundle-version>
<hadoop-version>1.0.4</hadoop-version>
@@ -178,6 +178,7 @@
<java-apns-version>0.1.6</java-apns-version>
<javacrumbs-version>0.22</javacrumbs-version>
<javassist-bundle-version>3.12.1.GA_3</javassist-bundle-version>
+ <javax-inject-bundle-version>1_2</javax-inject-bundle-version>
<javax-mail-version>1.4.5</javax-mail-version>
<jaxb-bundle-version>2.2.1.1_2</jaxb-bundle-version>
<jaxen-version>1.1.4</jaxen-version>
View
5 platforms/karaf/features/src/main/resources/features.xml
@@ -343,8 +343,9 @@
</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.geronimo.specs/geronimo-annotation_1.0_spec/${geronimo-annotation-spec-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>
<feature version='${project.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-guice/${project.version}</bundle>
</feature>
@@ -399,7 +400,7 @@
<bundle dependency='true'>mvn:org.codehaus.jackson/jackson-core-asl/${jackson-version}</bundle>
<bundle dependency='true'>mvn:org.codehaus.jackson/jackson-mapper-asl/${jackson-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty/${jetty6-bundle-version}</bundle>
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax-inject/1_2</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax-inject/${javax-inject-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.zookeeper/zookeeper/${zookeeper-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.hadoop-core/${hadoop-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.hbase/${hbase-bundle-version}</bundle>

0 comments on commit dba7dcc

Please sign in to comment.