Upgrade SWF trunk to Spring 2.0.6

This commit is contained in:
Ben Hale
2007-06-19 20:43:47 +00:00
parent dd426cd729
commit ab37ee629d
7 changed files with 37 additions and 37 deletions

View File

@@ -13,9 +13,9 @@
<!-- global dependencies -->
<dependency org="commons-logging" name="commons-logging" rev="1.0.4"/>
<dependency org="ognl" name="ognl" rev="2.6.9" />
<dependency org="org.springframework" name="spring-beans" rev="2.0.4" />
<dependency org="org.springframework" name="spring-context" rev="2.0.4" />
<dependency org="org.springframework" name="spring-core" rev="2.0.4" />
<dependency org="org.springframework" name="spring-beans" rev="2.0.6" />
<dependency org="org.springframework" name="spring-context" rev="2.0.6" />
<dependency org="org.springframework" name="spring-core" rev="2.0.6" />
<!-- test dependencies -->
<dependency org="org.easymock" name="easymock" rev="2.2" conf="test->default" />

View File

@@ -40,17 +40,17 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>2.0.4</version>
<version>2.0.6</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>2.0.4</version>
<version>2.0.6</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>2.0.4</version>
<version>2.0.6</version>
</dependency>
<!-- Runtime Dependencies -->
<dependency>

View File

@@ -16,9 +16,9 @@
<dependency org="jstl" name="jstl" rev="1.1.2"/>
<dependency org="aopalliance" name="aopalliance" rev="1.0" />
<dependency org="org.springframework" name="spring-webflow" rev="latest.integration" conf="global->default,jsf"/>
<dependency org="org.springframework" name="spring-aop" rev="2.0.4"/>
<dependency org="org.springframework" name="spring-dao" rev="2.0.4"/>
<dependency org="org.springframework" name="spring-jdbc" rev="2.0.4"/>
<dependency org="org.springframework" name="spring-aop" rev="2.0.6"/>
<dependency org="org.springframework" name="spring-dao" rev="2.0.6"/>
<dependency org="org.springframework" name="spring-jdbc" rev="2.0.6"/>
<dependency org="hsqldb" name="hsqldb" rev="1.8.0.7"/>
<!-- build-time only dependencies -->
@@ -26,7 +26,7 @@
<!-- test-time only dependencies -->
<dependency org="junit" name="junit" rev="3.8.2" conf="test->default" />
<dependency org="org.springframework" name="spring-mock" rev="2.0.4" conf="test->default"/>
<dependency org="org.springframework" name="spring-mock" rev="2.0.6" conf="test->default"/>
</dependencies>
</ivy-module>

View File

@@ -16,9 +16,9 @@
<dependency org="jstl" name="jstl" rev="1.1.2"/>
<dependency org="aopalliance" name="aopalliance" rev="1.0" />
<dependency org="org.springframework" name="spring-webflow" rev="latest.integration"/>
<dependency org="org.springframework" name="spring-aop" rev="2.0.4"/>
<dependency org="org.springframework" name="spring-dao" rev="2.0.4"/>
<dependency org="org.springframework" name="spring-jdbc" rev="2.0.4"/>
<dependency org="org.springframework" name="spring-aop" rev="2.0.6"/>
<dependency org="org.springframework" name="spring-dao" rev="2.0.6"/>
<dependency org="org.springframework" name="spring-jdbc" rev="2.0.6"/>
<dependency org="hsqldb" name="hsqldb" rev="1.8.0.7"/>
<!-- build-time only dependencies -->
@@ -27,7 +27,7 @@
<!-- test-time only dependencies -->
<dependency org="junit" name="junit" rev="3.8.2" conf="test->default" />
<dependency org="org.easymock" name="easymock" rev="2.2" conf="test->default" />
<dependency org="org.springframework" name="spring-mock" rev="2.0.4" conf="test->default"/>
<dependency org="org.springframework" name="spring-mock" rev="2.0.6" conf="test->default"/>
</dependencies>
</ivy-module>

View File

@@ -15,10 +15,10 @@
<dependency org="taglibs" name="standard" rev="1.1.2"/>
<dependency org="jstl" name="jstl" rev="1.1.2"/>
<dependency org="org.springframework" name="spring-webflow" rev="latest.integration"/>
<dependency org="org.springframework" name="spring-aop" rev="2.0.2"/>
<dependency org="org.springframework" name="spring-dao" rev="2.0.2"/>
<dependency org="org.springframework" name="spring-jdbc" rev="2.0.2"/>
<dependency org="org.springframework" name="spring-jpa" rev="2.0.2"/>
<dependency org="org.springframework" name="spring-aop" rev="2.0.6"/>
<dependency org="org.springframework" name="spring-dao" rev="2.0.6"/>
<dependency org="org.springframework" name="spring-jdbc" rev="2.0.6"/>
<dependency org="org.springframework" name="spring-jpa" rev="2.0.6"/>
<dependency org="javax.servlet" name="servlet-api" rev="2.4"/>
<dependency org="javax.persistence" name="persistence-api" rev="1.0"/>
<dependency org="org.hibernate" name="hibernate" rev="3.2.1.ga"/>

