You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2007/10/08 20:20:44 UTC
svn commit: r582926 - in /incubator/cxf/branches/2.0.x-fixes: ./
parent/pom.xml tools/wsdlto/test/pom.xml
Author: dkulp
Date: Mon Oct 8 11:20:44 2007
New Revision: 582926
URL: http://svn.apache.org/viewvc?rev=582926&view=rev
Log:
Merged revisions 581717 via svnmerge from
https://svn.apache.org/repos/asf/incubator/cxf/trunk
........
r581717 | dkulp | 2007-10-03 16:27:06 -0400 (Wed, 03 Oct 2007) | 2 lines
Exclude some jars that aren't needed (were added in the recent version upgrades)
........
Modified:
incubator/cxf/branches/2.0.x-fixes/ (props changed)
incubator/cxf/branches/2.0.x-fixes/parent/pom.xml
incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/test/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/parent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/parent/pom.xml?rev=582926&r1=582925&r2=582926&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/parent/pom.xml (original)
+++ incubator/cxf/branches/2.0.x-fixes/parent/pom.xml Mon Oct 8 11:20:44 2007
@@ -402,8 +402,8 @@
<version>3.2.1</version>
</dependency>
<dependency>
- <groupId>jetty</groupId>
- <artifactId>org.mortbay.jetty</artifactId>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
<version>${jetty.version}</version>
<exclusions>
<exclusion>
@@ -442,6 +442,10 @@
<artifactId>jsr173</artifactId>
</exclusion>
<exclusion>
+ <groupId>javax.xml.stream</groupId>
+ <artifactId>stax-api</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
</exclusion>
@@ -617,6 +621,10 @@
<exclusion>
<groupId>javax.xml.bind</groupId>
<artifactId>jsr173_api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.jws</groupId>
+ <artifactId>jsr181-api</artifactId>
</exclusion>
</exclusions>
</dependency>
Modified: incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/test/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/test/pom.xml?rev=582926&r1=582925&r2=582926&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/test/pom.xml (original)
+++ incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/test/pom.xml Mon Oct 8 11:20:44 2007
@@ -70,10 +70,15 @@
</dependency>
<dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- <version>${jetty.version}</version>
- <scope>test</scope>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <version>${jetty.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
@@ -101,7 +106,8 @@
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/incubator/cxf/tags/cxf-2.0.2-incubator/tools/wsdlto/test</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/cxf/tags/cxf-2.0.2-incubator/tools/wsdlto/test</developerConnection>
- <url>scm:svn:https://svn.apache.org/repos/asf/incubator/cxf/tags/cxf-2.0.2-incubatorcxf-parent/cxf-tools-wsdlto-test</url>
+ <url>scm:svn:https://svn.apache.org/repos/asf/incubator/cxf/tags/cxf-2.0.2-incubatorcxf-parent/cxf-tools-wsdlto-test</url>
</scm>
+
</project>