cxf-commits mailing list archives

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


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

Branch: refs/heads/master
Commit: 51f433d54a1d11eac25c32b0dd69f12fef62c060
Parents: 90312bc
Author: Daniel Kulp <dkulp@apache.org>
Authored: Fri Jul 25 13:12:54 2014 -0400
Committer: Daniel Kulp <dkulp@apache.org>
Committed: Fri Jul 25 13:12:54 2014 -0400

----------------------------------------------------------------------
 distribution/manifest/pom.xml |  2 +-
 parent/pom.xml                | 23 -----------------------
 2 files changed, 1 insertion(+), 24 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/51f433d5/distribution/manifest/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/manifest/pom.xml b/distribution/manifest/pom.xml
index 3e3085f..065f6a1 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
jaxb-impl-${cxf.jaxb.impl.version}.jar jaxb-core-${cxf.jaxb.core.version}.jar
+                          cxf-${project.version}.jar {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/51f433d5/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index cddf6e2..99c4678 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -926,29 +926,6 @@
                 </exclusions>
             </dependency>
             <dependency>
-                <groupId>javax.xml.bind</groupId>
-                <artifactId>jaxb-api</artifactId>
-                <version>${cxf.jaxb.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>javax.xml.bind</groupId>
-                        <artifactId>jsr173_api</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>javax.xml</groupId>
-                        <artifactId>jsr173</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>javax.xml.stream</groupId>
-                        <artifactId>stax-api</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>javax.activation</groupId>
-                        <artifactId>activation</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-            <dependency>
                 <groupId>${cxf.saaj.impl.groupId}</groupId>
                 <artifactId>${cxf.saaj.impl.artifactId}</artifactId>
                 <version>${cxf.saaj.impl.version}</version>


Mime
View raw message