Author: ningjiang
Date: Mon Jul 20 12:11:43 2009
New Revision: 795790
URL: http://svn.apache.org/viewvc?rev=795790&view=rev
Log:
CAMEL-1840 fixed the camel-mail and camel-cxf features issue
Modified:
camel/trunk/platforms/karaf/features/pom.xml
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Modified: camel/trunk/platforms/karaf/features/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/pom.xml?rev=795790&r1=795789&r2=795790&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/pom.xml (original)
+++ camel/trunk/platforms/karaf/features/pom.xml Mon Jul 20 12:11:43 2009
@@ -52,9 +52,11 @@
<flatpack-bundle-version>3.1.1_1</flatpack-bundle-version>
<freemarker-bundle-version>2.3.15_1</freemarker-bundle-version>
<geronimo-el-version>1.0.1</geronimo-el-version>
- <geronimo-jaxws-spec-version>1.1.2</geronimo-jaxws-spec-version>
+ <geronimo-jaxws-spec-version>1.0</geronimo-jaxws-spec-version>
<geronimo-jsp-version>1.0.1</geronimo-jsp-version>
+ <geronimo-javamail-1.4-version>1.6_1</geronimo-javamail-1.4-version>
<geronimo-ws-metadata-spec-version>1.1.2</geronimo-ws-metadata-spec-version>
+ <gernimo-annotation-spec-version>1.1.1</gernimo-annotation-spec-version>
<hamcrest-bundle-version>1.2-dev1_1</hamcrest-bundle-version>
<ibatis-bundle-version>2.3.4.726_1</ibatis-bundle-version>
<jackrabbit-version>1.5.3</jackrabbit-version>
@@ -93,12 +95,13 @@
<xalan-bundle-version>2.7.1_1</xalan-bundle-version>
<xerces-bundle-version>2.9.1_1</xerces-bundle-version>
<xmlbeans-bundle-version>2.4.0_2</xmlbeans-bundle-version>
- <xmlschema-version>1.4.4</xmlschema-version>
+ <xmlschema-version>1.4.5</xmlschema-version>
<xmlsec-bundle-version>1.3.0_1</xmlsec-bundle-version>
<xmlresolver-bundle-version>1.2_1</xmlresolver-bundle-version>
<xpp3-bundle-version>1.1.4c_1</xpp3-bundle-version>
<xstream-bundle-version>1.3_1</xstream-bundle-version>
<werken-xpath-bundle-version>0.9.4_1</werken-xpath-bundle-version>
+ <woodstox-bundle-version>3.2.7_1</woodstox-bundle-version>
<wsdl4j-bundle-version>1.6.1_1</wsdl4j-bundle-version>
</properties>
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=795790&r1=795789&r2=795790&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 20 12:11:43 2009
@@ -36,12 +36,15 @@
<bundle>mvn:org.apache.geronimo.specs/geronimo-el_1.0_spec/${geronimo-el-version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-jsp_2.1_spec/${geronimo-jsp-version}</bundle>
<bundle>mvn:org.mortbay.jetty/jetty/${jetty-version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-codec/${commons-codec-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.junit/${junit-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jettison/${jettison-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlbeans/${xmlbeans-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlsec/${servicemix-specs-version}_1</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${xmlresolver-bundle-version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.woodstox/${woodstox-bundle-version}</bundle>
<bundle>mvn:org.apache.ws.commons.schema/XmlSchema/${xmlschema-version}</bundle>
<bundle>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
<bundle>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
@@ -55,6 +58,7 @@
<bundle>mvn:org.apache.neethi/neethi/${neethi-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.abdera/${abdera-bundle-version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-jaxws_2.1_spec/${geronimo-jaxws-spec-version}</bundle>
+
<bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/${gernimo-annotation-spec-version}</bundle>
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${servicemix-specs-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.wsdl4j/${wsdl4j-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr311-api-1.0/${jsr311-api-1.0-spec-version}</bundle>
@@ -303,30 +307,10 @@
<bundle>mvn:org.apache.camel/camel-ldap/${pom.version}</bundle>
</feature>
<feature name='camel-mail' version='${pom.version}'>
- <bundle>mvn:org.springframework/spring-tx/${spring-version}</bundle>
-
<bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}</bundle>
- <bundle>mvn:org.springframework/spring-jdbc/${spring-version}</bundle>
- <bundle>mvn:commons-pool/commons-pool/${commons-pool-version}</bundle>
-
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/${commons-dbcp-bundle-version}</bundle>
-
<bundle>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
-
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/${commons-beanutils-bundle-version}</bundle>
-
<bundle>mvn:org.mortbay.jetty/servlet-api/${servlet-api-2.5-version}}</bundle>
-
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.javamail-api-1.4/${servicemix-specs-version}</bundle>
-
<bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version}</bundle>
-
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.quartz/1.6.1_1</bundle>
-
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle>
-
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant-bundle-version}</bundle>
- <bundle>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
-
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/${antlr-bundle-version}</bundle>
-
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/${oro-bundle-version}</bundle>
-
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.werken-xpath/${werken-xpath-bundle-version}</bundle>
-
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.velocity/${velocity-bundle-version}</bundle>
-
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/${xpp3-bundle-version}</bundle>
-
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/${dom4j-bundle-version}</bundle>
-
<bundle>mvn:org.apache.geronimo.specs/geronimo-el_1.0_spec/${geronimo-el-version}</bundle>
-
<bundle>mvn:org.apache.geronimo.specs/geronimo-jsp_2.1_spec/${geronimo-jsp-version}</bundle>
-
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.freemarker/${freemarker-bundle-version}</bundle>
+ <bundle>mvn:org.springframework/spring-context/${spring-version}</bundle>
<bundle>mvn:org.springframework/spring-context-support/${spring-version}</bundle>
+
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.javamail-api-1.4/${servicemix-specs-version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.geronimo-javamail_1.4_provider/${geronimo-javamail-1.4-version}</bundle>
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-mail/${pom.version}</bundle>
</feature>
