Author: ffang
Date: Tue Mar 20 09:08:19 2012
New Revision: 1302802
URL: http://svn.apache.org/viewvc?rev=1302802&view=rev
Log:
rt-transports-http module should optionally depend on spring
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/po
m.xml?rev=1302802&r1=1302801&r2=1302802&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 Tue Mar 20 09:08:19
2012 @@ -87,6 +87,11 @@
<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/aegi
s/pom.xml?rev=1302802&r1=1302801&r2=1302802&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 Tue Mar 20
09:08:19 2012 @@ -62,6 +62,11 @@
<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/xmlb
eans/pom.xml?rev=1302802&r1=1302801&r2=1302802&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
Tue Mar 20 09:08:19 2012 @@ -102,6 +102,11 @@
<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/p
om.xml?rev=1302802&r1=1302801&r2=1302802&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 Tue Mar 20
09:08:19 2012 @@ -182,6 +182,10 @@
<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/javas
cript-tests/pom.xml?rev=1302802&r1=1302801&r2=1302802&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 Tue
Mar
20 09:08:19 2012 @@ -67,6 +67,11 @@
<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=1302802&r1=1302801&r2=1302802&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 Tue Mar 20
09:08:19 2012 @@ -62,6 +62,7 @@
<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/databindin
g/pom.xml?rev=1302802&r1=1302801&r2=1302802&view=diff
=
=
=
=
=====================================================================
===== --- cxf/branches/2.5.x-fixes/systests/databinding/pom.xml
(original)
+++ cxf/branches/2.5.x-fixes/systests/databinding/pom.xml Tue Mar 20
09:08:19 2012 @@ -305,6 +305,16 @@
</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=1302802&r1=1302801&r2=1302802&view=diff
=
=
=
=
=====================================================================
===== --- cxf/branches/2.5.x-fixes/systests/jaxrs/pom.xml (original)
+++ cxf/branches/2.5.x-fixes/systests/jaxrs/pom.xml Tue Mar 20
09:08:19
2012 @@ -207,6 +207,17 @@
</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-securit
y/pom.xml?rev=1302802&r1=1302801&r2=1302802&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 Tue Mar 20
09:08:19 2012 @@ -134,6 +134,13 @@
<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-securit
y-examples/pom.xml?rev=1302802&r1=1302801&r2=1302802&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 Tue
Mar 20
09:08:19 2012 @@ -191,6 +191,13 @@
</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-securit
y/pom.xml?rev=1302802&r1=1302801&r2=1302802&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 Tue Mar 20
09:08:19 2012 @@ -174,6 +174,11 @@
<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=1302802&r1=1302801&r2=1302802&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 Tue Mar 20
09:08:19
2012 @@ -160,8 +160,11 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
-
-
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<build>
<plugins>