Author: owulff
Date: Thu Mar 21 20:19:59 2013
New Revision: 1459508
URL: http://svn.apache.org/r1459508
Log:
Use Spring 2.5.6 for spring security 2.0
Modified:
cxf/fediz/trunk/examples/spring2Webapp/pom.xml
cxf/fediz/trunk/plugins/spring2/pom.xml
cxf/fediz/trunk/systests/spring2Webapp/pom.xml
Modified: cxf/fediz/trunk/examples/spring2Webapp/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/fediz/trunk/examples/spring2Webapp/pom.xml?rev=1459508&r1=1459507&r2=1459508&view=diff
==============================================================================
--- cxf/fediz/trunk/examples/spring2Webapp/pom.xml (original)
+++ cxf/fediz/trunk/examples/spring2Webapp/pom.xml Thu Mar 21 20:19:59 2013
@@ -30,17 +30,36 @@
<packaging>war</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <spring.version>2.0.8.RELEASE</spring.version>
+ <spring.security.version>2.0.8.RELEASE</spring.security.version>
+ <spring.version>2.5.6</spring.version>
</properties>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<dependencies>
-<!--
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>${commons.logging.version}</version>
- <scope>provided</scope>
- </dependency>
--->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
@@ -63,11 +82,21 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-core</artifactId>
+ <version>${spring.security.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>${commons.lang.version}</version>
</dependency>
<dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>${log4j.version}</version>
Modified: cxf/fediz/trunk/plugins/spring2/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/fediz/trunk/plugins/spring2/pom.xml?rev=1459508&r1=1459507&r2=1459508&view=diff
==============================================================================
--- cxf/fediz/trunk/plugins/spring2/pom.xml (original)
+++ cxf/fediz/trunk/plugins/spring2/pom.xml Thu Mar 21 20:19:59 2013
@@ -30,18 +30,22 @@
<packaging>bundle</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <spring.version>2.0.8.RELEASE</spring.version>
+ <spring.security.version>2.0.8.RELEASE</spring.security.version>
+ <spring.version>2.5.6</spring.version>
</properties>
+
<dependencies>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-core</artifactId>
- <version>${spring.version}</version>
+ <version>${spring.security.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
- <version>2.0.8</version>
+ <version>${spring.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: cxf/fediz/trunk/systests/spring2Webapp/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/fediz/trunk/systests/spring2Webapp/pom.xml?rev=1459508&r1=1459507&r2=1459508&view=diff
==============================================================================
--- cxf/fediz/trunk/systests/spring2Webapp/pom.xml (original)
+++ cxf/fediz/trunk/systests/spring2Webapp/pom.xml Thu Mar 21 20:19:59 2013
@@ -34,9 +34,35 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <spring.version>2.0.8</spring.version>
+ <spring.security.version>2.0.8.RELEASE</spring.security.version>
+ <spring.version>2.5.6</spring.version>
</properties>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
@@ -58,7 +84,17 @@
<groupId>org.apache.cxf.fediz</groupId>
<artifactId>fediz-spring2</artifactId>
<version>${project.version}</version>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-core</artifactId>
+ <version>${spring.security.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
