cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ff...@apache.org
Subject svn commit: r1303229 - in /cxf/branches/2.5.x-fixes: rt/bindings/http/ rt/databinding/aegis/ rt/databinding/xmlbeans/ rt/frontend/jaxrs/ rt/javascript/javascript-tests/ rt/transports/http/ systests/databinding/ systests/jaxrs/ systests/rs-security/ sys...
Date Wed, 21 Mar 2012 00:21:08 GMT
Author: ffang
Date: Wed Mar 21 00:21:08 2012
New Revision: 1303229

URL: http://svn.apache.org/viewvc?rev=1303229&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.5.x-fixes/rt/bindings/http/pom.xml
    cxf/branches/2.5.x-fixes/rt/databinding/aegis/pom.xml
    cxf/branches/2.5.x-fixes/rt/databinding/xmlbeans/pom.xml
    cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/pom.xml
    cxf/branches/2.5.x-fixes/rt/javascript/javascript-tests/pom.xml
    cxf/branches/2.5.x-fixes/rt/transports/http/pom.xml
    cxf/branches/2.5.x-fixes/systests/databinding/pom.xml
    cxf/branches/2.5.x-fixes/systests/jaxrs/pom.xml
    cxf/branches/2.5.x-fixes/systests/rs-security/pom.xml
    cxf/branches/2.5.x-fixes/systests/ws-security-examples/pom.xml
    cxf/branches/2.5.x-fixes/systests/ws-security/pom.xml
    cxf/branches/2.5.x-fixes/tools/javato/ws/pom.xml

Modified: cxf/branches/2.5.x-fixes/rt/bindings/http/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/bindings/http/pom.xml?rev=1303229&r1=1303228&r2=1303229&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/bindings/http/pom.xml (original)
+++ cxf/branches/2.5.x-fixes/rt/bindings/http/pom.xml Wed Mar 21 00:21:08 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.5.x-fixes/rt/databinding/aegis/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/databinding/aegis/pom.xml?rev=1303229&r1=1303228&r2=1303229&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/databinding/aegis/pom.xml (original)
+++ cxf/branches/2.5.x-fixes/rt/databinding/aegis/pom.xml Wed Mar 21 00:21:08 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.5.x-fixes/rt/databinding/xmlbeans/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/databinding/xmlbeans/pom.xml?rev=1303229&r1=1303228&r2=1303229&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/databinding/xmlbeans/pom.xml (original)
+++ cxf/branches/2.5.x-fixes/rt/databinding/xmlbeans/pom.xml Wed Mar 21 00:21:08 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.5.x-fixes/rt/frontend/jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/pom.xml?rev=1303229&r1=1303228&r2=1303229&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/pom.xml (original)
+++ cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/pom.xml Wed Mar 21 00:21:08 2012
@@ -182,10 +182,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.5.x-fixes/rt/javascript/javascript-tests/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/javascript/javascript-tests/pom.xml?rev=1303229&r1=1303228&r2=1303229&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/javascript/javascript-tests/pom.xml (original)
+++ cxf/branches/2.5.x-fixes/rt/javascript/javascript-tests/pom.xml Wed Mar 21 00:21:08 2012
@@ -67,11 +67,6 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
             <groupId>xerces</groupId>
             <artifactId>xercesImpl</artifactId>
             <scope>test</scope>

Modified: cxf/branches/2.5.x-fixes/rt/transports/http/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/transports/http/pom.xml?rev=1303229&r1=1303228&r2=1303229&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/transports/http/pom.xml (original)
+++ cxf/branches/2.5.x-fixes/rt/transports/http/pom.xml Wed Mar 21 00:21:08 2012
@@ -62,7 +62,6 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
-            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>${cxf.servlet-api.group}</groupId>

Modified: cxf/branches/2.5.x-fixes/systests/databinding/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/databinding/pom.xml?rev=1303229&r1=1303228&r2=1303229&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/databinding/pom.xml (original)
+++ cxf/branches/2.5.x-fixes/systests/databinding/pom.xml Wed Mar 21 00:21:08 2012
@@ -305,16 +305,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.5.x-fixes/systests/jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxrs/pom.xml?rev=1303229&r1=1303228&r2=1303229&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxrs/pom.xml (original)
+++ cxf/branches/2.5.x-fixes/systests/jaxrs/pom.xml Wed Mar 21 00:21:08 2012
@@ -207,17 +207,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.5.x-fixes/systests/rs-security/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/rs-security/pom.xml?rev=1303229&r1=1303228&r2=1303229&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/rs-security/pom.xml (original)
+++ cxf/branches/2.5.x-fixes/systests/rs-security/pom.xml Wed Mar 21 00:21:08 2012
@@ -134,13 +134,6 @@
             <version>${cxf.spring.version}</version>
             <scope>test</scope>
         </dependency>
-         <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <version>${cxf.spring.version}</version>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-tx</artifactId>

Modified: cxf/branches/2.5.x-fixes/systests/ws-security-examples/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/ws-security-examples/pom.xml?rev=1303229&r1=1303228&r2=1303229&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/ws-security-examples/pom.xml (original)
+++ cxf/branches/2.5.x-fixes/systests/ws-security-examples/pom.xml Wed Mar 21 00:21:08 2012
@@ -191,13 +191,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.5.x-fixes/systests/ws-security/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/ws-security/pom.xml?rev=1303229&r1=1303228&r2=1303229&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/ws-security/pom.xml (original)
+++ cxf/branches/2.5.x-fixes/systests/ws-security/pom.xml Wed Mar 21 00:21:08 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.5.x-fixes/tools/javato/ws/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/tools/javato/ws/pom.xml?rev=1303229&r1=1303228&r2=1303229&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/tools/javato/ws/pom.xml (original)
+++ cxf/branches/2.5.x-fixes/tools/javato/ws/pom.xml Wed Mar 21 00:21:08 2012
@@ -160,11 +160,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>



Mime
View raw message