You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ow...@apache.org on 2013/09/06 22:28:38 UTC

svn commit: r1520686 - in /cxf/fediz/trunk: examples/springPreauthWebapp/pom.xml examples/springWebapp/pom.xml plugins/spring/pom.xml pom.xml services/idp/pom.xml systests/springPreauthWebapp/pom.xml

Author: owulff
Date: Fri Sep  6 20:28:38 2013
New Revision: 1520686

URL: http://svn.apache.org/r1520686
Log:
clean up spring versions

Modified:
    cxf/fediz/trunk/examples/springPreauthWebapp/pom.xml
    cxf/fediz/trunk/examples/springWebapp/pom.xml
    cxf/fediz/trunk/plugins/spring/pom.xml
    cxf/fediz/trunk/pom.xml
    cxf/fediz/trunk/services/idp/pom.xml
    cxf/fediz/trunk/systests/springPreauthWebapp/pom.xml

Modified: cxf/fediz/trunk/examples/springPreauthWebapp/pom.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/examples/springPreauthWebapp/pom.xml?rev=1520686&r1=1520685&r2=1520686&view=diff
==============================================================================
--- cxf/fediz/trunk/examples/springPreauthWebapp/pom.xml (original)
+++ cxf/fediz/trunk/examples/springPreauthWebapp/pom.xml Fri Sep  6 20:28:38 2013
@@ -30,7 +30,6 @@
     <packaging>war</packaging>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <spring.version>3.1.3.RELEASE</spring.version>
     </properties>
     <dependencies>
         <dependency>
@@ -65,12 +64,12 @@
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-web</artifactId>
-            <version>${spring.version}</version>
+            <version>${spring.security.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-config</artifactId>
-            <version>${spring.version}</version>
+            <version>${spring.security.version}</version>
         </dependency>
         <dependency>
             <groupId>log4j</groupId>

Modified: cxf/fediz/trunk/examples/springWebapp/pom.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/examples/springWebapp/pom.xml?rev=1520686&r1=1520685&r2=1520686&view=diff
==============================================================================
--- cxf/fediz/trunk/examples/springWebapp/pom.xml (original)
+++ cxf/fediz/trunk/examples/springWebapp/pom.xml Fri Sep  6 20:28:38 2013
@@ -30,7 +30,6 @@
     <packaging>war</packaging>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <spring.version>3.1.3.RELEASE</spring.version>
     </properties>
     <dependencies>
         <dependency>

Modified: cxf/fediz/trunk/plugins/spring/pom.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/plugins/spring/pom.xml?rev=1520686&r1=1520685&r2=1520686&view=diff
==============================================================================
--- cxf/fediz/trunk/plugins/spring/pom.xml (original)
+++ cxf/fediz/trunk/plugins/spring/pom.xml Fri Sep  6 20:28:38 2013
@@ -30,18 +30,17 @@
     <packaging>bundle</packaging>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <spring.version>3.1.3.RELEASE</spring.version>
     </properties>
     <dependencies>
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-web</artifactId>
-            <version>${spring.version}</version>
+            <version>${spring.security.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-config</artifactId>
-            <version>${spring.version}</version>
+            <version>${spring.security.version}</version>
         </dependency>     
         <dependency>
             <groupId>junit</groupId>

Modified: cxf/fediz/trunk/pom.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/pom.xml?rev=1520686&r1=1520685&r2=1520686&view=diff
==============================================================================
--- cxf/fediz/trunk/pom.xml (original)
+++ cxf/fediz/trunk/pom.xml Fri Sep  6 20:28:38 2013
@@ -45,7 +45,8 @@
         <log4j.version>1.2.15</log4j.version>
         <servlet.version>2.5</servlet.version>
         <slf4j.version>1.7.5</slf4j.version>
-        <spring.version>3.0.7.RELEASE</spring.version>
+        <spring.version>3.1.4.RELEASE</spring.version>
+        <spring.security.version>3.1.4.RELEASE</spring.security.version>
         <tomcat.version>7.0.42</tomcat.version>
         <wss4j.version>1.6.11</wss4j.version>
 

Modified: cxf/fediz/trunk/services/idp/pom.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/pom.xml?rev=1520686&r1=1520685&r2=1520686&view=diff
==============================================================================
--- cxf/fediz/trunk/services/idp/pom.xml (original)
+++ cxf/fediz/trunk/services/idp/pom.xml Fri Sep  6 20:28:38 2013
@@ -34,8 +34,6 @@
     </dependencyManagement>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <spring.security.version>3.1.3.RELEASE</spring.security.version>
-        <!--<spring.version>3.1.4.RELEASE</spring.version>-->
     </properties>
     <dependencies>
         <dependency>

Modified: cxf/fediz/trunk/systests/springPreauthWebapp/pom.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/systests/springPreauthWebapp/pom.xml?rev=1520686&r1=1520685&r2=1520686&view=diff
==============================================================================
--- cxf/fediz/trunk/systests/springPreauthWebapp/pom.xml (original)
+++ cxf/fediz/trunk/systests/springPreauthWebapp/pom.xml Fri Sep  6 20:28:38 2013
@@ -69,12 +69,12 @@
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-web</artifactId>
-            <version>3.1.3.RELEASE</version>
+            <version>${spring.security.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-config</artifactId>
-            <version>3.1.3.RELEASE</version>
+            <version>${spring.security.version}</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>