camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r921681 - in /camel/branches/camel-1.x/platforms/karaf/features: pom.xml src/main/resources/features.xml
Date Thu, 11 Mar 2010 03:08:30 GMT
Author: ningjiang
Date: Thu Mar 11 03:08:29 2010
New Revision: 921681

URL: http://svn.apache.org/viewvc?rev=921681&view=rev
Log:
CAMEL-2528 should use servicemix jaxws 2.1 spec bundle but not the geronimo one, merged the
patch back to camel 1.x branch

Modified:
    camel/branches/camel-1.x/platforms/karaf/features/pom.xml
    camel/branches/camel-1.x/platforms/karaf/features/src/main/resources/features.xml

Modified: camel/branches/camel-1.x/platforms/karaf/features/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/platforms/karaf/features/pom.xml?rev=921681&r1=921680&r2=921681&view=diff
==============================================================================
--- camel/branches/camel-1.x/platforms/karaf/features/pom.xml (original)
+++ camel/branches/camel-1.x/platforms/karaf/features/pom.xml Thu Mar 11 03:08:29 2010
@@ -54,7 +54,6 @@
       <freemarker-bundle-version>2.3.15_3</freemarker-bundle-version>
       <flatpack-bundle-version>3.1.1_3</flatpack-bundle-version>
       <geronimo-el-version>1.0.1</geronimo-el-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>
@@ -91,6 +90,7 @@
       <qpid-bundle-version>0.5.0_2</qpid-bundle-version>
       <saxon-bundle-version>9.1.0.1_3</saxon-bundle-version>
       <servicemix-specs-version>1.3.0</servicemix-specs-version>
+      <jaxws.api.version>2.1</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.0.4_2</smack-bundle-version>      

Modified: camel/branches/camel-1.x/platforms/karaf/features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/platforms/karaf/features/src/main/resources/features.xml?rev=921681&r1=921680&r2=921681&view=diff
==============================================================================
--- camel/branches/camel-1.x/platforms/karaf/features/src/main/resources/features.xml (original)
+++ camel/branches/camel-1.x/platforms/karaf/features/src/main/resources/features.xml Thu
Mar 11 03:08:29 2010
@@ -56,7 +56,7 @@
     <bundle>mvn:javax.mail/mail/${javax-mail-version}</bundle>
     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.neethi/${neethi-bundle-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.servicemix.specs/org.apache.servicemix.specs.jaxws-api-${jaxws.api.version}/${servicemix-specs-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>



Mime
View raw message