From c583486629bb072cf04abd372a56163e86dd0170 Mon Sep 17 00:00:00 2001
From: Keith Donald <kdonald@vmware.com>
Date: Sat, 8 Mar 2008 06:04:25 +0000
Subject: [PATCH] make ognl optional

---
 spring-binding/.classpath | 6 +++---
 spring-binding/ivy.xml    | 2 +-
 spring-binding/pom.xml    | 2 +-
 spring-faces/.classpath   | 1 -
 spring-webflow/.classpath | 2 +-
 spring-webflow/ivy.xml    | 6 +++---
 spring-webflow/pom.xml    | 9 ++++++++-
 7 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/spring-binding/.classpath b/spring-binding/.classpath
index c8b8a09e..d6225dc7 100644
--- a/spring-binding/.classpath
+++ b/spring-binding/.classpath
@@ -6,12 +6,12 @@
 	<classpathentry kind="lib" path="lib/test/easymock.jar"/>
 	<classpathentry kind="lib" path="lib/test/junit.jar"/>
 	<classpathentry kind="lib" path="lib/global/commons-logging.jar"/>
+	<classpathentry kind="lib" path="lib/buildtime/el-api.jar"/>
 	<classpathentry kind="lib" path="lib/test/log4j.jar"/>
+	<classpathentry kind="lib" path="lib/test/jboss-el.jar"/>
+	<classpathentry kind="lib" path="lib/buildtime/ognl.jar"/>
 	<classpathentry kind="lib" path="lib/global/spring-core.jar"/>
 	<classpathentry kind="lib" path="lib/global/spring-beans.jar" sourcepath="/spring"/>
-	<classpathentry kind="lib" path="lib/global/ognl.jar"/>
 	<classpathentry kind="lib" path="lib/global/spring-context.jar"/>
-	<classpathentry kind="lib" path="lib/buildtime/el-api.jar"/>
-	<classpathentry kind="lib" path="lib/test/jboss-el.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/spring-binding/ivy.xml b/spring-binding/ivy.xml
index 070ea934..d6e05210 100644
--- a/spring-binding/ivy.xml
+++ b/spring-binding/ivy.xml
@@ -12,12 +12,12 @@
 	<dependencies defaultconf="global->default">
 		<!-- global dependencies -->
 		<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.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="ognl" name="ognl" rev="2.6.9" conf="buildtime->default"/>
 		<dependency org="javax.el" name="el-api" rev="1.0" conf="buildtime->default"/>
 		
 		<!-- test dependencies -->
diff --git a/spring-binding/pom.xml b/spring-binding/pom.xml
index 4cc90a01..1fd844bd 100644
--- a/spring-binding/pom.xml
+++ b/spring-binding/pom.xml
@@ -41,7 +41,7 @@
 			<groupId>javax.el</groupId>
 			<artifactId>el-api</artifactId>
 			<version>1.0</version>
-			<optional>true</optional>
+			<scope>provided</scope>
 		</dependency>
 <!-- Spring Dependencies -->
 		<dependency>
diff --git a/spring-faces/.classpath b/spring-faces/.classpath
index 238f0410..d8828ae9 100644
--- a/spring-faces/.classpath
+++ b/spring-faces/.classpath
@@ -6,7 +6,6 @@
 	<classpathentry combineaccessrules="false" kind="src" path="/spring-webflow"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="lib" path="lib/global/commons-logging.jar"/>
-	<classpathentry kind="lib" path="lib/global/ognl.jar"/>
 	<classpathentry kind="lib" path="lib/global/spring-beans.jar"/>
 	<classpathentry kind="lib" path="lib/global/spring-context.jar"/>
 	<classpathentry kind="lib" path="lib/global/spring-core.jar"/>
diff --git a/spring-webflow/.classpath b/spring-webflow/.classpath
index c30ae543..ac4b0064 100644
--- a/spring-webflow/.classpath
+++ b/spring-webflow/.classpath
@@ -24,7 +24,7 @@
 	<classpathentry kind="lib" path="lib/test/jboss-el.jar"/>
 	<classpathentry kind="lib" path="lib/buildtime/jta.jar"/>
 	<classpathentry kind="lib" path="lib/buildtime/junit.jar"/>
-	<classpathentry kind="lib" path="lib/global/ognl.jar"/>
+	<classpathentry kind="lib" path="lib/buildtime/ognl.jar"/>
 	<classpathentry kind="lib" path="lib/test/openjpa.jar"/>
 	<classpathentry kind="lib" path="lib/buildtime/persistence-api.jar"/>
 	<classpathentry kind="lib" path="lib/buildtime/portlet-api.jar"/>
diff --git a/spring-webflow/ivy.xml b/spring-webflow/ivy.xml
index 1f65762f..bd7d24d5 100644
--- a/spring-webflow/ivy.xml
+++ b/spring-webflow/ivy.xml
@@ -19,7 +19,6 @@
 	<dependencies defaultconf="global->default">
 		<!--  global (core) dependencies -->
 		<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"/>
@@ -30,8 +29,7 @@
 		<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" />
-		<dependency org="org.springframework" name="spring-webmvc" rev="2.5.2" conf="buildtime, mvc->default" />
-		<dependency org="org.springframework" name="spring-webmvc-portlet" rev="2.5.2" conf="buildtime, portlet->default" />
+		<dependency org="org.springframework" name="spring-webmvc" rev="2.5.2" />
 
 		<!-- testing support only dependencies -->
 		<dependency org="junit" name="junit" rev="3.8.2" conf="buildtime, testing->default" />
@@ -40,7 +38,9 @@
 		<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="ognl" name="ognl" rev="2.6.9" conf="buildtime->default" />
 		<dependency org="org.springframework" name="spring-orm" rev="2.5.2" conf="buildtime->default" />
+		<dependency org="org.springframework" name="spring-webmvc-portlet" rev="2.5.2" conf="buildtime, portlet->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" />
diff --git a/spring-webflow/pom.xml b/spring-webflow/pom.xml
index b805d103..76e80ac2 100644
--- a/spring-webflow/pom.xml
+++ b/spring-webflow/pom.xml
@@ -37,6 +37,12 @@
 			<version>1.3.4</version>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+			<groupId>javax.el</groupId>
+			<artifactId>el-api</artifactId>
+			<version>1.0</version>
+			<scope>provided</scope>
+		</dependency>
 		<dependency>
 			<groupId>javax.persistence</groupId>
 			<artifactId>persistence-api</artifactId>
@@ -48,7 +54,7 @@
 			<artifactId>portlet-api</artifactId>
 			<version>1.0</version>
 			<scope>provided</scope>
-		</dependency>
+		</dependency>
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>servlet-api</artifactId>
@@ -65,6 +71,7 @@
 			<groupId>ognl</groupId>
 			<artifactId>ognl</artifactId>
 			<version>2.6.9</version>
+			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>org.hibernate</groupId>