Author: blin
Date: Mon Oct 23 08:13:03 2006
New Revision: 467013
URL: http://svn.apache.org/viewvc?view=rev&rev=467013
Log:
remove dependency on jsr173_api.jar, and use stax-api-1.0.1 only
Modified:
incubator/cxf/trunk/common/common/pom.xml
incubator/cxf/trunk/common/pom.xml
incubator/cxf/trunk/distribution/pom.xml
incubator/cxf/trunk/distribution/src/main/assembly/bin.xml
incubator/cxf/trunk/rt/bindings/soap/pom.xml
incubator/cxf/trunk/rt/databinding/jaxb/pom.xml
incubator/cxf/trunk/rt/frontend/js/pom.xml
Modified: incubator/cxf/trunk/common/common/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/common/common/pom.xml?view=diff&rev=467013&r1=467012&r2=467013
==============================================================================
--- incubator/cxf/trunk/common/common/pom.xml (original)
+++ incubator/cxf/trunk/common/common/pom.xml Mon Oct 23 08:13:03 2006
@@ -90,11 +90,23 @@
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jsr173_api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jsr173_api</artifactId>
+ </exclusion>
+ </exclusions>
<scope>test</scope>
</dependency>
<dependency>
@@ -112,6 +124,7 @@
<dependency>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
+ <version>1.0.1</version>
</dependency>
<dependency>
<groupId>wsdl4j</groupId>
Modified: incubator/cxf/trunk/common/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/common/pom.xml?view=diff&rev=467013&r1=467012&r2=467013
==============================================================================
--- incubator/cxf/trunk/common/pom.xml (original)
+++ incubator/cxf/trunk/common/pom.xml Mon Oct 23 08:13:03 2006
@@ -49,12 +49,18 @@
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jsr173_api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jsr173_api</artifactId>
- <version>1.0</version>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>1.0.1</version>
</dependency>
</dependencies>
</project>
Modified: incubator/cxf/trunk/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/pom.xml?view=diff&rev=467013&r1=467012&r2=467013
==============================================================================
--- incubator/cxf/trunk/distribution/pom.xml (original)
+++ incubator/cxf/trunk/distribution/pom.xml Mon Oct 23 08:13:03 2006
@@ -246,6 +246,12 @@
<manifest>
<addClasspath>true</addClasspath>
</manifest>
+ <manifestEntries>
+ <specification-title>Apache
CXF</specification-title>
+ <specification-vendor>The Apache Software
Foundation</specification-vendor>
+
<specification-version>${pom.version}</specification-version>
+ <implementation-vendor>The Apache Software
Foundation</implementation-vendor>
+ </manifestEntries>
</archive>
</configuration>
</plugin>
Modified: incubator/cxf/trunk/distribution/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/assembly/bin.xml?view=diff&rev=467013&r1=467012&r2=467013
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/assembly/bin.xml (original)
+++ incubator/cxf/trunk/distribution/src/main/assembly/bin.xml Mon Oct 23
08:13:03 2006
@@ -94,6 +94,9 @@
<dependencySet>
<outputDirectory>cxf-${cxf.version}/lib</outputDirectory>
<unpack>false</unpack>
+ <excludes>
+ <exclude>org.apache.cxf:cxf-distribution</exclude>
+ </excludes>
<scope>runtime</scope>
</dependencySet>
</dependencySets>
Modified: incubator/cxf/trunk/rt/bindings/soap/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/soap/pom.xml?view=diff&rev=467013&r1=467012&r2=467013
==============================================================================
--- incubator/cxf/trunk/rt/bindings/soap/pom.xml (original)
+++ incubator/cxf/trunk/rt/bindings/soap/pom.xml Mon Oct 23 08:13:03 2006
@@ -85,6 +85,12 @@
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jsr173_api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
Modified: incubator/cxf/trunk/rt/databinding/jaxb/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/jaxb/pom.xml?view=diff&rev=467013&r1=467012&r2=467013
==============================================================================
--- incubator/cxf/trunk/rt/databinding/jaxb/pom.xml (original)
+++ incubator/cxf/trunk/rt/databinding/jaxb/pom.xml Mon Oct 23 08:13:03 2006
@@ -103,14 +103,20 @@
<artifactId>wstx-asl</artifactId>
</dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-xjc</artifactId>
- </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jsr173_api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-xjc</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: incubator/cxf/trunk/rt/frontend/js/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/js/pom.xml?view=diff&rev=467013&r1=467012&r2=467013
==============================================================================
--- incubator/cxf/trunk/rt/frontend/js/pom.xml (original)
+++ incubator/cxf/trunk/rt/frontend/js/pom.xml Mon Oct 23 08:13:03 2006
@@ -41,24 +41,39 @@
<groupId>rhino</groupId>
<artifactId>js</artifactId>
<version>1.6R2</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>xmlbeans</groupId>
<artifactId>xbean</artifactId>
<version>2.1.0</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jsr173_api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
+ <version>1.0.1</version>
</dependency>
<dependency>
<groupId>javax.xml.ws</groupId>
<artifactId>jaxws-api</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jsr173_api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
