You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2013/07/15 18:01:02 UTC

svn commit: r1503314 - in /cxf/trunk: osgi/karaf/features/src/main/resources/features.xml parent/pom.xml

Author: sergeyb
Date: Mon Jul 15 16:01:02 2013
New Revision: 1503314

URL: http://svn.apache.org/r1503314
Log:
Update ServiceMix specs version to 2.3.0-SNAPSHOT, and features.xml to reference JAX-RS 2.0 API, as well as new WADL module

Modified:
    cxf/trunk/osgi/karaf/features/src/main/resources/features.xml
    cxf/trunk/parent/pom.xml

Modified: cxf/trunk/osgi/karaf/features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/osgi/karaf/features/src/main/resources/features.xml?rev=1503314&r1=1503313&r2=1503314&view=diff
==============================================================================
--- cxf/trunk/osgi/karaf/features/src/main/resources/features.xml (original)
+++ cxf/trunk/osgi/karaf/features/src/main/resources/features.xml Mon Jul 15 16:01:02 2013
@@ -26,7 +26,7 @@
         <bundle start-level='10' dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.2/${cxf.servicemix.specs.version}</bundle>
         <bundle start-level='10' dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.2/${cxf.servicemix.specs.version}</bundle>
         <bundle start-level='10' dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${cxf.servicemix.specs.version}</bundle>
-        <bundle start-level='10'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr339-api-rc3/${cxf.servicemix.specs.version.jaxrs}</bundle>
+        <bundle start-level='10'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr339-api-2.0/${cxf.servicemix.specs.version.jaxrs}</bundle>
         <bundle start-level='10' dependency="true">mvn:javax.mail/mail/${cxf.javax.mail.version}</bundle>
 
         <bundle start-level='20'>mvn:org.codehaus.woodstox/stax2-api/${cxf.woodstox.stax2-api.version}</bundle>
@@ -182,6 +182,7 @@
 
         <bundle start-level='40'>mvn:org.apache.cxf/cxf-rt-rs-extension-providers/${project.version}</bundle>
         <bundle start-level='40'>mvn:org.apache.cxf/cxf-rt-rs-extension-search/${project.version}</bundle>
+        <bundle start-level='40'>mvn:org.apache.cxf/cxf-rt-rs-service-description/${project.version}</bundle>
         <bundle start-level='40'>mvn:org.apache.cxf/cxf-rt-frontend-jaxrs/${project.version}</bundle>
         <bundle start-level='40'>mvn:org.apache.cxf/cxf-rt-rs-client/${project.version}</bundle>
     </feature>

Modified: cxf/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/parent/pom.xml?rev=1503314&r1=1503313&r2=1503314&view=diff
==============================================================================
--- cxf/trunk/parent/pom.xml (original)
+++ cxf/trunk/parent/pom.xml Mon Jul 15 16:01:02 2013
@@ -175,8 +175,7 @@
         <cxf.felix.framework.version>2.0.5</cxf.felix.framework.version>
         <cxf.felix.configadmin.version>1.2.4</cxf.felix.configadmin.version>
         <cxf.xmlbeans.bundle.version>2.6.0_2</cxf.xmlbeans.bundle.version>
-        <cxf.servicemix.specs.version>2.2.0</cxf.servicemix.specs.version>
-        <cxf.servicemix.specs.version.jaxrs>2.3-SNAPSHOT</cxf.servicemix.specs.version.jaxrs>
+        <cxf.servicemix.specs.version>2.3.0-SNAPSHOT</cxf.servicemix.specs.version>
         <cxf.javax.mail.version>1.4.4</cxf.javax.mail.version>
         <cxf.jaxb.bundle.version>2.2.1.1_2</cxf.jaxb.bundle.version>
         <cxf.saaj-impl.bundle.version>1.3.20_1</cxf.saaj-impl.bundle.version>