From 50c517472963eb4400f704c2cb8f604bbea69197 Mon Sep 17 00:00:00 2001
From: Jeremy Grelle <jgrelle@vmware.com>
Date: Tue, 31 Jul 2007 23:12:55 +0000
Subject: [PATCH] Added javax.el dependency and changed MyFaces to 1.2.0.

---
 spring-webflow/.classpath | 1 +
 spring-webflow/ivy.xml    | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/spring-webflow/.classpath b/spring-webflow/.classpath
index d372b1ec..3cb0bef3 100644
--- a/spring-webflow/.classpath
+++ b/spring-webflow/.classpath
@@ -33,6 +33,7 @@
 	<classpathentry kind="lib" path="lib/buildtime/jta.jar"/>
 	<classpathentry kind="lib" path="lib/test/spring-jdbc.jar"/>
 	<classpathentry kind="lib" path="lib/test/spring-mock.jar" sourcepath="/spring/mock"/>
+	<classpathentry kind="lib" path="lib/global/el-api.jar"/>
 	<classpathentry kind="lib" path="lib/buildtime/persistence-api.jar"/>
 	<classpathentry kind="lib" path="lib/buildtime/spring-jpa.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/spring-webflow/ivy.xml b/spring-webflow/ivy.xml
index 3ec50af5..69b546ea 100644
--- a/spring-webflow/ivy.xml
+++ b/spring-webflow/ivy.xml
@@ -22,6 +22,7 @@
 		<!--  global (core) dependencies -->
 		<dependency org="commons-logging" name="commons-logging" rev="1.0.4" />
 		<dependency org="ognl" name="ognl" rev="2.6.9" />
+		<dependency org="javax.el" name="el-api" rev="1.0"/>
 		<!-- 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"/>
@@ -48,8 +49,8 @@
 
 		<!-- JSF-only dependencies -->
 		<!-- note that at this time we depend on MyFaces, not JSF-RI -->
-		<dependency org="org.apache.myfaces.core" name="myfaces-api" rev="1.1.4" conf="buildtime, jsf->default" />
-		<dependency org="org.apache.myfaces.core" name="myfaces-impl" rev="1.1.4" conf="buildtime, jsf->default" />
+		<dependency org="org.apache.myfaces.core" name="myfaces-api" rev="1.2.0" conf="buildtime, jsf->default"/>
+		<dependency org="org.apache.myfaces.core" name="myfaces-impl" rev="1.2.0" conf="buildtime, jsf->default"/>
 
 		<!-- build time only dependencies -->
 		<dependency org="concurrent" name="concurrent" rev="1.3.4" conf="buildtime->default" />