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

upgrade to spring 2.5.2 and commons-logging 1.1.1

Browse Source
This commit is contained in:
Keith Donald
2008-03-02 18:45:52 +00:00
parent 4bebc59460
commit 04de52e9cb
5 changed files with 27 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
spring-binding/ivy.xml
View File

@@ -11,16 +11,11 @@
<dependencies defaultconf="global->default">
<!-- global dependencies -->
<dependency org="commons-logging" name="commons-logging" rev="1.1">
<exclude module="log4j"/>
<exclude module="logkit"/>
<exclude module="avalon-framework"/>
<exclude module="servlet-api"/>
</dependency>
<dependency org="commons-logging" name="commons-logging" rev="1.1.1" />
<dependency org="ognl" name="ognl" rev="2.6.9" />
<dependency org="org.springframework" name="spring-beans" rev="2.5.1" />
<dependency org="org.springframework" name="spring-context" rev="2.5.1" />
<dependency org="org.springframework" name="spring-core" rev="2.5.1" />
<dependency org="org.springframework" name="spring-beans" rev="2.5.2" />
<dependency org="org.springframework" name="spring-context" rev="2.5.2" />
<dependency org="org.springframework" name="spring-core" rev="2.5.2" />
<!-- build time only dependencies -->
<dependency org="javax.el" name="el-api" rev="1.0" conf="buildtime->default"/>

10
spring-faces/ivy.xml
View File

@@ -15,12 +15,7 @@
<dependencies defaultconf="global->default">
<!-- global dependencies -->
<dependency org="commons-logging" name="commons-logging" rev="1.1">
<exclude module="log4j"/>
<exclude module="logkit"/>
<exclude module="avalon-framework"/>
<exclude module="servlet-api"/>
</dependency>
<dependency org="commons-logging" name="commons-logging" rev="1.1.1" />
<dependency org="org.springframework" name="spring-webflow" rev="latest.integration" />
<!-- build time only dependencies -->
@@ -47,14 +42,13 @@
<dependency org="org.apache.myfaces.core" name="myfaces-api" rev="1.1.5" conf="jsf11->default" />
<dependency org="org.apache.myfaces.core" name="myfaces-impl" rev="1.1.5" conf="jsf11->default" />
<!-- test dependencies -->
<dependency org="junit" name="junit" rev="3.8.2" conf="test->default" />
<dependency org="log4j" name="log4j" rev="1.2.14" conf="test->default" />
<dependency org="org.easymock" name="easymock" rev="2.3" conf="test->default" />
<dependency org="jboss" name="jboss-el" rev="1.0" 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.1" conf="test->default" />
<dependency org="org.springframework" name="spring-test" rev="2.5.2" conf="test->default" />
</dependencies>

2
spring-webflow-samples/booking-faces/build.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<project name="swf-booking-jsf" default="dist">
<project name="swf-booking-faces" default="dist">
<property file="build.properties" />
<property file="project.properties" />

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

@@ -1,6 +1,6 @@
<ivy-module version="1.1">
<info organisation="org.springframework" module="swf-booking-jsf"/>
<info organisation="org.springframework" module="swf-booking-faces"/>
<configurations>
<conf name="default" extends="global"/>
@@ -18,10 +18,10 @@
<dependency org="aopalliance" name="aopalliance" rev="1.0" />
<dependency org="org.springframework" name="spring-faces" rev="latest.integration" conf="global->jsf12"/>
<dependency org="org.springframework" name="spring-webflow" rev="latest.integration" conf="global->default"/>
<dependency org="org.springframework" name="spring-aop" rev="2.5.1"/>
<dependency org="org.springframework" name="spring-orm" rev="2.5.1"/>
<dependency org="org.springframework" name="spring-jdbc" rev="2.5.1"/>
<dependency org="org.springframework" name="spring-tx" rev="2.5.1"/>
<dependency org="org.springframework" name="spring-aop" rev="2.5.2"/>
<dependency org="org.springframework" name="spring-orm" rev="2.5.2"/>
<dependency org="org.springframework" name="spring-jdbc" rev="2.5.2"/>
<dependency org="org.springframework" name="spring-tx" rev="2.5.2"/>
<dependency org="jboss" name="jboss-el" rev="1.0"/>
<dependency org="org.hibernate" name="hibernate" rev="3.2.5.ga" />
<dependency org="org.hibernate" name="hibernate-entitymanager" rev="3.3.1.ga"/>
@@ -37,7 +37,7 @@
<!-- test-time only dependencies -->
<dependency org="junit" name="junit" rev="3.8.2" conf="test->default" />
<dependency org="org.springframework" name="spring-test" rev="2.5.1" conf="test->default"/>
<dependency org="org.springframework" name="spring-test" rev="2.5.2" conf="test->default"/>
</dependencies>
</ivy-module>

