Author: dkulp
Date: Tue May 24 17:47:33 2011
New Revision: 1127183
URL: http://svn.apache.org/viewvc?rev=1127183&view=rev
Log:
Merged revisions 1124429 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1124429 | dkulp | 2011-05-18 17:11:43 -0400 (Wed, 18 May 2011) | 1 line
Minor pom cleanups
........
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/rt/frontend/jaxws/pom.xml
cxf/branches/2.3.x-fixes/rt/transports/http-jetty/pom.xml
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.3.x-fixes/rt/frontend/jaxws/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxws/pom.xml?rev=1127183&r1=1127182&r2=1127183&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/frontend/jaxws/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/rt/frontend/jaxws/pom.xml Tue May 24 17:47:33 2011
@@ -112,13 +112,11 @@
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<scope>provided</scope>
- <version>${cxf.spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<scope>provided</scope>
- <version>${cxf.spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
Modified: cxf/branches/2.3.x-fixes/rt/transports/http-jetty/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/transports/http-jetty/pom.xml?rev=1127183&r1=1127182&r2=1127183&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/transports/http-jetty/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/rt/transports/http-jetty/pom.xml Tue May 24
17:47:33 2011
@@ -50,7 +50,18 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
+ <artifactId>spring-core</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
