Author: dkulp
Date: Fri Mar 12 17:32:54 2010
New Revision: 922360
URL: http://svn.apache.org/viewvc?rev=922360&view=rev
Log:
update poms to work with maven 3 and mvnsh
Modified:
cxf/trunk/parent/pom.xml
cxf/trunk/rt/ws/rm/pom.xml
cxf/trunk/systests/jaxws/pom.xml
cxf/trunk/tools/common/pom.xml
Modified: cxf/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/parent/pom.xml?rev=922360&r1=922359&r2=922360&view=diff
==============================================================================
--- cxf/trunk/parent/pom.xml (original)
+++ cxf/trunk/parent/pom.xml Fri Mar 12 17:32:54 2010
@@ -779,6 +779,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/trunk/rt/ws/rm/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/pom.xml?rev=922360&r1=922359&r2=922360&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/pom.xml (original)
+++ cxf/trunk/rt/ws/rm/pom.xml Fri Mar 12 17:32:54 2010
@@ -90,17 +90,6 @@
<version>${derby.version}</version>
<scope>test</scope>
</dependency>
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</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>
Modified: cxf/trunk/systests/jaxws/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/jaxws/pom.xml?rev=922360&r1=922359&r2=922360&view=diff
==============================================================================
--- cxf/trunk/systests/jaxws/pom.xml (original)
+++ cxf/trunk/systests/jaxws/pom.xml Fri Mar 12 17:32:54 2010
@@ -181,36 +181,30 @@
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<scope>provided</scope>
- <version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<scope>provided</scope>
- <version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
<scope>provided</scope>
- <version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<scope>provided</scope>
- <version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<scope>provided</scope>
- <version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>${spring.mock}</artifactId>
- <version>${spring.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -240,44 +234,6 @@
<artifactId>cxf-rt-testsupport</artifactId>
<version>${project.version}</version>
</dependency>
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
- <scope>provided</scope>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-webmvc</artifactId>
- <scope>provided</scope>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-aop</artifactId>
- <scope>provided</scope>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- <scope>provided</scope>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <scope>provided</scope>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <scope>provided</scope>
- <version>${spring.version}</version>
- </dependency>
-
</dependencies>
<properties>
<surefire.fork.mode>pertest</surefire.fork.mode>
Modified: cxf/trunk/tools/common/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/tools/common/pom.xml?rev=922360&r1=922359&r2=922360&view=diff
==============================================================================
--- cxf/trunk/tools/common/pom.xml (original)
+++ cxf/trunk/tools/common/pom.xml Fri Mar 12 17:32:54 2010
@@ -106,10 +106,6 @@
<artifactId>geronimo-jaxws_2.1_spec</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>javax.xml.soap</groupId>
- <artifactId>saaj-api</artifactId>
- </dependency>
</dependencies>
</profile>
</profiles>