33
spring-webflow/ivy.xml
View File

@@ -19,43 +19,38 @@
<dependencies defaultconf="global->default">
<!-- global (core) dependencies -->
<dependency org="commons-logging" name="commons-logging" rev="1.1">
<exclude module="log4j"/>
<exclude module="logkit"/>
<exclude module="avalon-framework"/>
<exclude module="servlet-api"/>
</dependency>
<dependency org="commons-logging" name="commons-logging" rev="1.1.1" />
<dependency org="ognl" name="ognl" rev="2.6.9" />
<!-- 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.1" />
<dependency org="org.springframework" name="spring-beans" rev="2.5.2" />
<dependency org="org.springframework" name="spring-binding" rev="latest.integration" />
<dependency org="org.springframework" name="spring-core" rev="2.5.1" />
<dependency org="org.springframework" name="spring-context" rev="2.5.1" />
<dependency org="org.springframework" name="spring-web" rev="2.5.1" />
<dependency org="org.springframework" name="spring-core" rev="2.5.2" />
<dependency org="org.springframework" name="spring-context" rev="2.5.2" />
<dependency org="org.springframework" name="spring-web" rev="2.5.2" />
<!-- 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.5.1" conf="buildtime, mvc->default" />
<dependency org="org.springframework" name="spring-webmvc" rev="2.5.2" conf="buildtime, mvc->default" />
<!-- spring portlet mvc only dependencies -->
<dependency org="org.springframework" name="spring-webmvc-portlet" rev="2.5.1" conf="buildtime, portlet->default" />
<dependency org="org.springframework" name="spring-webmvc-portlet" rev="2.5.2" 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-webmvc-struts" rev="2.5.1" conf="buildtime, struts->default" />
<dependency org="org.springframework" name="spring-webmvc-struts" rev="2.5.2" conf="buildtime, struts->default" />
<!-- build time only dependencies -->
<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="javax.el" name="el-api" rev="1.0" conf="buildtime->default" />
<dependency org="org.springframework" name="spring-orm" rev="2.5.1" conf="buildtime->default" />
<dependency org="org.springframework" name="spring-tx" rev="2.5.1" conf="buildtime->default" />
<dependency org="org.springframework" name="spring-orm" rev="2.5.2" conf="buildtime->default" />
<dependency org="org.springframework" name="spring-tx" rev="2.5.2" conf="buildtime->default" />
<dependency org="org.springframework.security" name="spring-security-core" rev="2.0-M2" conf="buildtime->default" />
<dependency org="javax.persistence" name="persistence-api" rev="1.0b" conf="buildtime->default" />
<dependency org="concurrent" name="concurrent" rev="1.3.4" conf="buildtime->default" />
@@ -67,11 +62,11 @@
<dependency org="org.easymock" name="easymock" rev="2.3" conf="test->default" />
<dependency org="com.cenqua.clover" name="clover" rev="1.3.12" conf="test->default" />
<dependency org="aopalliance" name="aopalliance" rev="1.0" conf="test->default"/>
<dependency org="org.springframework" name="spring-aop" rev="2.5.1" conf="test->default" />
<dependency org="org.springframework" name="spring-jdbc" rev="2.5.1" conf="test->default" />
<dependency org="org.springframework" name="spring-test" rev="2.5.1" 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="buildtime, test->default" />
<dependency org="org.apache.openjpa" name="openjpa" rev="1.0.1" conf="test->default">
<dependency org="org.apache.openjpa" name="openjpa" rev="1.0.2" conf="test->default">
<!-- Exclusions required because open jpa pom is poorly designed -->
<exclude module="openjpa-lib" />
<exclude module="openjpa-kernel" />