You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ff...@apache.org on 2012/03/21 01:39:05 UTC
svn commit: r1303240 - in /cxf/branches/2.4.x-fixes: rt/bindings/http/
rt/databinding/aegis/ rt/databinding/xmlbeans/ rt/frontend/jaxrs/
rt/javascript/ rt/transports/http/ systests/databinding/ systests/jaxrs/
systests/ws-security-examples/ systests/ws...
Author: ffang
Date: Wed Mar 21 00:39:04 2012
New Revision: 1303240
URL: http://svn.apache.org/viewvc?rev=1303240&view=rev
Log:
rollback changes on fixes branches that make cxf-transports-http optionally depend on spring which can break backward compatibility
Modified:
cxf/branches/2.4.x-fixes/rt/bindings/http/pom.xml
cxf/branches/2.4.x-fixes/rt/databinding/aegis/pom.xml
cxf/branches/2.4.x-fixes/rt/databinding/xmlbeans/pom.xml
cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/pom.xml
cxf/branches/2.4.x-fixes/rt/javascript/pom.xml
cxf/branches/2.4.x-fixes/rt/transports/http/pom.xml
cxf/branches/2.4.x-fixes/systests/databinding/pom.xml
cxf/branches/2.4.x-fixes/systests/jaxrs/pom.xml
cxf/branches/2.4.x-fixes/systests/ws-security-examples/pom.xml
cxf/branches/2.4.x-fixes/systests/ws-security/pom.xml
cxf/branches/2.4.x-fixes/tools/javato/ws/pom.xml
Modified: cxf/branches/2.4.x-fixes/rt/bindings/http/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/bindings/http/pom.xml?rev=1303240&r1=1303239&r2=1303240&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/bindings/http/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/rt/bindings/http/pom.xml Wed Mar 21 00:39:04 2012
@@ -87,11 +87,6 @@
<artifactId>slf4j-jdk14</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
Modified: cxf/branches/2.4.x-fixes/rt/databinding/aegis/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/databinding/aegis/pom.xml?rev=1303240&r1=1303239&r2=1303240&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/databinding/aegis/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/rt/databinding/aegis/pom.xml Wed Mar 21 00:39:04 2012
@@ -62,11 +62,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http-jetty</artifactId>
<version>${project.version}</version>
Modified: cxf/branches/2.4.x-fixes/rt/databinding/xmlbeans/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/databinding/xmlbeans/pom.xml?rev=1303240&r1=1303239&r2=1303240&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/databinding/xmlbeans/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/rt/databinding/xmlbeans/pom.xml Wed Mar 21 00:39:04 2012
@@ -102,11 +102,6 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
Modified: cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/pom.xml?rev=1303240&r1=1303239&r2=1303240&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/pom.xml Wed Mar 21 00:39:04 2012
@@ -188,10 +188,6 @@
<artifactId>easymock</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- </dependency>
</dependencies>
<build>
<plugins>
Modified: cxf/branches/2.4.x-fixes/rt/javascript/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/javascript/pom.xml?rev=1303240&r1=1303239&r2=1303240&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/javascript/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/rt/javascript/pom.xml Wed Mar 21 00:39:04 2012
@@ -122,11 +122,6 @@
<artifactId>slf4j-api</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
Modified: cxf/branches/2.4.x-fixes/rt/transports/http/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/transports/http/pom.xml?rev=1303240&r1=1303239&r2=1303240&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/transports/http/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/rt/transports/http/pom.xml Wed Mar 21 00:39:04 2012
@@ -62,7 +62,6 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
Modified: cxf/branches/2.4.x-fixes/systests/databinding/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/databinding/pom.xml?rev=1303240&r1=1303239&r2=1303240&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/systests/databinding/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/systests/databinding/pom.xml Wed Mar 21 00:39:04 2012
@@ -291,16 +291,6 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
<artifactId>${cxf.spring.mock}</artifactId>
<version>${cxf.spring.version}</version>
</dependency>
Modified: cxf/branches/2.4.x-fixes/systests/jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/jaxrs/pom.xml?rev=1303240&r1=1303239&r2=1303240&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/systests/jaxrs/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/systests/jaxrs/pom.xml Wed Mar 21 00:39:04 2012
@@ -201,17 +201,6 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
<version>${cxf.spring.version}</version>
<scope>test</scope>
Modified: cxf/branches/2.4.x-fixes/systests/ws-security-examples/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/ws-security-examples/pom.xml?rev=1303240&r1=1303239&r2=1303240&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/systests/ws-security-examples/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/systests/ws-security-examples/pom.xml Wed Mar 21 00:39:04 2012
@@ -171,13 +171,6 @@
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <scope>test</scope>
- </dependency>
-
-
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
Modified: cxf/branches/2.4.x-fixes/systests/ws-security/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/ws-security/pom.xml?rev=1303240&r1=1303239&r2=1303240&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/systests/ws-security/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/systests/ws-security/pom.xml Wed Mar 21 00:39:04 2012
@@ -174,11 +174,6 @@
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
</dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>junit</groupId>
Modified: cxf/branches/2.4.x-fixes/tools/javato/ws/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/tools/javato/ws/pom.xml?rev=1303240&r1=1303239&r2=1303240&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/tools/javato/ws/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/tools/javato/ws/pom.xml Wed Mar 21 00:39:04 2012
@@ -145,11 +145,8 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <optional>true</optional>
- </dependency>
+
+
</dependencies>
<build>
<plugins>