Author: jbonofre
Date: Mon Nov 29 13:02:50 2010
New Revision: 1040098
URL: http://svn.apache.org/viewvc?rev=1040098&view=rev
Log:
Use ServiceMix guiceyfruit bundle in the Camel features descriptor.
Modified:
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/camel-features.xml
servicemix/smx4/features/trunk/pom.xml
Modified:
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/camel-features.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/camel-features.xml?rev=1040098&r1=1040097&r2=1040098&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/camel-features.xml
(original)
+++
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/camel-features.xml
Mon Nov 29 13:02:50 2010
@@ -258,10 +258,9 @@
<bundle>mvn:org.apache.camel/camel-ftp/${camel.version}</bundle>
</feature>
<feature name="camel-guice" version="${camel.version}">
-
<bundle>mvn:http://guiceyfruit.googlecode.com/svn/repo/releases!org.guiceyfruit/guiceyfruit-core/${guiceyfruit.version}</bundle>
-
<bundle>mvn:http://guiceyfruit.googlecode.com/svn/repo/releases!org.guiceyfruit/guice-all/${guiceyfruit.version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/${geronimo-annotation.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance.bundle.version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.guiceyfruit/${guiceyfruit.bundle.version}</bundle>
<feature version="${camel.version}">camel-core</feature>
<bundle>mvn:org.apache.camel/camel-guice/${camel.version}</bundle>
</feature>
Modified: servicemix/smx4/features/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/pom.xml?rev=1040098&r1=1040097&r2=1040098&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/pom.xml (original)
+++ servicemix/smx4/features/trunk/pom.xml Mon Nov 29 13:02:50 2010
@@ -180,6 +180,7 @@
<freemarker.bundle.version>2.3.15_4</freemarker.bundle.version>
<hapi.bundle.version>0.5.1_4</hapi.bundle.version>
<groovy.bundle.version>1.5.6_4</groovy.bundle.version>
+ <guiceyfruit.bundle.version>2.0_1-SNAPSHOT</guiceyfruit.bundle.version>
<hibernate-validator.bundle.version>4.1.0.Final_1</hibernate-validator.bundle.version>
<ibatis-sqlmap.bundle.version>2.3.4.726_3</ibatis-sqlmap.bundle.version>
<irclib.bundle.version>1.10_3</irclib.bundle.version>
@@ -304,7 +305,6 @@
<derby.version>10.5.3.0_1</derby.version>
<drools.version>5.1.1</drools.version>
<easymock.version>2.4</easymock.version>
- <guiceyfruit.version>2.0</guiceyfruit.version>
<groovy.version>1.7.5</groovy.version>
<hawtbuf.version>1.2</hawtbuf.version>
<hawtdb.version>1.5</hawtdb.version>
