You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ff...@apache.org on 2011/09/07 13:23:38 UTC
svn commit: r1166126 - in /camel/trunk/platforms/karaf/features: pom.xml
src/main/resources/features.xml
Author: ffang
Date: Wed Sep 7 11:23:38 2011
New Revision: 1166126
URL: http://svn.apache.org/viewvc?rev=1166126&view=rev
Log:
[CAMEL-4423]use geronimo-jaxws_2.2_spec 1.1 bundle
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=1166126&r1=1166125&r2=1166126&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/pom.xml (original)
+++ camel/trunk/platforms/karaf/features/pom.xml Wed Sep 7 11:23:38 2011
@@ -70,6 +70,7 @@
<geronimo-jsp-version>1.0.1</geronimo-jsp-version>
<geronimo-ws-metadata-spec-version>1.1.3</geronimo-ws-metadata-spec-version>
<gernimo-annotation-spec-version>1.1.1</gernimo-annotation-spec-version>
+ <gernimo-jaxws22-spec-version>1.1</gernimo-jaxws22-spec-version>
<guice-bundle-version>2.0_1</guice-bundle-version>
<hadoop-bundle-version>0.20.203.0_1</hadoop-bundle-version>
<hamcrest-bundle-version>1.2-dev1_1</hamcrest-bundle-version>
@@ -119,7 +120,6 @@
<rome-bundle-version>1.0_1</rome-bundle-version>
<saxon-bundle-version>9.1.0.8_1</saxon-bundle-version>
<scala-bundle-version>2.9.0_1</scala-bundle-version>
- <jaxws.api.version>2.2</jaxws.api.version>
<servlet-api-2.5-version>1.1.2</servlet-api-2.5-version>
<serp-bundle-version>1.13.1_2</serp-bundle-version>
<smack-bundle-version>3.2.0_1</smack-bundle-version>
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=1166126&r1=1166125&r2=1166126&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml (original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Wed Sep 7 11:23:38 2011
@@ -272,7 +272,7 @@
<feature name='camel-hdfs' version='${pom.version}' resolver='(obr)' start-level='50'>
<feature version='${pom.version}'>camel-core</feature>
<feature>war</feature>
- <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-${jaxws.api.version}/${servicemix-specs-version}</bundle>
+ <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jaxws_2.2_spec/${gernimo-jaxws22-spec-version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${servicemix-specs-version}</bundle>
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}</bundle>
<bundle dependency="true">mvn:javax.mail/mail/${javax-mail-version}</bundle>
@@ -563,7 +563,7 @@
<feature name='camel-soap' version='${pom.version}' resolver='(obr)' start-level='50'>
<feature version='${pom.version}'>camel-jaxb</feature>
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-ws-metadata_2.0_spec/${geronimo-ws-metadata-spec-version}</bundle>
- <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-${jaxws.api.version}/${servicemix-specs-version}</bundle>
+ <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jaxws_2.2_spec/${gernimo-jaxws22-spec-version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${servicemix-specs-version}</bundle>
<bundle>mvn:org.apache.camel/camel-soap/${pom.version}</bundle>
</feature>