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/11/08 05:06:58 UTC
svn commit: r1199099 - in /camel/branches/camel-2.8.x: ./ parent/pom.xml
platforms/karaf/features/src/main/resources/features.xml
Author: ffang
Date: Tue Nov 8 04:06:57 2011
New Revision: 1199099
URL: http://svn.apache.org/viewvc?rev=1199099&view=rev
Log:
Merged revisions 1199098 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1199098 | ffang | 2011-11-08 11:59:15 +0800 (二, 08 11 2011) | 1 line
[CAMEL-4639]upgrade to servicemix specs 1.9.0
........
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/parent/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/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/parent/pom.xml?rev=1199099&r1=1199098&r2=1199099&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/parent/pom.xml (original)
+++ camel/branches/camel-2.8.x/parent/pom.xml Tue Nov 8 04:06:57 2011
@@ -135,7 +135,7 @@
<saxon-version>9.1.0.8</saxon-version>
<scala-version>2.9.1</scala-version>
<scala-plugin-version>2.15.1</scala-plugin-version>
- <servicemix-specs-version>1.8.0</servicemix-specs-version>
+ <servicemix-specs-version>1.9.0</servicemix-specs-version>
<shiro-bundle-version>1.1.0_1</shiro-bundle-version>
<slf4j-version>1.6.1</slf4j-version>
<smack-version>3.1.0</smack-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=1199099&r1=1199098&r2=1199099&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 Tue Nov 8 04:06:57 2011
@@ -269,7 +269,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.geronimo.specs/geronimo-jaxws_2.2_spec/${gernimo-jaxws22-spec-version}</bundle>
+ <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.2/${servicemix-specs-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>
@@ -564,7 +564,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.geronimo.specs/geronimo-jaxws_2.2_spec/${gernimo-jaxws22-spec-version}</bundle>
+ <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.2/${servicemix-specs-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>