svn commit: r1512550 - in /roller/trunk/app: pom.xml src/test/java/org/apache/roller/weblogger/business/PingsTest.java

[gmazza]

Author: gmazza
Date: Sat Aug 10 01:35:09 2013
New Revision: 1512550

URL: http://svn.apache.org/r1512550
Log:
Fixed test regression, updated Spring DI to latest 3.2.4.RELEASE (Spring 
Security still needs updating).

Modified:
    roller/trunk/app/pom.xml
    
roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/PingsTest.java

Modified: roller/trunk/app/pom.xml
URL: 
http://svn.apache.org/viewvc/roller/trunk/app/pom.xml?rev=1512550&r1=1512549&r2=1512550&view=diff
==============================================================================
--- roller/trunk/app/pom.xml (original)
+++ roller/trunk/app/pom.xml Sat Aug 10 01:35:09 2013
@@ -23,6 +23,8 @@
         
<testIndexDir>${project.build.testOutputDirectory}${file.separator}index</testIndexDir>
         
<testPlanetCache>${project.build.testOutputDirectory}${file.separator}planetcache</testPlanetCache>
         <lucene.version>4.4.0</lucene.version>
+        <spring.version>3.2.4.RELEASE</spring.version>
+        <spring.security.version>2.0.7.RELEASE</spring.security.version>
     </properties>
 
     <dependencies>
@@ -243,7 +245,7 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
-            <version>2.5.6.SEC03</version>
+            <version>${spring.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>aopalliance</groupId>
@@ -255,25 +257,25 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
-            <version>2.5.6.SEC03</version>
+            <version>${spring.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-dao</artifactId>
-            <version>2.0.7</version>
+            <version>2.0.8</version>
         </dependency>
        
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-core</artifactId>
-            <version>2.0.7.RELEASE</version>
+            <version>${spring.security.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-openid</artifactId>
-            <version>2.0.7.RELEASE</version>
+            <version>${spring.security.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.openid4java</groupId>
@@ -285,7 +287,7 @@
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-taglibs</artifactId>
-            <version>2.0.7.RELEASE</version>
+            <version>${spring.security.version}</version>
             <exclusions>
                 <exclusion>
                     <artifactId>spring-web</artifactId>
@@ -297,7 +299,7 @@
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-acl</artifactId>
-            <version>2.0.7.RELEASE</version>
+            <version>${spring.security.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.springframework</groupId>

Modified: 
roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/PingsTest.java
URL: 
http://svn.apache.org/viewvc/roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/PingsTest.java?rev=1512550&r1=1512549&r2=1512550&view=diff
==============================================================================
--- 
roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/PingsTest.java
 (original)
+++ 
roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/PingsTest.java
 Sat Aug 10 01:35:09 2013
@@ -214,8 +214,8 @@ public class PingsTest extends TestCase 
         // lookup all common pings
         List commonPings = mgr.getCommonPingTargets();
         assertNotNull(commonPings);
-        // correct answer is: 6 pings in config + 1 new one = 7
-        assertEquals(7, commonPings.size());
+        // correct answer is: 4 pings in config + 1 new one = 5
+        assertEquals(5, commonPings.size());
         
         // lookup all custom pings for weblog
         testWeblog = TestUtils.getManagedWebsite(testWeblog);