Author: ningjiang
Date: Mon Jul 11 08:31:16 2011
New Revision: 1145066
URL: http://svn.apache.org/viewvc?rev=1145066&view=rev
Log:
CAMEL-4186 make feature validate plugin happay about the change
Modified:
camel/trunk/platforms/karaf/features/src/main/resources/config.properties
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Modified:
camel/trunk/platforms/karaf/features/src/main/resources/config.properties
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/config.properties?rev=1145066&r1=1145065&r2=1145066&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/config.properties
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/config.properties
Mon Jul 11 08:31:16 2011
@@ -178,7 +178,7 @@ jre-1.6=, \
com.sun.org.apache.xerces.internal.xni, \
com.sun.jndi.ldap, \
javax.accessibility, \
-# javax.activation, \
+ javax.activation, \
javax.activity, \
# javax.annotation, \
# javax.annotation.processing, \
@@ -258,12 +258,12 @@ jre-1.6=, \
javax.tools, \
javax.transaction; javax.transaction.xa; partial=true; mandatory:=partial, \
javax.xml, \
-# javax.xml.bind, \
-# javax.xml.bind.annotation, \
-# javax.xml.bind.annotation.adapters, \
-# javax.xml.bind.attachment, \
-# javax.xml.bind.helpers, \
-# javax.xml.bind.util, \
+ javax.xml.bind, \
+ javax.xml.bind.annotation, \
+ javax.xml.bind.annotation.adapters, \
+ javax.xml.bind.attachment, \
+ javax.xml.bind.helpers, \
+ javax.xml.bind.util, \
javax.xml.crypto, \
javax.xml.crypto.dom, \
javax.xml.crypto.dsig, \
@@ -273,10 +273,10 @@ jre-1.6=, \
javax.xml.datatype, \
javax.xml.namespace, \
javax.xml.parsers, \
-# javax.xml.soap, \
-# javax.xml.stream, \
-# javax.xml.stream.events, \
-# javax.xml.stream.util, \
+ javax.xml.soap, \
+ javax.xml.stream, \
+ javax.xml.stream.events, \
+ javax.xml.stream.util, \
javax.xml.transform, \
javax.xml.transform.dom, \
javax.xml.transform.sax, \
Modified: camel/trunk/platforms/karaf/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features.xml?rev=1145066&r1=1145065&r2=1145066&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Mon
Jul 11 08:31:16 2011
@@ -50,6 +50,7 @@
</feature>
<feature name="cxf" version="${cxf-version}" resolver='(obr)'
start-level='50'>
+ <feature version="[3,4)">spring</feature>
<bundle
dependency="true">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version}</bundle>
<bundle
dependency="true">mvn:org.springframework/spring-jms/${spring-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.asm/${asm-bundle-version}</bundle>
