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

upgrade to 2.5.3

Browse Source
This commit is contained in:
Keith Donald
2008-04-05 18:50:00 +00:00
parent 1452fd4b91
commit f805894dcc
7 changed files with 48 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-binding/ivy.xml
View File

@@ -22,9 +22,9 @@
<dependencies>
<!-- global dependencies -->
<dependency org="org.apache" name="commons-logging" rev="1.1.1" conf="compile->default"/>
<dependency org="org.springframework" name="spring-beans" rev="2.5.2" conf="compile->default"/>
<dependency org="org.springframework" name="spring-context" rev="2.5.2" conf="compile->default"/>
<dependency org="org.springframework" name="spring-core" rev="2.5.2" conf="compile->default"/>
<dependency org="org.springframework" name="spring-beans" rev="2.5.3" conf="compile->default"/>
<dependency org="org.springframework" name="spring-context" rev="2.5.3" conf="compile->default"/>
<dependency org="org.springframework" name="spring-core" rev="2.5.3" conf="compile->default"/>
<!-- build time only dependencies -->
<dependency org="org.ognl" name="ognl" rev="2.6.9" conf="compile->default"/>

10
spring-faces/ivy.xml
View File

@@ -27,9 +27,9 @@
<dependency org="org.springframework.webflow" name="spring-webflow" rev="latest.integration" conf="compile->compile"/>
<!-- build time only dependencies -->
<dependency org="javax.el" name="el-api" rev="1.0" conf="provided->default" />
<dependency org="javax.servlet" name="servlet-api" rev="2.4" conf="provided->default" />
<dependency org="javax.el" name="el-api" rev="1.0" conf="provided->default" />
<dependency org="org.richfaces.framework" name="richfaces-api" rev="3.1.4.GA" conf="provided->default" />
<dependency org="org.richfaces.framework" name="richfaces-api" rev="3.1.4.GA" conf="optional->default" />
<!-- JSF 1.2 dependencies -->
<dependency org="javax.faces" name="jsf-api" rev="1.2.08" conf="compile, jsf12->default" />
@@ -40,12 +40,12 @@
<dependency org="org.apache.myfaces.core" name="myfaces-impl" rev="1.1.5" conf="jsf11->default" />
<!-- test dependencies -->
<dependency org="org.junit" name="junit" rev="3.8.2" conf="test->default" />
<dependency org="org.apache.logging" name="log4j" rev="1.2.15" conf="test->default" />
<dependency org="org.apache.shale" name="shale-test" rev="1.0.4" conf="test->default" />
<dependency org="org.easymock" name="easymock" rev="2.3" conf="test->default" />
<dependency org="org.jboss.seam" name="jboss-el" rev="2.0.0.GA" conf="test->default"/>
<dependency org="org.apache.shale" name="shale-test" rev="1.0.4" conf="test->default" />
<dependency org="org.springframework" name="spring-test" rev="2.5.2" conf="test->default" />
<dependency org="org.junit" name="junit" rev="3.8.2" conf="test->default" />
<dependency org="org.springframework" name="spring-test" rev="2.5.3" conf="test->default" />
</dependencies>

6
spring-js/ivy.xml
View File

@@ -22,16 +22,16 @@
<dependencies>
<!-- global dependencies -->
<dependency org="org.apache" name="commons-logging" rev="1.1.1" conf="compile->default"/>
<dependency org="org.springframework" name="spring-core" rev="2.5.2" conf="compile->default"/>
<dependency org="org.springframework" name="spring-core" rev="2.5.3" conf="compile->default"/>
<!-- build time only dependencies -->
<dependency org="javax.servlet" name="servlet-api" rev="2.4" conf="provided->default" />
<!-- test dependencies -->
<dependency org="org.junit" name="junit" rev="3.8.2" conf="test->default" />
<dependency org="org.apache.logging" name="log4j" rev="1.2.15" conf="test->default" />
<dependency org="org.easymock" name="easymock" rev="2.3" conf="test->default" />
<dependency org="org.springframework" name="spring-test" rev="2.5.2" conf="test->default" />
<dependency org="org.junit" name="junit" rev="3.8.2" conf="test->default" />
<dependency org="org.springframework" name="spring-test" rev="2.5.3" conf="test->default" />
</dependencies>

199
spring-js/pom.xml
View File

