Author: dkulp
Date: Mon Apr 21 09:13:04 2008
New Revision: 650184
URL: http://svn.apache.org/viewvc?rev=650184&view=rev
Log:
Merged revisions 649234 via svnmerge from
https://svn.apache.org/repos/asf/incubator/cxf/trunk
........
r649234 | dkulp | 2008-04-17 15:10:20 -0400 (Thu, 17 Apr 2008) | 2 lines
Fixup some exclusions to make sure we aren't shipping stuff we shouldn't
........
Modified:
incubator/cxf/branches/2.0.x-fixes/ (props changed)
incubator/cxf/branches/2.0.x-fixes/distribution/pom.xml
incubator/cxf/branches/2.0.x-fixes/parent/pom.xml
Propchange: incubator/cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: incubator/cxf/branches/2.0.x-fixes/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/distribution/pom.xml?rev=650184&r1=650183&r2=650184&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/distribution/pom.xml (original)
+++ incubator/cxf/branches/2.0.x-fixes/distribution/pom.xml Mon Apr 21 09:13:04
2008
@@ -230,6 +230,12 @@
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-bundle</artifactId>
<version>${pom.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>bouncycastle</groupId>
+ <artifactId>bcprov-jdk14</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
Modified: incubator/cxf/branches/2.0.x-fixes/parent/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/parent/pom.xml?rev=650184&r1=650183&r2=650184&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/parent/pom.xml (original)
+++ incubator/cxf/branches/2.0.x-fixes/parent/pom.xml Mon Apr 21 09:13:04 2008
@@ -781,6 +781,12 @@
<groupId>org.apache.xmlbeans</groupId>
<artifactId>xmlbeans</artifactId>
<version>${xmlbeans.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>xml-resolver</groupId>
