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/19 04:33:47 UTC
svn commit: r1172413 - in /camel/branches/camel-2.8.x: ./
platforms/karaf/features/pom.xml
platforms/karaf/features/src/main/resources/features.xml
Author: ffang
Date: Mon Sep 19 02:33:47 2011
New Revision: 1172413
URL: http://svn.apache.org/viewvc?rev=1172413&view=rev
Log:
Merged revisions 1166126 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1166126 | ffang | 2011-09-07 19:23:38 +0800 (δΈ‰, 07 9 2011) | 1 line
[CAMEL-4423]use geronimo-jaxws_2.2_spec 1.1 bundle
........
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/platforms/karaf/features/pom.xml
camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.8.x/platforms/karaf/features/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/platforms/karaf/features/pom.xml?rev=1172413&r1=1172412&r2=1172413&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/platforms/karaf/features/pom.xml (original)
+++ camel/branches/camel-2.8.x/platforms/karaf/features/pom.xml Mon Sep 19 02:33:47 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.1.0_1</smack-bundle-version>
Modified: camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml?rev=1172413&r1=1172412&r2=1172413&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml (original)
+++ camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml Mon Sep 19 02:33:47 2011
@@ -276,7 +276,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>
@@ -572,7 +572,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>