Author: dkulp
Date: Tue Nov 27 20:33:37 2012
New Revision: 1414384
URL: http://svn.apache.org/viewvc?rev=1414384&view=rev
Log:
Use the managed versions of various deps
Modified:
cxf/trunk/distribution/src/main/release/samples/aegis/pom.xml
cxf/trunk/distribution/src/main/release/samples/groovy_spring_support/pom.xml
cxf/trunk/distribution/src/main/release/samples/jax_rs/minimal_osgi/pom.xml
cxf/trunk/distribution/src/main/release/samples/jaxws_async/pom.xml
cxf/trunk/distribution/src/main/release/samples/jms_spring_config/pom.xml
cxf/trunk/distribution/src/main/release/samples/oauth/client/pom.xml
cxf/trunk/distribution/src/main/release/samples/oauth/server/pom.xml
cxf/trunk/distribution/src/main/release/samples/ruby_spring_support/pom.xml
Modified: cxf/trunk/distribution/src/main/release/samples/aegis/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/aegis/pom.xml?rev=1414384&r1=1414383&r2=1414384&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/aegis/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/aegis/pom.xml Tue Nov 27
20:33:37 2012
@@ -122,10 +122,9 @@
<artifactId>cxf-rt-transports-http-jetty</artifactId>
<version>2.7.1-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
</dependencies>
</project>
Modified:
cxf/trunk/distribution/src/main/release/samples/groovy_spring_support/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/groovy_spring_support/pom.xml?rev=1414384&r1=1414383&r2=1414384&view=diff
==============================================================================
---
cxf/trunk/distribution/src/main/release/samples/groovy_spring_support/pom.xml
(original)
+++
cxf/trunk/distribution/src/main/release/samples/groovy_spring_support/pom.xml
Tue Nov 27 20:33:37 2012
@@ -132,7 +132,6 @@
<dependency>
<groupId>antlr</groupId>
<artifactId>antlr</artifactId>
- <version>2.7.6</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
Modified:
cxf/trunk/distribution/src/main/release/samples/jax_rs/minimal_osgi/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/jax_rs/minimal_osgi/pom.xml?rev=1414384&r1=1414383&r2=1414384&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/jax_rs/minimal_osgi/pom.xml
(original)
+++ cxf/trunk/distribution/src/main/release/samples/jax_rs/minimal_osgi/pom.xml
Tue Nov 27 20:33:37 2012
@@ -307,7 +307,6 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.0_spec</artifactId>
- <version>1.1.1</version>
</dependency>
<dependency>
Modified: cxf/trunk/distribution/src/main/release/samples/jaxws_async/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/jaxws_async/pom.xml?rev=1414384&r1=1414383&r2=1414384&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/jaxws_async/pom.xml
(original)
+++ cxf/trunk/distribution/src/main/release/samples/jaxws_async/pom.xml Tue Nov
27 20:33:37 2012
@@ -152,7 +152,6 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
- <version>3.0.7.RELEASE</version>
</dependency>
<dependency>
<!-- With this dependency, if you deploy the war into a standard
Jetty 7.x -->
Modified:
cxf/trunk/distribution/src/main/release/samples/jms_spring_config/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/jms_spring_config/pom.xml?rev=1414384&r1=1414383&r2=1414384&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/jms_spring_config/pom.xml
(original)
+++ cxf/trunk/distribution/src/main/release/samples/jms_spring_config/pom.xml
Tue Nov 27 20:33:37 2012
@@ -205,12 +205,10 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
- <version>3.0.6.RELEASE</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.7</version>
<scope>compile</scope>
</dependency>
</dependencies>
Modified: cxf/trunk/distribution/src/main/release/samples/oauth/client/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/oauth/client/pom.xml?rev=1414384&r1=1414383&r2=1414384&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/oauth/client/pom.xml
(original)
+++ cxf/trunk/distribution/src/main/release/samples/oauth/client/pom.xml Tue
Nov 27 20:33:37 2012
@@ -69,7 +69,6 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_3.0_spec</artifactId>
- <version>1.0</version>
</dependency>
<dependency>
Modified: cxf/trunk/distribution/src/main/release/samples/oauth/server/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/oauth/server/pom.xml?rev=1414384&r1=1414383&r2=1414384&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/oauth/server/pom.xml
(original)
+++ cxf/trunk/distribution/src/main/release/samples/oauth/server/pom.xml Tue
Nov 27 20:33:37 2012
@@ -56,48 +56,39 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
- <version>3.0.3.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
- <version>3.0.3.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>3.0.3.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
- <version>3.0.3.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
- <version>3.0.3.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-core</artifactId>
- <version>3.0.3.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-web</artifactId>
- <version>3.0.3.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-config</artifactId>
- <version>3.0.3.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-acl</artifactId>
- <version>3.0.3.RELEASE</version>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
@@ -107,7 +98,6 @@
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
- <version>2.2.2</version>
</dependency>
Modified:
cxf/trunk/distribution/src/main/release/samples/ruby_spring_support/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ruby_spring_support/pom.xml?rev=1414384&r1=1414383&r2=1414384&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/ruby_spring_support/pom.xml
(original)
+++ cxf/trunk/distribution/src/main/release/samples/ruby_spring_support/pom.xml
Tue Nov 27 20:33:37 2012
@@ -132,7 +132,6 @@
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
- <version>2.1_3</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>