cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1449827 - in /cxf/branches/2.7.x-fixes: distribution/src/main/release/lib/WHICH_JARS osgi/karaf/features/src/main/resources/features.xml parent/pom.xml
Date Mon, 25 Feb 2013 19:42:46 GMT
Author: dkulp
Date: Mon Feb 25 19:42:46 2013
New Revision: 1449827

URL: http://svn.apache.org/r1449827
Log:
Merged revisions 1448783 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1448783 | dkulp | 2013-02-21 14:47:42 -0500 (Thu, 21 Feb 2013) | 2 lines

  Don't need ws-metadata since we are java6+ only now

........

Modified:
    cxf/branches/2.7.x-fixes/distribution/src/main/release/lib/WHICH_JARS
    cxf/branches/2.7.x-fixes/osgi/karaf/features/src/main/resources/features.xml
    cxf/branches/2.7.x-fixes/parent/pom.xml

Modified: cxf/branches/2.7.x-fixes/distribution/src/main/release/lib/WHICH_JARS
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/distribution/src/main/release/lib/WHICH_JARS?rev=1449827&r1=1449826&r2=1449827&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/distribution/src/main/release/lib/WHICH_JARS (original)
+++ cxf/branches/2.7.x-fixes/distribution/src/main/release/lib/WHICH_JARS Mon Feb 25 19:42:46
2013
@@ -43,7 +43,6 @@ For Java2WSDL and WSDL2Java:
         JAXB code generation)
 
 For JAX-WS support:
-- geronimo-ws-metadata.jar [6]
 - geronimo-jaxws_2.2_spec-1.0.jar (Or the Sun equivalent) [6]
 - saaj-api.jar [6]
 - saaj-impl.jar [6]

Modified: cxf/branches/2.7.x-fixes/osgi/karaf/features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/osgi/karaf/features/src/main/resources/features.xml?rev=1449827&r1=1449826&r2=1449827&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/osgi/karaf/features/src/main/resources/features.xml (original)
+++ cxf/branches/2.7.x-fixes/osgi/karaf/features/src/main/resources/features.xml Mon Feb 25
19:42:46 2013
@@ -22,7 +22,6 @@
         <bundle start-level='9'>mvn:org.apache.geronimo.specs/geronimo-osgi-registry/1.1</bundle>
         <bundle start-level='10' dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${cxf.servicemix.specs.version}</bundle>
         <bundle start-level='10'>mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/${cxf.geronimo.annotation.version}</bundle>
-        <bundle start-level='10'>mvn:org.apache.geronimo.specs/geronimo-ws-metadata_2.0_spec/${cxf.geronimo.ws.metadata.version}</bundle>
         <bundle start-level='10' dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${cxf.servicemix.specs.version}</bundle>
         <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>

Modified: cxf/branches/2.7.x-fixes/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/parent/pom.xml?rev=1449827&r1=1449826&r2=1449827&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.7.x-fixes/parent/pom.xml Mon Feb 25 19:42:46 2013
@@ -110,7 +110,6 @@
         <cxf.geronimo.servlet.version>1.0</cxf.geronimo.servlet.version>
         <cxf.geronimo.servlet25.version>1.1.2</cxf.geronimo.servlet25.version>
         <cxf.geronimo.transaction.version>1.1.1</cxf.geronimo.transaction.version>
-        <cxf.geronimo.ws.metadata.version>1.1.3</cxf.geronimo.ws.metadata.version>
         <cxf.javax.ws.rs.version>2.0-m10</cxf.javax.ws.rs.version>
         <cxf.jaxb21.version>2.1</cxf.jaxb21.version>
         <cxf.jaxb21.impl.version>2.1.13</cxf.jaxb21.impl.version>
@@ -1270,11 +1269,6 @@
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
-                <version>${cxf.geronimo.ws.metadata.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-jaxws_2.2_spec</artifactId>
                 <version>${cxf.specs.jaxws.api.version}</version>
             </dependency>



Mime
View raw message