@@ -1,199 +0,0 @@
<?xml version="1.0"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework</groupId>
<artifactId>spring-faces</artifactId>
<packaging>jar</packaging>
<name>Spring Faces</name>
<version>2.0-rc1-SNAPSHOT</version>
<description>Spring Faces Framework</description>
<url>http://www.springframework.org</url>
<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
</licenses>
<repositories>
<repository>
<id>java.net</id>
<url>http://download.java.net/maven/1</url>
<layout>legacy</layout>
</repository>
<repository>
<id>jboss</id>
<url>http://repository.jboss.com/maven2</url>
</repository>
<repository>
<id>openqa</id>
<name>OpenQA Repository</name>
<url>http://maven.openqa.org</url>
<layout>default</layout>
</repository>
<repository>
<id>spring-snapshot</id>
<name>Spring Portfolio Snapshot Repository</name>
<url>http://s3.amazonaws.com/maven.springframework.org/snapshot</url>
</repository>
</repositories>
<scm>
<connection>scm:svn:https://svn.sourceforge.net/svnroot/springframework/spring-webflow</connection>
<developerConnection>scm:svn:https://svn.sourceforge.net/svnroot/springframework/spring-webflow</developerConnection>
<url>http://svn.sourceforge.net/viewcvs.cgi/springframework/spring-webflow</url>
</scm>
<organization>
<name>Spring Framework</name>
<url>http://www.springframework.org/</url>
</organization>
<dependencies>
<!-- External Dependencies -->
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.3</version>
</dependency>
<dependency>
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
<version>1.8</version>
</dependency>
<dependency>
<groupId>commons-discovery</groupId>
<artifactId>commons-discovery</artifactId>
<version>0.4</version>
</dependency>
<dependency>
<groupId>concurrent</groupId>
<artifactId>concurrent</artifactId>
<version>1.3.4</version>
</dependency>
<dependency>
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
<version>1.0</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.4</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-api</artifactId>
<version>1.2_06</version>
</dependency>
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-impl</artifactId>
<version>1.2_06</version>
</dependency>
<!-- <dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
<version>1.2.2</version>
</dependency>
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
<version>1.2.2</version>
</dependency>-->
<dependency>
<groupId>com.sun.facelets</groupId>
<artifactId>jsf-facelets</artifactId>
<version>1.1.13</version>
</dependency>
<dependency>
<groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-api</artifactId>
<version>3.1.4.GA</version>
<optional>true</optional>
</dependency>
<!-- Spring Dependencies -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webflow</artifactId>
<version>${project.version}</version>
</dependency>
<!-- Runtime Dependencies -->
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.14</version>
<scope>runtime</scope>
<optional>true</optional>
</dependency>
<!-- Test Dependencies -->
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<version>2.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-el</artifactId>
<version>2.0.0.GA</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.shale</groupId>
<artifactId>shale-test</artifactId>
<version>1.0.4</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>2.5.2-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.openqa.selenium.client-drivers</groupId>
<artifactId>selenium-java-client-driver</artifactId>
<version>0.9.2</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<includes>
<include>**/*Tests.java</include>
</includes>
</configuration>
</plugin>
</plugins>
<resources>
<resource>
<directory>src/main/java</directory>
<excludes>
<exclude>**/*.java</exclude>
</excludes>
</resource>
</resources>
<testResources>
<testResource>
<directory>src/etc/test-resources</directory>
<includes>
<include>**/*.*</include>
</includes>
</testResource>
<testResource>
<directory>src/test/java</directory>
<excludes>
<exclude>**/*.java</exclude>
</excludes>
</testResource>
</testResources>
</build>
</project>

12
spring-webflow-samples/booking-faces/ivy.xml
View File

@@ -38,10 +38,10 @@
<dependency org="org.jboss" name="jboss-common-core" rev="2.0.4.GA" conf="compile->default"/>
<dependency org="org.jboss" name="javassist" rev="3.3.ga" conf="compile->default"/>
<dependency org="org.jboss.seam" name="jboss-el" rev="2.0.0.GA" conf="compile->default"/>
<dependency org="org.springframework" name="spring-aop" rev="2.5.2" conf="compile->default"/>
<dependency org="org.springframework" name="spring-jdbc" rev="2.5.2" conf="compile->default"/>
<dependency org="org.springframework" name="spring-orm" rev="2.5.2" conf="compile->default"/>
<dependency org="org.springframework" name="spring-tx" rev="2.5.2" conf="compile->default"/>
<dependency org="org.springframework" name="spring-aop" rev="2.5.3" conf="compile->default"/>
<dependency org="org.springframework" name="spring-jdbc" rev="2.5.3" conf="compile->default"/>
<dependency org="org.springframework" name="spring-orm" rev="2.5.3" conf="compile->default"/>
<dependency org="org.springframework" name="spring-tx" rev="2.5.3" conf="compile->default"/>
<dependency org="org.springframework.security" name="spring-security-core" rev="2.0.0.m2" conf="compile->default"/>
<dependency org="org.springframework.webflow" name="spring-faces" rev="latest.integration" conf="compile->jsf12"/>
<dependency org="org.springframework.webflow" name="spring-js" rev="latest.integration" conf="compile->compile"/>
@@ -52,13 +52,13 @@
<dependency org="edu.oswego.cs" name="concurrent" rev="1.3.4" conf="compile->default"/>
<!-- build-time only dependencies -->
<dependency org="javax.servlet" name="servlet-api" rev="2.4" conf="provided->default"/>
<dependency org="javax.el" name="el-api" rev="1.0" conf="provided->default"/>
<dependency org="javax.servlet" name="servlet-api" rev="2.4" conf="provided->default"/>
<!-- test-time only dependencies -->
<dependency org="org.junit" name="junit" rev="3.8.2" conf="test->default"/>
<dependency org="org.easymock" name="easymock" rev="2.3" conf="test->default" />
<dependency org="org.springframework" name="spring-test" rev="2.5.2" conf="test->default"/>
<dependency org="org.springframework" name="spring-test" rev="2.5.3" conf="test->default"/>
</dependencies>
</ivy-module>

