Upgrade to 2.3.4

This commit is contained in:
Rossen Stoyanchev
2014-05-29 23:19:58 -04:00
parent e90a8c4410
commit e51789e0f0
7 changed files with 49 additions and 41 deletions

View File

@@ -9,9 +9,9 @@
<version>1.0.0.BUILD-SNAPSHOT</version>
<properties>
<springframework-version>4.0.0.RELEASE</springframework-version>
<springsecurity-version>3.2.0.RELEASE</springsecurity-version>
<webflow-version>2.3.3.RELEASE</webflow-version>
<springframework-version>4.0.5.RELEASE</springframework-version>
<springsecurity-version>3.2.4.RELEASE</springsecurity-version>
<webflow-version>2.3.4.RELEASE</webflow-version>
<slf4j-version>1.6.1</slf4j-version>
<mojarra-version>2.2.5</mojarra-version>
<primefaces-version>4.0</primefaces-version>
@@ -19,9 +19,11 @@
<repositories>
<repository>
<id>spring-repository</id>
<name>SpringSource Repository</name>
<url>http://repo.springsource.org/milestone</url>
<id>spring</id>
<name>Spring Repository</name>
<url>http://repo.spring.io/milestone</url>
<releases><enabled>true</enabled></releases>
<snapshots><enabled>true</enabled></snapshots>
</repository>
<repository>
<id>primefaces-repository</id>
@@ -29,11 +31,6 @@
<url>http://repository.primefaces.org</url>
<layout>default</layout>
</repository>
<repository>
<id>spring-snapshots</id>
<name>SpringSource Repository</name>
<url>http://repo.springsource.org/snapshot</url>
</repository>
</repositories>
<dependencies>

View File

@@ -9,9 +9,9 @@
<version>1.0.0.BUILD-SNAPSHOT</version>
<properties>
<springframework-version>4.0.0.RELEASE</springframework-version>
<springsecurity-version>3.2.0.RELEASE</springsecurity-version>
<webflow-version>2.3.3.RELEASE</webflow-version>
<springframework-version>4.0.5.RELEASE</springframework-version>
<springsecurity-version>3.2.4.RELEASE</springsecurity-version>
<webflow-version>2.3.4.RELEASE</webflow-version>
<slf4j-version>1.7.5</slf4j-version>
<thymeleaf-version>2.0.15</thymeleaf-version>
<thymeleaf-extras-tiles2-version>2.0.0</thymeleaf-extras-tiles2-version>
@@ -22,9 +22,11 @@
<repositories>
<repository>
<id>spring-milestones</id>
<name>SpringSource Repository</name>
<url>http://repo.springsource.org/milestone</url>
<id>spring</id>
<name>Spring Repository</name>
<url>http://repo.spring.io/milestone</url>
<releases><enabled>true</enabled></releases>
<snapshots><enabled>true</enabled></snapshots>
</repository>
<repository>
<id>spring-snapshots</id>

View File

@@ -9,17 +9,19 @@
<version>1.0.0.BUILD-SNAPSHOT</version>
<properties>
<springframework-version>3.2.1.RELEASE</springframework-version>
<webflow-version>2.4.0.M1</webflow-version>
<springframework-version>4.0.5.RELEASE</springframework-version>
<webflow-version>2.3.4.RELEASE</webflow-version>
<slf4j-version>1.5.10</slf4j-version>
<myfaces-version>2.1.6</myfaces-version>
<myfaces-version>1.2.9</myfaces-version>
</properties>
<repositories>
<repository>
<id>spring-repository</id>
<name>SpringSource Repository</name>
<url>http://repo.springsource.org/milestone</url>
<id>spring</id>
<name>Spring Repository</name>
<url>http://repo.spring.io/milestone</url>
<releases><enabled>true</enabled></releases>
<snapshots><enabled>true</enabled></snapshots>
</repository>
</repositories>
@@ -78,6 +80,11 @@
<artifactId>myfaces-impl</artifactId>
<version>${myfaces-version}</version>
</dependency>
<dependency>
<groupId>com.sun.facelets</groupId>
<artifactId>jsf-facelets</artifactId>
<version>1.1.14</version>
</dependency>
<!-- Logging -->
<dependency>
<groupId>org.slf4j</groupId>

View File

@@ -5,6 +5,6 @@
<faces-config>
<application>
<view-handler>org.springframework.faces.webflow.context.portlet.PortletViewHandler</view-handler>
<view-handler>org.springframework.faces.webflow.application.portlet.PortletFaceletViewHandler</view-handler>
</application>
</faces-config>

View File

@@ -9,16 +9,18 @@
<version>1.0.0.BUILD-SNAPSHOT</version>
<properties>
<springframework-version>3.2.1.RELEASE</springframework-version>
<webflow-version>2.4.0.M1</webflow-version>
<springframework-version>4.0.5.RELEASE</springframework-version>
<webflow-version>2.3.4.RELEASE</webflow-version>
<slf4j-version>1.5.10</slf4j-version>
</properties>
<repositories>
<repository>
<id>spring-repository</id>
<name>SpringSource Repository</name>
<url>http://repo.springsource.org/milestone</url>
<id>spring</id>
<name>Spring Repository</name>
<url>http://repo.spring.io/milestone</url>
<releases><enabled>true</enabled></releases>
<snapshots><enabled>true</enabled></snapshots>
</repository>
</repositories>

View File

@@ -10,9 +10,9 @@
<properties>
<java-version>1.6</java-version>
<springframework-version>4.0.0.RELEASE</springframework-version>
<springwebflow-version>2.3.3.RELEASE</springwebflow-version>
<springsecurity-version>3.2.0.RELEASE</springsecurity-version>
<springframework-version>4.0.5.RELEASE</springframework-version>
<springsecurity-version>3.2.4.RELEASE</springsecurity-version>
<springwebflow-version>2.3.4.RELEASE</springwebflow-version>
<org.slf4j-version>1.6.1</org.slf4j-version>
</properties>
@@ -189,9 +189,9 @@
<repositories>
<repository>
<id>springsource</id>
<name>SpringSource Repository</name>
<url>http://repo.springsource.org/milestone</url>
<id>spring</id>
<name>Spring Repository</name>
<url>http://repo.spring.io/milestone</url>
<releases><enabled>true</enabled></releases>
<snapshots><enabled>true</enabled></snapshots>
</repository>

View File

@@ -10,9 +10,9 @@
<properties>
<java-version>1.6</java-version>
<springframework-version>4.0.0.RELEASE</springframework-version>
<springwebflow-version>2.3.3.RELEASE</springwebflow-version>
<springsecurity-version>3.2.0.RELEASE</springsecurity-version>
<springframework-version>4.0.5.RELEASE</springframework-version>
<springsecurity-version>3.2.4.RELEASE</springsecurity-version>
<springwebflow-version>2.3.4.RELEASE</springwebflow-version>
<org.slf4j-version>1.5.10</org.slf4j-version>
</properties>
@@ -216,9 +216,9 @@
<repositories>
<!-- For testing against latest Spring snapshots -->
<repository>
<id>springsource</id>
<name>SpringSource Repository</name>
<url>http://repo.springsource.org/milestone</url>
<id>spring</id>
<name>Spring Repository</name>
<url>http://repo.spring.io/milestone</url>
<releases><enabled>true</enabled></releases>
<snapshots><enabled>true</enabled></snapshots>
</repository>