struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jo...@apache.org
Subject svn commit: r1134395 - in /struts/struts2/trunk: core/pom.xml plugins/portlet/pom.xml plugins/spring/src/main/java/org/apache/struts2/spring/ClassReloadingBeanFactory.java pom.xml
Date Fri, 10 Jun 2011 17:47:56 GMT
Author: jogep
Date: Fri Jun 10 17:47:55 2011
New Revision: 1134395

URL: http://svn.apache.org/viewvc?rev=1134395&view=rev
Log:
WW-3646: Upgrade Spring Dependencies to 3.0.x

Modified:
    struts/struts2/trunk/core/pom.xml
    struts/struts2/trunk/plugins/portlet/pom.xml
    struts/struts2/trunk/plugins/spring/src/main/java/org/apache/struts2/spring/ClassReloadingBeanFactory.java
    struts/struts2/trunk/pom.xml

Modified: struts/struts2/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/pom.xml?rev=1134395&r1=1134394&r2=1134395&view=diff
==============================================================================
--- struts/struts2/trunk/core/pom.xml (original)
+++ struts/struts2/trunk/core/pom.xml Fri Jun 10 17:47:55 2011
@@ -315,7 +315,7 @@
 
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring</artifactId>
+            <artifactId>spring-core</artifactId>
             <scope>compile</scope>
             <optional>true</optional>
         </dependency>

Modified: struts/struts2/trunk/plugins/portlet/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/portlet/pom.xml?rev=1134395&r1=1134394&r2=1134395&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/portlet/pom.xml (original)
+++ struts/struts2/trunk/plugins/portlet/pom.xml Fri Jun 10 17:47:55 2011
@@ -122,16 +122,19 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
+            <version>2.5.6</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-webmvc-portlet</artifactId>
+            <version>2.5.6</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
+            <version>2.5.6</version>
             <scope>test</scope>
         </dependency>
         <dependency>

Modified: struts/struts2/trunk/plugins/spring/src/main/java/org/apache/struts2/spring/ClassReloadingBeanFactory.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/spring/src/main/java/org/apache/struts2/spring/ClassReloadingBeanFactory.java?rev=1134395&r1=1134394&r2=1134395&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/spring/src/main/java/org/apache/struts2/spring/ClassReloadingBeanFactory.java
(original)
+++ struts/struts2/trunk/plugins/spring/src/main/java/org/apache/struts2/spring/ClassReloadingBeanFactory.java
Fri Jun 10 17:47:55 2011
@@ -37,7 +37,7 @@ import java.lang.reflect.Constructor;
 public class ClassReloadingBeanFactory extends DefaultListableBeanFactory {
     @Override
     protected BeanWrapper createBeanInstance(String beanName, RootBeanDefinition mbd, Object[]
args) {
-        Class beanClass = resolveBeanClass(mbd, beanName);
+        Class beanClass = resolveBeanClass(mbd, beanName, null);
 
         if (mbd.getFactoryMethodName() != null) {
             return instantiateUsingFactoryMethod(beanName, mbd, args);

Modified: struts/struts2/trunk/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/pom.xml?rev=1134395&r1=1134394&r2=1134395&view=diff
==============================================================================
--- struts/struts2/trunk/pom.xml (original)
+++ struts/struts2/trunk/pom.xml Fri Jun 10 17:47:55 2011
@@ -85,7 +85,7 @@
 
     <properties>
         <currentVersion>${project.version}</currentVersion>
-        <struts2.springPlatformVersion>2.5.6</struts2.springPlatformVersion>
+        <struts2.springPlatformVersion>3.0.5.RELEASE</struts2.springPlatformVersion>
         <ognl.version>3.0.1</ognl.version>
         <asm.version>3.1</asm.version>
         <tiles.version>2.0.6</tiles.version>
@@ -178,7 +178,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.3</version>
+                    <version>2.3.1</version>
                     <configuration>
                         <includes>
                             <include>**/*Test.java</include>
@@ -547,7 +547,7 @@
             </dependency>
             <dependency>
                 <groupId>org.springframework</groupId>
-                <artifactId>spring</artifactId>
+                <artifactId>spring-core</artifactId>
                 <version>${struts2.springPlatformVersion}</version>
             </dependency>
             <dependency>



Mime
View raw message