10
spring-webflow-samples/booking-mvc/ivy.xml
View File

@@ -42,10 +42,10 @@
<dependency org="org.jboss" name="jboss-common-core" rev="2.0.4.GA" conf="compile->default"/>
<dependency org="org.jboss" name="javassist" rev="3.3.ga" conf="compile->default"/>
<dependency org="org.ognl" name="ognl" rev="2.6.9" conf="compile->default"/>
<dependency org="org.springframework" name="spring-aop" rev="2.5.2" conf="compile->default"/>
<dependency org="org.springframework" name="spring-jdbc" rev="2.5.2" conf="compile->default"/>
<dependency org="org.springframework" name="spring-orm" rev="2.5.2" conf="compile->default"/>
<dependency org="org.springframework" name="spring-tx" rev="2.5.2" conf="compile->default"/>
<dependency org="org.springframework" name="spring-aop" rev="2.5.3" conf="compile->default"/>
<dependency org="org.springframework" name="spring-jdbc" rev="2.5.3" conf="compile->default"/>
<dependency org="org.springframework" name="spring-orm" rev="2.5.3" conf="compile->default"/>
<dependency org="org.springframework" name="spring-tx" rev="2.5.3" conf="compile->default"/>
<dependency org="org.springframework.security" name="spring-security-core" rev="2.0.0.m2"/>
<dependency org="org.springframework.security" name="spring-security-taglibs" rev="2.0.0.m2"/>
<dependency org="org.springframework.webflow" name="spring-js" rev="latest.integration" conf="compile->compile"/>
@@ -61,7 +61,7 @@
<!-- test-time only dependencies -->
<dependency org="org.junit" name="junit" rev="3.8.2" conf="test->default"/>
<dependency org="org.easymock" name="easymock" rev="2.3" conf="test->default" />
<dependency org="org.springframework" name="spring-test" rev="2.5.2" conf="test->default"/>
<dependency org="org.springframework" name="spring-test" rev="2.5.3" conf="test->default"/>
</dependencies>
</ivy-module>

58
spring-webflow/ivy.xml
View File