View File

@@ -27,24 +27,24 @@
<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.0.4" />
<dependency org="org.springframework" name="spring-beans" rev="2.0.6" />
<dependency org="org.springframework" name="spring-binding" rev="latest.integration" />
<dependency org="org.springframework" name="spring-core" rev="2.0.4" />
<dependency org="org.springframework" name="spring-context" rev="2.0.4" />
<dependency org="org.springframework" name="spring-web" rev="2.0.4" />
<dependency org="org.springframework" name="spring-core" rev="2.0.6" />
<dependency org="org.springframework" name="spring-context" rev="2.0.6" />
<dependency org="org.springframework" name="spring-web" rev="2.0.6" />
<!-- testing support only dependencies -->
<dependency org="junit" name="junit" rev="3.8.2" conf="buildtime, testing->default" />
<!-- spring mvc only dependencies -->
<dependency org="org.springframework" name="spring-webmvc" rev="2.0.4" conf="buildtime, mvc->default" />
<dependency org="org.springframework" name="spring-webmvc" rev="2.0.6" conf="buildtime, mvc->default" />
<!-- spring portlet mvc only dependencies -->
<dependency org="org.springframework" name="spring-portlet" rev="2.0.4" conf="buildtime, portlet->default" />
<dependency org="org.springframework" name="spring-portlet" rev="2.0.6" conf="buildtime, portlet->default" />
<!-- struts only dependencies -->
<dependency org="struts" name="struts" rev="1.2.9" conf="buildtime, struts->default" />
<dependency org="org.springframework" name="spring-struts" rev="2.0.4" conf="buildtime, struts->default" />
<dependency org="org.springframework" name="spring-struts" rev="2.0.6" conf="buildtime, struts->default" />
<!-- JSF-only dependencies -->
<!-- note that at this time we depend on MyFaces, not JSF-RI -->
@@ -56,16 +56,16 @@
<dependency org="javax.servlet" name="servlet-api" rev="2.4" conf="buildtime->default" />
<dependency org="javax.portlet" name="portlet-api" rev="1.0" conf="buildtime->default" />
<dependency org="org.hibernate" name="hibernate" rev="3.2.3.ga" conf="buildtime->default" />
<dependency org="org.springframework" name="spring-dao" rev="2.0.4" conf="buildtime->default" />
<dependency org="org.springframework" name="spring-hibernate3" rev="2.0.4" conf="buildtime->default" />
<dependency org="org.springframework" name="spring-dao" rev="2.0.6" conf="buildtime->default" />
<dependency org="org.springframework" name="spring-hibernate3" rev="2.0.6" conf="buildtime->default" />
<!-- test time only dependencies -->
<dependency org="hsqldb" name="hsqldb" rev="1.8.0.7" conf="test->default" />
<dependency org="log4j" name="log4j" rev="1.2.14" conf="test->default" />
<dependency org="org.easymock" name="easymock" rev="2.2" conf="test->default" />
<dependency org="com.cenqua.clover" name="clover" rev="1.3.12" conf="test->default" />
<dependency org="org.springframework" name="spring-jdbc" rev="2.0.4" conf="test->default" />
<dependency org="org.springframework" name="spring-mock" rev="2.0.4" conf="test->default" />
<dependency org="org.springframework" name="spring-jdbc" rev="2.0.6" conf="test->default" />
<dependency org="org.springframework" name="spring-mock" rev="2.0.6" conf="test->default" />
</dependencies>
</ivy-module>

View File

@@ -82,7 +82,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>2.0.4</version>
<version>2.0.6</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -92,34 +92,34 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>2.0.4</version>
<version>2.0.6</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>2.0.4</version>
<version>2.0.6</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-portlet</artifactId>
<version>2.0.4</version>
<version>2.0.6</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-struts</artifactId>
<version>2.0.4</version>
<version>2.0.6</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>2.0.4</version>
<version>2.0.6</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>2.0.4</version>
<version>2.0.6</version>
<optional>true</optional>
</dependency>
<!-- Runtime Dependencies -->
@@ -146,7 +146,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-mock</artifactId>
<version>2.0.4</version>
<version>2.0.6</version>
<scope>test</scope>
</dependency>
</dependencies>