Author: dkulp
Date: Tue Sep 20 21:31:54 2011
New Revision: 1173388
URL: http://svn.apache.org/viewvc?rev=1173388&view=rev
Log:
Merged revisions 1173382 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1173382 | dkulp | 2011-09-20 17:19:57 -0400 (Tue, 20 Sep 2011) | 1 line
Add exclusions for neethi to make sure we pull in the versions we need.
........
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/api/pom.xml
cxf/branches/2.4.x-fixes/parent/pom.xml
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.4.x-fixes/api/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/api/pom.xml?rev=1173388&r1=1173387&r2=1173388&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/api/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/api/pom.xml Tue Sep 20 21:31:54 2011
@@ -80,6 +80,10 @@
<artifactId>commons-lang</artifactId>
<optional>true</optional>
</dependency>
+ <dependency>
+ <groupId>wsdl4j</groupId>
+ <artifactId>wsdl4j</artifactId>
+ </dependency>
</dependencies>
<build>
Modified: cxf/branches/2.4.x-fixes/parent/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/parent/pom.xml?rev=1173388&r1=1173387&r2=1173388&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/parent/pom.xml Tue Sep 20 21:31:54 2011
@@ -581,13 +581,17 @@
<artifactId>wstx-asl</artifactId>
</exclusion>
<exclusion>
- <groupId>org.codehaus.woodstox</groupId>
+ <groupId>woodstox</groupId>
<artifactId>wstx-asl</artifactId>
</exclusion>
-
-
-
-
+ <exclusion>
+ <groupId>wsdl4j</groupId>
+ <artifactId>wsdl4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>woodstox-core-asl</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
