[jbossws-commits] JBossWS SVN: r12570 - in stack/cxf/trunk: modules/client and 1 other directories.
Author: alessio.soldano(a)jboss.com
Date: 2010-07-05 06:22:27 -0400 (Mon, 05 Jul 2010)
New Revision: 12570
Modified:
stack/cxf/trunk/modules/client/pom.xml
stack/cxf/trunk/modules/server/pom.xml
stack/cxf/trunk/pom.xml
Log:
[JBWS-3006] Fixing some dependencies
Modified: stack/cxf/trunk/modules/client/pom.xml
===================================================================
--- stack/cxf/trunk/modules/client/pom.xml 2010-07-05 06:28:08 UTC (rev 12569)
+++ stack/cxf/trunk/modules/client/pom.xml 2010-07-05 10:22:27 UTC (rev 12570)
@@ -214,7 +214,7 @@
<artifactId>jboss-common-core</artifactId>
</dependency>
<dependency>
- <groupId>apache-log4j</groupId>
+ <groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
<dependency>
Modified: stack/cxf/trunk/modules/server/pom.xml
===================================================================
--- stack/cxf/trunk/modules/server/pom.xml 2010-07-05 06:28:08 UTC (rev 12569)
+++ stack/cxf/trunk/modules/server/pom.xml 2010-07-05 10:22:27 UTC (rev 12570)
@@ -211,9 +211,13 @@
<artifactId>jbosssx</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jbossxb</artifactId>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossxb</artifactId>
</dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </dependency>
<!-- transitve dependencies -->
<dependency>
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2010-07-05 06:28:08 UTC (rev 12569)
+++ stack/cxf/trunk/pom.xml 2010-07-05 10:22:27 UTC (rev 12570)
@@ -82,6 +82,7 @@
<mail.version>1.4.2</mail.version>
<saaj.api.version>1.0.0.Beta1</saaj.api.version>
<velocity.version>1.5</velocity.version>
+ <xerces.version>2.9.1</xerces.version>
<xmlsec.version>1.4.3</xmlsec.version>
<wstx.version>3.2.9</wstx.version>
<spring.version>3.0.1.RELEASE</spring.version>
@@ -352,6 +353,10 @@
<version>${cxf.version}</version>
<exclusions>
<exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
</exclusion>
@@ -1051,6 +1056,16 @@
<artifactId>jbossxb</artifactId>
<version>${jboss.xb.version}</version>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>apache-xerces</groupId> <!-- Deprecated dependency
-->
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>wutka-dtdparser</groupId> <!-- Deprecated dependency
-->
+ <artifactId>dtdparser121</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.security</groupId>
@@ -1080,10 +1095,16 @@
<version>${jboss.security.spi.version}</version>
<scope>provided</scope>
</dependency>
-
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>${xerces.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
<!-- transitive dependencies -->
<dependency>
- <groupId>apache-log4j</groupId>
+ <groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>${log4j.version}</version>
</dependency>