Author: dkulp
Date: Mon Oct 23 14:25:48 2006
New Revision: 467131
URL: http://svn.apache.org/viewvc?view=rev&rev=467131
Log:
Bunch of pom updates
* Cleanup of dependencies to remove unneeded ones
* Remove extraneuous stuff from distribution
* Update to 2.0.3 jaxb impl
* Push more versions and exclusions into dependencyManagement section
Modified:
incubator/cxf/trunk/api/pom.xml
incubator/cxf/trunk/common/common/pom.xml
incubator/cxf/trunk/common/metacode/pom.xml
incubator/cxf/trunk/common/pom.xml
incubator/cxf/trunk/common/xsd/pom.xml
incubator/cxf/trunk/jca/pom.xml
incubator/cxf/trunk/pom.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
incubator/cxf/trunk/tools/xjc/dv-test/pom.xml
Modified: incubator/cxf/trunk/api/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/api/pom.xml?view=diff&rev=467131&r1=467130&r2=467131
==============================================================================
--- incubator/cxf/trunk/api/pom.xml (original)
+++ incubator/cxf/trunk/api/pom.xml Mon Oct 23 14:25:48 2006
@@ -68,6 +68,18 @@
<groupId>org.apache.ws.commons</groupId>
<artifactId>XmlSchema</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-xjc</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<build>
Modified: incubator/cxf/trunk/common/common/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/common/common/pom.xml?view=diff&rev=467131&r1=467130&r2=467131
==============================================================================
--- incubator/cxf/trunk/common/common/pom.xml (original)
+++ incubator/cxf/trunk/common/common/pom.xml Mon Oct 23 14:25:48 2006
@@ -17,7 +17,7 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-common-utilities</artifactId>
@@ -27,126 +27,103 @@
<url>http://cxf.apache.org/</url>
<parent>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-common</artifactId>
- <version>2.0-incubator-M1-SNAPSHOT</version>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-common</artifactId>
+ <version>2.0-incubator-M1-SNAPSHOT</version>
</parent>
<properties>
- <topDirectoryLocation>../../</topDirectoryLocation>
- <!--
- use the 2.0.1 version of jaxb.impl because that is the version
used by the codegenerator
- (maven xjc plugin) as opposed to codegen-plugin
- -->
- <jaxb.impl.version.test>2.0.1</jaxb.impl.version.test>
-
+ <topDirectoryLocation>../../</topDirectoryLocation>
</properties>
<dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymockclassextension</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
-
- <dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>jsr250-api</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.jws</groupId>
- <artifactId>jsr181-api</artifactId>
- </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>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>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-xjc</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.xml.ws</groupId>
- <artifactId>jaxws-api</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- <version>1.0.1</version>
- </dependency>
- <dependency>
- <groupId>wsdl4j</groupId>
- <artifactId>wsdl4j</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.ws.commons</groupId>
- <artifactId>XmlSchema</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>jaxme</groupId>
- <artifactId>jaxme2</artifactId>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymockclassextension</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.jws</groupId>
+ <artifactId>jsr181-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-xjc</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.xml.ws</groupId>
+ <artifactId>jaxws-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>wsdl4j</groupId>
+ <artifactId>wsdl4j</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.ws.commons</groupId>
+ <artifactId>XmlSchema</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>jaxme</groupId>
+ <artifactId>jaxme2</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
Modified: incubator/cxf/trunk/common/metacode/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/common/metacode/pom.xml?view=diff&rev=467131&r1=467130&r2=467131
==============================================================================
--- incubator/cxf/trunk/common/metacode/pom.xml (original)
+++ incubator/cxf/trunk/common/metacode/pom.xml Mon Oct 23 14:25:48 2006
@@ -18,8 +18,8 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-common-metacode</artifactId>
@@ -28,105 +28,99 @@
<version>2.0-incubator-M1-SNAPSHOT</version>
<parent>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-common</artifactId>
- <version>2.0-incubator-M1-SNAPSHOT</version>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-common</artifactId>
+ <version>2.0-incubator-M1-SNAPSHOT</version>
</parent>
<properties>
- <topDirectoryLocation>../../</topDirectoryLocation>
+ <topDirectoryLocation>../../</topDirectoryLocation>
</properties>
<dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-common-utilities</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-common-xsd</artifactId>
- <version>${project.version}</version>
- </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-common-utilities</artifactId>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
<build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>${javadoc.version}</version>
- <executions>
- <execution>
- <id>package</id>
- <phase>package</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <attach>true</attach>
- <quiet>true</quiet>
- <bottom>-</bottom>
- <header>CeltiXfire API</header>
- <footer>CeltiXfire API</footer>
-
<sourcepath>${basedir}/target/generated/src/main/java</sourcepath>
- <subpackages>org.apache.cxf</subpackages>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-common-xsd</artifactId>
- <version>${project.version}</version>
- <executions>
- <execution>
- <id>generate-sources</id>
- <phase>generate-sources</phase>
- <configuration>
-
<sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot>
- <xsdOptions>
- <xsdOption>
-
<xsd>${basedir}/src/main/resources/schemas/wsdl/http.xsd</xsd>
-
<bindingFile>${basedir}/src/main/resources/schemas/wsdl/wsdl.xjb</bindingFile>
- <dependencies>
-
<dependency>${basedir}/src/main/resources/schemas/wsdl/wsdl.xsd</dependency>
- </dependencies>
- </xsdOption>
- <xsdOption>
-
<xsd>${basedir}/src/main/resources/schemas/wsdl/ws-addr.xsd</xsd>
-
<packagename>org.apache.cxf.ws.addressing</packagename>
- </xsdOption>
- <xsdOption>
-
<xsd>${basedir}/src/main/resources/schemas/wsdl/ws-addr-wsdl.xsd</xsd>
-
<packagename>org.apache.cxf.ws.addressing.wsdl</packagename>
- </xsdOption>
- <xsdOption>
-
<xsd>${basedir}/src/main/resources/schemas/wsdl/addressing.xsd</xsd>
-
<bindingFile>${basedir}/src/main/resources/schemas/wsdl/addressing.xjb</bindingFile>
- </xsdOption>
- <xsdOption>
-
<xsd>${basedir}/src/main/resources/schemas/configuration/std-types.xsd</xsd>
- </xsdOption>
- <xsdOption>
-
<xsd>${basedir}/src/main/resources/schemas/configuration/security.xsd</xsd>
-
<bindingFile>${basedir}/src/main/resources/schemas/configuration/security.xjb</bindingFile>
- </xsdOption>
- </xsdOptions>
- </configuration>
- <goals>
- <goal>xsdtojava</goal>
- </goals>
- </execution>
- </executions>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>${javadoc.version}</version>
+ <executions>
+ <execution>
+ <id>package</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <attach>true</attach>
+ <quiet>true</quiet>
+ <bottom>-</bottom>
+ <header>CeltiXfire API</header>
+ <footer>CeltiXfire API</footer>
+
<sourcepath>${basedir}/target/generated/src/main/java</sourcepath>
+ <subpackages>org.apache.cxf</subpackages>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-common-xsd</artifactId>
+ <version>${project.version}</version>
+ <executions>
+ <execution>
+ <id>generate-sources</id>
+ <phase>generate-sources</phase>
+ <configuration>
+
<sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot>
+ <xsdOptions>
+ <xsdOption>
+
<xsd>${basedir}/src/main/resources/schemas/wsdl/http.xsd</xsd>
+
<bindingFile>${basedir}/src/main/resources/schemas/wsdl/wsdl.xjb</bindingFile>
+ <dependencies>
+
<dependency>${basedir}/src/main/resources/schemas/wsdl/wsdl.xsd</dependency>
+ </dependencies>
+ </xsdOption>
+ <xsdOption>
+
<xsd>${basedir}/src/main/resources/schemas/wsdl/ws-addr.xsd</xsd>
+
<packagename>org.apache.cxf.ws.addressing</packagename>
+ </xsdOption>
+ <xsdOption>
+
<xsd>${basedir}/src/main/resources/schemas/wsdl/ws-addr-wsdl.xsd</xsd>
+
<packagename>org.apache.cxf.ws.addressing.wsdl</packagename>
+ </xsdOption>
+ <xsdOption>
+
<xsd>${basedir}/src/main/resources/schemas/wsdl/addressing.xsd</xsd>
+
<bindingFile>${basedir}/src/main/resources/schemas/wsdl/addressing.xjb</bindingFile>
+ </xsdOption>
+ <xsdOption>
+
<xsd>${basedir}/src/main/resources/schemas/configuration/std-types.xsd</xsd>
+ </xsdOption>
+ <xsdOption>
+
<xsd>${basedir}/src/main/resources/schemas/configuration/security.xsd</xsd>
+
<bindingFile>${basedir}/src/main/resources/schemas/configuration/security.xjb</bindingFile>
+ </xsdOption>
+ </xsdOptions>
+ </configuration>
+ <goals>
+ <goal>xsdtojava</goal>
+ </goals>
+ </execution>
+ </executions>
<dependencies>
<dependency>
<groupId>org.apache.cxf</groupId>
@@ -144,7 +138,7 @@
<version>${project.version}</version>
</dependency>
</dependencies>
- </plugin>
- </plugins>
+ </plugin>
+ </plugins>
</build>
</project>
Modified: incubator/cxf/trunk/common/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/common/pom.xml?view=diff&rev=467131&r1=467130&r2=467131
==============================================================================
--- incubator/cxf/trunk/common/pom.xml (original)
+++ incubator/cxf/trunk/common/pom.xml Mon Oct 23 14:25:48 2006
@@ -17,7 +17,7 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-common</artifactId>
@@ -27,40 +27,20 @@
<url>http://cwiki.apache.org/confluence/display/CXF/CeltiXfire+space</url>
<parent>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf</artifactId>
- <version>2.0-incubator-M1-SNAPSHOT</version>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf</artifactId>
+ <version>2.0-incubator-M1-SNAPSHOT</version>
</parent>
<properties>
- <topDirectoryLocation>..</topDirectoryLocation>
+ <topDirectoryLocation>..</topDirectoryLocation>
</properties>
+
<modules>
- <module>common</module>
- <module>xsd</module>
- <!--module>metacode</module-->
+ <module>common</module>
+ <module>xsd</module>
+ <!--module>metacode</module-->
</modules>
- <dependencies>
- <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>stax</groupId>
- <artifactId>stax-api</artifactId>
- <version>1.0.1</version>
- </dependency>
- </dependencies>
</project>
Modified: incubator/cxf/trunk/common/xsd/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/common/xsd/pom.xml?view=diff&rev=467131&r1=467130&r2=467131
==============================================================================
--- incubator/cxf/trunk/common/xsd/pom.xml (original)
+++ incubator/cxf/trunk/common/xsd/pom.xml Mon Oct 23 14:25:48 2006
@@ -62,8 +62,14 @@
<artifactId>cxf-common-utilities</artifactId>
<version>${project.version}</version>
</dependency>
-
-
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-xjc</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ </dependency>
<dependency>
<groupId>ant</groupId>
Modified: incubator/cxf/trunk/jca/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/jca/pom.xml?view=diff&rev=467131&r1=467130&r2=467131
==============================================================================
--- incubator/cxf/trunk/jca/pom.xml (original)
+++ incubator/cxf/trunk/jca/pom.xml Mon Oct 23 14:25:48 2006
@@ -41,19 +41,16 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymockclassextension</artifactId>
- <version>2.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>asm</groupId>
<artifactId>asm</artifactId>
- <version>1.5.3</version>
<scope>test</scope>
</dependency>
Modified: incubator/cxf/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/pom.xml?view=diff&rev=467131&r1=467130&r2=467131
==============================================================================
--- incubator/cxf/trunk/pom.xml (original)
+++ incubator/cxf/trunk/pom.xml Mon Oct 23 14:25:48 2006
@@ -148,9 +148,9 @@
<jsr250.version>2.0-JAXWS-2.0-EA3</jsr250.version>
<jsr181.version>2.0-JAXWS-2.0-EA3</jsr181.version>
<jaxb.version>2.0</jaxb.version>
- <jaxb.impl.version>2.0.2</jaxb.impl.version>
+ <jaxb.impl.version>2.0.3</jaxb.impl.version>
<jaxws.version>2.0</jaxws.version>
- <jetty.version>5.1.9</jetty.version>
+ <jetty.version>5.1.11</jetty.version>
<saaj.version>1.3</saaj.version>
<spring.version>2.0</spring.version>
<wsdl4j.version>1.6.1</wsdl4j.version>
@@ -372,6 +372,10 @@
</dependency>
+
+
+
+
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
@@ -484,19 +488,16 @@
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>${spring.version}</version>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>${spring.version}</version>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>${spring.version}</version>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
@@ -506,6 +507,14 @@
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>logkit</groupId>
+ <artifactId>logkit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework</artifactId>
</exclusion>
</exclusions>
</dependency>
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=467131&r1=467130&r2=467131
==============================================================================
--- incubator/cxf/trunk/rt/bindings/soap/pom.xml (original)
+++ incubator/cxf/trunk/rt/bindings/soap/pom.xml Mon Oct 23 14:25:48 2006
@@ -75,27 +75,21 @@
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
- <scope>test</scope>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
- <scope>test</scope>
- </dependency>
+ <scope>test</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>org.apache.cxf</groupId>
- <artifactId>cxf-tools-common</artifactId>
- <version>${project.version}</version>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-tools-common</artifactId>
+ <version>${project.version}</version>
</dependency>
</dependencies>
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=467131&r1=467130&r2=467131
==============================================================================
--- incubator/cxf/trunk/rt/databinding/jaxb/pom.xml (original)
+++ incubator/cxf/trunk/rt/databinding/jaxb/pom.xml Mon Oct 23 14:25:48 2006
@@ -80,7 +80,7 @@
<groupId>javax.xml.ws</groupId>
<artifactId>jaxws-api</artifactId>
<scope>provided</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>com.sun.xml.messaging.saaj</groupId>
@@ -98,25 +98,21 @@
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>woodstox</groupId>
<artifactId>wstx-asl</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>
+
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ </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=467131&r1=467130&r2=467131
==============================================================================
--- incubator/cxf/trunk/rt/frontend/js/pom.xml (original)
+++ incubator/cxf/trunk/rt/frontend/js/pom.xml Mon Oct 23 14:25:48 2006
@@ -41,40 +41,27 @@
<groupId>rhino</groupId>
<artifactId>js</artifactId>
<version>1.6R2</version>
- <scope>provided</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>xmlbeans</groupId>
<artifactId>xbean</artifactId>
<version>2.1.0</version>
- <scope>provided</scope>
+ <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>
<dependency>
<groupId>junit</groupId>
Modified: incubator/cxf/trunk/tools/xjc/dv-test/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/xjc/dv-test/pom.xml?view=diff&rev=467131&r1=467130&r2=467131
==============================================================================
--- incubator/cxf/trunk/tools/xjc/dv-test/pom.xml (original)
+++ incubator/cxf/trunk/tools/xjc/dv-test/pom.xml Mon Oct 23 14:25:48 2006
@@ -34,11 +34,6 @@
<properties>
<topDirectoryLocation>../../..</topDirectoryLocation>
- <!--
- use the 2.0.1 version of jaxb.impl becaue that is the version used
by the codegenerator
- (maven xjc plugin) as opposed to codegen-plugin
- -->
- <jaxb.impl.version>2.0.1</jaxb.impl.version>
</properties>
<pluginRepositories>