@@ -22,49 +22,43 @@
<dependencies>
<!-- global (core) dependencies -->
<dependency org="org.apache" name="commons-logging" rev="1.1.1" conf="compile->default"/>
<!-- Xerces and XML-apis are required only under JDK 1.4 for XSD support -->
<!-- Note: POMs are incorrect in m2 repo; ignoring since they are optional anyway
<dependency org="xerces" name="xercesImpl" rev="2.8.0"/>
<dependency org="xml-apis" name="xml-apis" rev="1.3.03"/>
-->
<dependency org="org.springframework" name="spring-beans" rev="2.5.2" conf="compile->default"/>
<dependency org="org.springframework" name="spring-beans" rev="2.5.3" conf="compile->default"/>
<dependency org="org.springframework" name="spring-core" rev="2.5.3" conf="compile->default"/>
<dependency org="org.springframework" name="spring-context" rev="2.5.3" conf="compile->default"/>
<dependency org="org.springframework" name="spring-web" rev="2.5.3" conf="compile->default"/>
<dependency org="org.springframework" name="spring-webmvc" rev="2.5.3" conf="compile->default"/>
<dependency org="org.springframework.webflow" name="spring-binding" rev="latest.integration" conf="compile->compile"/>
<dependency org="org.springframework" name="spring-core" rev="2.5.2" conf="compile->default"/>
<dependency org="org.springframework" name="spring-context" rev="2.5.2" conf="compile->default"/>
<dependency org="org.springframework" name="spring-web" rev="2.5.2" conf="compile->default"/>
<dependency org="org.springframework" name="spring-webmvc" rev="2.5.2" conf="compile->default"/>
<!-- testing support only dependencies -->
<dependency org="org.junit" name="junit" rev="3.8.2" conf="compile, test->default" />
<!-- build time only dependencies -->
<dependency org="javax.servlet" name="servlet-api" rev="2.4" conf="provided->default" />
<dependency org="javax.portlet" name="portlet-api" rev="1.0" conf="provided->default" />
<dependency org="edu.emory.mathcs" name="backport-util-concurrent" rev="3.0.0" conf="optional->default" />
<dependency org="javax.el" name="el-api" rev="1.0" conf="provided->default" />
<dependency org="org.ognl" name="ognl" rev="2.6.9" conf="compile->default" />
<dependency org="org.springframework" name="spring-orm" rev="2.5.2" conf="compile->default" />
<dependency org="org.springframework" name="spring-webmvc-portlet" rev="2.5.2" conf="compile->default" />
<dependency org="org.springframework" name="spring-tx" rev="2.5.2" conf="compile->default" />
<dependency org="org.springframework.security" name="spring-security-core" rev="2.0.0.m2" conf="compile->default" />
<dependency org="javax.persistence" name="persistence-api" rev="1.0.0" conf="compile->default" />
<dependency org="edu.emory.mathcs" name="backport-util-concurrent" rev="3.0.0" conf="compile->default" />
<dependency org="javax.portlet" name="portlet-api" rev="1.0" conf="provided->default" />
<dependency org="javax.servlet" name="servlet-api" rev="2.4" conf="provided->default" />
<dependency org="org.hibernate" name="hibernate" rev="3.2.5.ga" conf="optional, test->default" />
<dependency org="org.ognl" name="ognl" rev="2.6.9" conf="optional->default" />
<dependency org="org.springframework" name="spring-orm" rev="2.5.3" conf="optional->default" />
<dependency org="org.springframework" name="spring-webmvc-portlet" rev="2.5.3" conf="optional->default" />
<dependency org="org.springframework" name="spring-tx" rev="2.5.3" conf="optional->default" />
<dependency org="org.springframework.security" name="spring-security-core" rev="2.0.0.m2" conf="optional->default" />
<!-- test time only dependencies -->
<dependency org="org.hsqldb" name="hsqldb" rev="1.8.0.9" conf="test->default" />
<dependency org="org.apache.logging" name="log4j" rev="1.2.15" conf="test->default" />
<dependency org="org.jboss.seam" name="jboss-el" rev="2.0.0.GA" conf="test->default"/>
<dependency org="org.easymock" name="easymock" rev="2.3" conf="test->default" />
<dependency org="org.aopalliance" name="aopalliance" rev="1.0" conf="test->default"/>
<dependency org="org.springframework" name="spring-aop" rev="2.5.2" conf="test->default" />
<dependency org="org.springframework" name="spring-jdbc" rev="2.5.2" conf="test->default" />
<dependency org="org.springframework" name="spring-test" rev="2.5.2" conf="test->default" />
<dependency org="org.hibernate" name="hibernate" rev="3.2.5.ga" conf="compile, test->default" />
<dependency org="org.apache.openjpa" name="openjpa" rev="1.0.2" conf="test->default"/>
<!-- lang and serp are required by open jpa -->
<dependency org="org.apache.commons" name="commons-lang" rev="2.1" conf="test->default" />
<dependency org="org.apache.commons" name="commons-collections" rev="3.2" conf="test->default" />
<dependency org="net.sf.cglib" name="cglib_nodep" rev="2.1.3" conf="test->default"/>
<dependency org="net.sourceforge.serp" name="serp" rev="1.13.1" conf="test->default" />
</dependencies>
<dependency org="org.aopalliance" name="aopalliance" rev="1.0" conf="test->default"/>
<dependency org="org.apache.commons" name="commons-lang" rev="2.1" conf="test->default" />
<dependency org="org.apache.commons" name="commons-collections" rev="3.2" conf="test->default" />
<dependency org="org.apache.logging" name="log4j" rev="1.2.15" conf="test->default" />
<dependency org="org.apache.openjpa" name="openjpa" rev="1.0.2" conf="test->default"/>
<dependency org="org.easymock" name="easymock" rev="2.3" conf="test->default" />
<dependency org="org.hsqldb" name="hsqldb" rev="1.8.0.9" conf="test->default" />
<dependency org="org.jboss.seam" name="jboss-el" rev="2.0.0.GA" conf="test->default"/>
<dependency org="org.springframework" name="spring-aop" rev="2.5.3" conf="test->default" />
<dependency org="org.springframework" name="spring-jdbc" rev="2.5.3" conf="test->default" />
<dependency org="org.springframework" name="spring-test" rev="2.5.3" conf="test->default" />
</dependencies>
</ivy-module>