Spring/spring-webflow-samples
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade to Spring Framework 3.2.1

Browse Source
This commit is contained in:
Rossen Stoyanchev
2012-10-23 17:25:24 -04:00
parent f482b57108
commit f45bc3ac1d
7 changed files with 38 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
booking-faces/pom.xml
View File

@@ -9,7 +9,7 @@
<version>1.0.0.BUILD-SNAPSHOT</version>
<properties>
<springframework-version>3.2.0.RELEASE</springframework-version>
<springframework-version>3.2.1.RELEASE</springframework-version>
<springsecurity-version>3.1.3.RELEASE</springsecurity-version>
<webflow-version>2.4.0.BUILD-SNAPSHOT</webflow-version>
<slf4j-version>1.5.10</slf4j-version>
@@ -33,6 +33,11 @@
<dependencies>
<!-- Spring -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
<version>${springframework-version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
@@ -75,6 +80,10 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
@@ -87,6 +96,10 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- Database, JPA -->
@@ -203,7 +216,7 @@
</dependencies>
<build>
<finalName>swf-booking-faces</finalName>
<finalName>booking-faces</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>

2
booking-faces/src/main/webapp/WEB-INF/config/security-config.xml
View File

@@ -35,4 +35,4 @@
</security:authentication-provider>
</security:authentication-manager>
</beans>
</beans>

5
booking-faces/src/main/webapp/WEB-INF/config/webmvc-config.xml
View File

@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:faces="http://www.springframework.org/schema/faces"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:faces="http://www.springframework.org/schema/faces"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
http://www.springframework.org/schema/faces http://www.springframework.org/schema/faces/spring-faces-2.4.xsd">
@@ -32,4 +33,4 @@
<property name="flowExecutor" ref="flowExecutor" />
</bean>
</beans>
</beans>

18
booking-mvc/pom.xml
View File

@@ -9,7 +9,7 @@
<version>1.0.0.BUILD-SNAPSHOT</version>
<properties>
<springframework-version>3.2.0.RELEASE</springframework-version>
<springframework-version>3.2.1.RELEASE</springframework-version>
<springsecurity-version>3.1.3.RELEASE</springsecurity-version>
<webflow-version>2.4.0.BUILD-SNAPSHOT</webflow-version>
<slf4j-version>1.5.10</slf4j-version>
@@ -66,13 +66,23 @@
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-taglibs</artifactId>
<version>${springsecurity-version}</version>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
@@ -83,6 +93,10 @@
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>

2
booking-mvc/src/main/webapp/WEB-INF/config/security-config.xml
View File

@@ -34,4 +34,4 @@
</security:authentication-provider>
</security:authentication-manager>
</beans>
</beans>

3
booking-portlet-faces/pom.xml
View File

@@ -9,8 +9,7 @@
<version>1.0.0.BUILD-SNAPSHOT</version>
<properties>
<springframework-version>3.2.0.RELEASE</springframework-version>
<webflow-version>2.3.1.RELEASE</webflow-version>
<springframework-version>3.2.1.RELEASE</springframework-version>
<webflow-version>2.4.0.BUILD-SNAPSHOT</webflow-version>
<slf4j-version>1.5.10</slf4j-version>
<myfaces-version>2.1.6</myfaces-version>

3
booking-portlet-mvc/pom.xml
View File

@@ -9,8 +9,7 @@
<version>1.0.0.BUILD-SNAPSHOT</version>
<properties>
<springframework-version>3.2.0.RELEASE</springframework-version>
<webflow-version>2.3.1.RELEASE</webflow-version>
<springframework-version>3.2.1.RELEASE</springframework-version>
<webflow-version>2.4.0.BUILD-SNAPSHOT</webflow-version>
<slf4j-version>1.5.10</slf4j-version>
</properties>