cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject [2/5] git commit: DOn't need jaxws-api anymore
Date Fri, 25 Jul 2014 17:36:04 GMT
DOn't need jaxws-api anymore


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/92c4738f
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/92c4738f
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/92c4738f

Branch: refs/heads/master
Commit: 92c4738f9e6b96fe0ce8586bb36b9c6444d6e225
Parents: d3e9295
Author: Daniel Kulp <dkulp@apache.org>
Authored: Fri Jul 25 12:57:07 2014 -0400
Committer: Daniel Kulp <dkulp@apache.org>
Committed: Fri Jul 25 12:57:07 2014 -0400

----------------------------------------------------------------------
 distribution/manifest/pom.xml                  |  2 +-
 distribution/src/main/release/lib/WHICH_JARS   | 18 ++++++++----------
 parent/pom.xml                                 |  5 -----
 systests/container-integration/grizzly/pom.xml |  5 -----
 tools/wadlto/jaxrs/pom.xml                     |  4 ----
 5 files changed, 9 insertions(+), 25 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/92c4738f/distribution/manifest/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/manifest/pom.xml b/distribution/manifest/pom.xml
index 2f6043e..3e3085f 100644
--- a/distribution/manifest/pom.xml
+++ b/distribution/manifest/pom.xml
@@ -378,7 +378,7 @@
                             <!-- Add entries for the stuff that needs to be endorsed on
Java6, but not on java5 -->
                             <!-- Stick both versions of jaxb xjc/impl on classpath to
make it easier to flip back and forth -->
                             <Class-Path>
-                          cxf-${project.version}.jar endorsed/jaxb-api-${cxf.jaxb.version}.jar
endorsed/geronimo-jaxws_2.2_spec-${cxf.specs.jaxws.api.version}.jar jaxb-impl-${cxf.jaxb.impl.version}.jar
jaxb-core-${cxf.jaxb.core.version}.jar
+                          cxf-${project.version}.jar endorsed/jaxb-api-${cxf.jaxb.version}.jar
jaxb-impl-${cxf.jaxb.impl.version}.jar jaxb-core-${cxf.jaxb.core.version}.jar
                             </Class-Path>
                         </manifestEntries>
                     </archive>

http://git-wip-us.apache.org/repos/asf/cxf/blob/92c4738f/distribution/src/main/release/lib/WHICH_JARS
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/lib/WHICH_JARS b/distribution/src/main/release/lib/WHICH_JARS
index 09f308e..e079461 100755
--- a/distribution/src/main/release/lib/WHICH_JARS
+++ b/distribution/src/main/release/lib/WHICH_JARS
@@ -6,20 +6,19 @@ specific parts of CXF.
 The 'manifest jar' is a jar containing only a MANIFEST.MF with a classpath
 that calls in all the other jar.
 
-Jars marked with a [6] at the end are optional for Java 6 (update 4 or 
-later is supported) as the functionality provided by those jars are 
-provided in the JDK.
+Jars marked with a [7] at the end are optional for Java 7 as the 
+functionality provided by those jars are provided in the JDK.
 
 Some users may prefer to use axis2-saaj.jar rather than saaj-impl.jar. Both are
 supported.
 
 The following jars are required for all CXF usage:
 - cxf-core.jar
-- geronimo-javamail.jar (Or the Sun equivalent) [6]
+- geronimo-javamail.jar (Or the Sun equivalent) [7]
   (MAY be able to remove javamail if you don't use any MIME/MTOM/SAAJ type things)
-- jaxb-api.jar  [6]
-- jaxb-core.jar  [6]
-- jaxb-impl.jar (this is a [6] for normal runtime, but is required for 
+- jaxb-api.jar  [7]
+- jaxb-core.jar  [7]
+- jaxb-impl.jar (this is a [7] for normal runtime, but is required for 
                  tooling and the dynamic clients)
 - xmlschema-core.jar
 - woodstox-core-asl.jar
@@ -47,9 +46,8 @@ For Java2WSDL and WSDL2Java:
 For JAX-WS support:
 - neethi.jar
 - wsdl4j.jar
-- geronimo-jaxws_2.2_spec-1.0.jar (Or the Sun equivalent) [6]
-- saaj-api.jar [6]
-- saaj-impl.jar [6]
+- saaj-api.jar [7]
+- saaj-impl.jar [7]
 - asm.jar (semi-optional, helps with performance of wrapper types and is 
         required when adding JAXB annotations onto the SEI methods and 
 	parameters.)

http://git-wip-us.apache.org/repos/asf/cxf/blob/92c4738f/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 101ab96..6a55059 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1406,11 +1406,6 @@
                 <version>1.0.1</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-jaxws_2.2_spec</artifactId>
-                <version>${cxf.specs.jaxws.api.version}</version>
-            </dependency>
-            <dependency>
                 <groupId>org.apache.activemq</groupId>
                 <artifactId>activemq-broker</artifactId>
                 <version>${cxf.activemq.version}</version>

http://git-wip-us.apache.org/repos/asf/cxf/blob/92c4738f/systests/container-integration/grizzly/pom.xml
----------------------------------------------------------------------
diff --git a/systests/container-integration/grizzly/pom.xml b/systests/container-integration/grizzly/pom.xml
index 7fc2588..df9f1e3 100644
--- a/systests/container-integration/grizzly/pom.xml
+++ b/systests/container-integration/grizzly/pom.xml
@@ -55,11 +55,6 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jaxws_2.2_spec</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
             <groupId>com.sun.grizzly</groupId>
             <artifactId>grizzly-http</artifactId>
             <version>1.9.18</version>

http://git-wip-us.apache.org/repos/asf/cxf/blob/92c4738f/tools/wadlto/jaxrs/pom.xml
----------------------------------------------------------------------
diff --git a/tools/wadlto/jaxrs/pom.xml b/tools/wadlto/jaxrs/pom.xml
index 11434ac..3e09541 100644
--- a/tools/wadlto/jaxrs/pom.xml
+++ b/tools/wadlto/jaxrs/pom.xml
@@ -56,10 +56,6 @@
             <artifactId>xml-resolver</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jaxws_2.2_spec</artifactId>
-        </dependency>
-        <dependency>
             <groupId>org.jvnet.jaxb2_commons</groupId>
             <artifactId>jaxb2-basics</artifactId>
             <version>0.6.4</version>


Mime
View raw message