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 2010/03/12 18:41:16 UTC
svn commit: r922364 - in /cxf/branches/2.2.x-fixes: ./ parent/pom.xml
rt/ws/rm/pom.xml systests/jaxws/pom.xml tools/common/pom.xml
Author: dkulp
Date: Fri Mar 12 17:41:15 2010
New Revision: 922364
URL: http://svn.apache.org/viewvc?rev=922364&view=rev
Log:
Merged revisions 922360 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r922360 | dkulp | 2010-03-12 12:32:54 -0500 (Fri, 12 Mar 2010) | 1 line
update poms to work with maven 3 and mvnsh
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/parent/pom.xml
cxf/branches/2.2.x-fixes/rt/ws/rm/pom.xml
cxf/branches/2.2.x-fixes/systests/jaxws/pom.xml
cxf/branches/2.2.x-fixes/tools/common/pom.xml
Propchange: cxf/branches/2.2.x-fixes/
('svn:mergeinfo' removed)
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.2.x-fixes/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/parent/pom.xml?rev=922364&r1=922363&r2=922364&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/parent/pom.xml Fri Mar 12 17:41:15 2010
@@ -724,6 +724,12 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>${spring.mock}</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
<version>3.1</version>
Modified: cxf/branches/2.2.x-fixes/rt/ws/rm/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/ws/rm/pom.xml?rev=922364&r1=922363&r2=922364&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/ws/rm/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/rt/ws/rm/pom.xml Fri Mar 12 17:41:15 2010
@@ -84,7 +84,11 @@
<version>${derby.version}</version>
<scope>test</scope>
</dependency>
-
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
Modified: cxf/branches/2.2.x-fixes/systests/jaxws/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/jaxws/pom.xml?rev=922364&r1=922363&r2=922364&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/systests/jaxws/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/systests/jaxws/pom.xml Fri Mar 12 17:41:15 2010
@@ -175,8 +175,22 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
<artifactId>${spring.mock}</artifactId>
- <version>${spring.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -206,7 +220,6 @@
<artifactId>cxf-rt-testsupport</artifactId>
<version>${project.version}</version>
</dependency>
-
</dependencies>
<properties>
<surefire.fork.mode>pertest</surefire.fork.mode>
Modified: cxf/branches/2.2.x-fixes/tools/common/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/tools/common/pom.xml?rev=922364&r1=922363&r2=922364&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/tools/common/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/tools/common/pom.xml Fri Mar 12 17:41:15 2010
@@ -89,14 +89,6 @@
<version>${project.version}</version>
</dependency>
- <!--dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-core</artifactId>
- <classifier>tests</classifier>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency-->
-
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-ws-metadata_2.0_spec</artifactId>