Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-31 19:35:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

WW-3646: Upgrade Spring Dependencies to 3.0.x

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1134395 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Johannes Geppert
2011-06-10 17:47:55 +00:00
parent 1d962f9472
commit 36d14eb401
4 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/pom.xml
+1 -1
View File
@@ -315,7 +315,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
<artifactId>spring-core</artifactId>
<scope>compile</scope>
<optional>true</optional>
</dependency>
plugins/portlet/pom.xml
+3
View File
@@ -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>
plugins/spring/src/main/java/org/apache/struts2/spring/ClassReloadingBeanFactory.java
+1 -1
View File
@@ -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);
pom.xml
+3 -3
View File
@@ -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>