Author: ningjiang
Date: Wed Sep 16 09:18:18 2009
New Revision: 815682
URL: http://svn.apache.org/viewvc?rev=815682&view=rev
Log:
Revert the change of guiceyfruit version, also fixed the camel-guice features
file
Modified:
camel/branches/camel-1.x/parent/pom.xml
camel/branches/camel-1.x/platforms/karaf/features/src/main/resources/features.xml
Modified: camel/branches/camel-1.x/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/parent/pom.xml?rev=815682&r1=815681&r2=815682&view=diff
==============================================================================
--- camel/branches/camel-1.x/parent/pom.xml (original)
+++ camel/branches/camel-1.x/parent/pom.xml Wed Sep 16 09:18:18 2009
@@ -60,6 +60,7 @@
<jaxb-api-version>2.1</jaxb-api-version>
<stax-api-version>1.0.1</stax-api-version>
<log4j-version>1.2.14</log4j-version>
+ <cglib-version>2.2</cglib-version>
<commons-io-version>1.3.2</commons-io-version>
<commons-logging-version>1.1.1</commons-logging-version>
<commons-logging-api-version>1.1</commons-logging-api-version>
@@ -73,7 +74,8 @@
<hibernate-entitymanager-version>3.2.1.ga</hibernate-entitymanager-version>
<hsqldb-version>1.8.0.7</hsqldb-version>
<groovy-version>1.5.6</groovy-version>
- <guiceyfruit-version>2.0</guiceyfruit-version>
+ <guiceyfruit-version>2.0-beta-4</guiceyfruit-version>
+ <google-collection-version>snapshot-20080530</google-collection-version>
<junit-version>3.8.2</junit-version>
<ognl-version>2.7.3_1</ognl-version>
<saxon-version>9.1.0.1</saxon-version>
Modified:
camel/branches/camel-1.x/platforms/karaf/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/platforms/karaf/features/src/main/resources/features.xml?rev=815682&r1=815681&r2=815682&view=diff
==============================================================================
---
camel/branches/camel-1.x/platforms/karaf/features/src/main/resources/features.xml
(original)
+++
camel/branches/camel-1.x/platforms/karaf/features/src/main/resources/features.xml
Wed Sep 16 09:18:18 2009
@@ -150,7 +150,11 @@
<bundle>mvn:org.apache.camel/camel-ftp/${pom.version}</bundle>
</feature>
<feature name='camel-guice' version='${pom.version}'>
-
<bundle>mvn:org.guiceyfruit/guiceyfruit-core/${guiceyfruit-version}</bundle>
+
<bundle>wrap:mvn:org.guiceyfruit/guiceyfruit-core/${guiceyfruit-version}</bundle>
+
<bundle>wrap:mvn:org.guiceyfruit/guice-jsr250/${guiceyfruit-version}</bundle>
+ <bundle>wrap:mvn:org.guiceyfruit/guice-core/${guiceyfruit-version}</bundle>
+
<bundle>wrap:mvn:com.google.code.google-collections/google-collect/${google-collection-version}</bundle>
+ <bundle>wrap:mvn:cglib:cglib-nodep/${cglib-version}</bundle>
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-guice/${pom.version}</bundle>
</feature>
