You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by mr...@apache.org on 2006/07/26 20:18:45 UTC
svn commit: r425796 - in /struts/struts2/trunk: apps/pom.xml
assembly/pom.xml core/pom.xml
core/src/test/java/org/apache/struts2/dispatcher/FilterDispatcherTest.java
Author: mrdon
Date: Wed Jul 26 11:18:44 2006
New Revision: 425796
URL: http://svn.apache.org/viewvc?rev=425796&view=rev
Log:
Updated to Spring 1.2.8
Patch provided by Eric Molitor
WW-1394
Modified:
struts/struts2/trunk/apps/pom.xml
struts/struts2/trunk/assembly/pom.xml
struts/struts2/trunk/core/pom.xml
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/FilterDispatcherTest.java
Modified: struts/struts2/trunk/apps/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/pom.xml?rev=425796&r1=425795&r2=425796&view=diff
==============================================================================
--- struts/struts2/trunk/apps/pom.xml (original)
+++ struts/struts2/trunk/apps/pom.xml Wed Jul 26 11:18:44 2006
@@ -131,31 +131,31 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
- <version>1.2.6</version>
+ <version>1.2.8</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>1.2.6</version>
+ <version>1.2.8</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
- <version>1.2.6</version>
+ <version>1.2.8</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
- <version>1.2.6</version>
+ <version>1.2.8</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-mock</artifactId>
- <version>1.2.6</version>
+ <version>1.2.8</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: struts/struts2/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/pom.xml?rev=425796&r1=425795&r2=425796&view=diff
==============================================================================
--- struts/struts2/trunk/assembly/pom.xml (original)
+++ struts/struts2/trunk/assembly/pom.xml Wed Jul 26 11:18:44 2006
@@ -302,35 +302,35 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
- <version>1.2.6</version>
+ <version>1.2.8</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>1.2.6</version>
+ <version>1.2.8</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
- <version>1.2.6</version>
+ <version>1.2.8</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
- <version>1.2.6</version>
+ <version>1.2.8</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-mock</artifactId>
- <version>1.2.6</version>
+ <version>1.2.8</version>
<scope>provided</scope>
</dependency>
Modified: struts/struts2/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/pom.xml?rev=425796&r1=425795&r2=425796&view=diff
==============================================================================
--- struts/struts2/trunk/core/pom.xml (original)
+++ struts/struts2/trunk/core/pom.xml Wed Jul 26 11:18:44 2006
@@ -221,35 +221,35 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
- <version>1.2.6</version>
+ <version>1.2.8</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>1.2.6</version>
+ <version>1.2.8</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
- <version>1.2.6</version>
+ <version>1.2.8</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
- <version>1.2.6</version>
+ <version>1.2.8</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-mock</artifactId>
- <version>1.2.6</version>
+ <version>1.2.8</version>
<optional>true</optional>
</dependency>
Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/FilterDispatcherTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/FilterDispatcherTest.java?rev=425796&r1=425795&r2=425796&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/FilterDispatcherTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/FilterDispatcherTest.java Wed Jul 26 11:18:44 2006
@@ -66,7 +66,7 @@
public void testObjectFactoryDestroy() throws Exception {
FilterDispatcher filterDispatcher = new FilterDispatcher();
- filterDispatcher.init(new MockFilterConfig(null));
+ filterDispatcher.init(new MockFilterConfig((ServletContext) null));
InnerDestroyableObjectFactory destroyedObjectFactory = new InnerDestroyableObjectFactory();
ObjectFactory.setObjectFactory(destroyedObjectFactory);