From 086f2fa6333b407c940dfb9f9df9b3e5fdadb387 Mon Sep 17 00:00:00 2001
From: Keith Donald <kdonald@vmware.com>
Date: Mon, 20 Oct 2008 14:29:57 +0000
Subject: [PATCH] pom polish

---
 spring-binding/pom.xml                       |  9 ++++--
 spring-faces/pom.xml                         | 13 ++++----
 spring-js/pom.xml                            | 31 ++++++++++++++++----
 spring-webflow-samples/booking-faces/ivy.xml |  2 +-
 spring-webflow-samples/booking-faces/pom.xml |  2 +-
 spring-webflow-samples/booking-mvc/ivy.xml   |  4 +--
 spring-webflow-samples/booking-mvc/pom.xml   |  4 +--
 spring-webflow/ivy.xml                       |  2 +-
 spring-webflow/pom.xml                       | 21 +++++++------
 9 files changed, 59 insertions(+), 29 deletions(-)

diff --git a/spring-binding/pom.xml b/spring-binding/pom.xml
index 50f35691..e4787c5c 100644
--- a/spring-binding/pom.xml
+++ b/spring-binding/pom.xml
@@ -15,17 +15,17 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-beans</artifactId>
-			<version>2.5.5</version>
+			<version>${spring.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-context</artifactId>
-			<version>2.5.5</version>
+			<version>${spring.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-core</artifactId>
-			<version>2.5.5</version>
+			<version>${spring.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>ognl</groupId>
@@ -40,4 +40,7 @@
 			<scope>provided</scope>
 		</dependency>
 	</dependencies>
+	<properties>
+		<spring.version>2.5.5</spring.version>
+	</properties>	
 </project>
\ No newline at end of file
diff --git a/spring-faces/pom.xml b/spring-faces/pom.xml
index d0920873..29d35d8f 100644
--- a/spring-faces/pom.xml
+++ b/spring-faces/pom.xml
@@ -15,27 +15,27 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-beans</artifactId>
-			<version>2.5.5</version>
+			<version>${spring.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-context</artifactId>
-			<version>2.5.5</version>
+			<version>${spring.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-core</artifactId>
-			<version>2.5.5</version>
+			<version>${spring.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-web</artifactId>
-			<version>2.5.5</version>
+			<version>${spring.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-webmvc</artifactId>
-			<version>2.5.5</version>
+			<version>${spring.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.webflow</groupId>
@@ -89,4 +89,7 @@
 			<scope>provided</scope>
 		</dependency>
 	</dependencies>
+	<properties>
+		<spring.version>2.5.5</spring.version>
+	</properties>	
 </project>
\ No newline at end of file
diff --git a/spring-js/pom.xml b/spring-js/pom.xml
index 04dc746b..f03da233 100644
--- a/spring-js/pom.xml
+++ b/spring-js/pom.xml
@@ -15,17 +15,17 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-beans</artifactId>
-			<version>2.5.5</version>
+			<version>${spring.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-context</artifactId>
-			<version>2.5.5</version>
+			<version>${spring.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-core</artifactId>
-			<version>2.5.5</version>
+			<version>${spring.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>javax.servlet</groupId>
@@ -54,14 +54,35 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-web</artifactId>
-			<version>2.5.5</version>
+			<version>${spring.version}</version>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-webmvc</artifactId>
-			<version>2.5.5</version>
+			<version>${spring.version}</version>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+			<groupId>org.easymock</groupId>
+			<artifactId>easymock</artifactId>
+			<version>2.3</version>
+			<scope>test</scope>
+		</dependency>				
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>3.8.2</version>
+			<scope>test</scope>		
+		</dependency>	
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>org.springframework.test</artifactId>
+			<version>${spring.version}</version>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
+	<properties>
+		<spring.version>2.5.5</spring.version>
+	</properties>	
 </project>
\ No newline at end of file
diff --git a/spring-webflow-samples/booking-faces/ivy.xml b/spring-webflow-samples/booking-faces/ivy.xml
index 1a2dfa2d..3e336458 100755
--- a/spring-webflow-samples/booking-faces/ivy.xml
+++ b/spring-webflow-samples/booking-faces/ivy.xml
@@ -42,7 +42,7 @@
 		<dependency org="org.springframework" name="org.springframework.transaction" rev="2.5.5.A" conf="compile->runtime"/>
 		<dependency org="org.springframework" name="org.springframework.web" rev="2.5.5.A" conf="compile->runtime"/>
 		<dependency org="org.springframework" name="org.springframework.web.servlet" rev="2.5.5.A" conf="compile->runtime"/>
-		<dependency org="org.springframework.security" name="org.springframework.security" rev="2.0.2.A" conf="compile->runtime"/>
+		<dependency org="org.springframework.security" name="org.springframework.security" rev="2.0.4.A" conf="compile->runtime"/>
 		<dependency org="org.springframework.webflow" name="org.springframework.faces" rev="latest.integration" conf="compile->jsf12"/>
 		<dependency org="org.springframework.webflow" name="org.springframework.js" rev="latest.integration" conf="compile->runtime"/>
 		<dependency org="org.springframework.webflow" name="org.springframework.webflow" rev="latest.integration" conf="compile->runtime"/>
diff --git a/spring-webflow-samples/booking-faces/pom.xml b/spring-webflow-samples/booking-faces/pom.xml
index ca1f24ca..ae4f881e 100644
--- a/spring-webflow-samples/booking-faces/pom.xml
+++ b/spring-webflow-samples/booking-faces/pom.xml
@@ -105,7 +105,7 @@
 		<dependency>
 			<groupId>org.springframework.security</groupId>
 			<artifactId>org.springframework.security</artifactId>
-			<version>2.0.2.A</version>
+			<version>2.0.4.A</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.webflow</groupId>
diff --git a/spring-webflow-samples/booking-mvc/ivy.xml b/spring-webflow-samples/booking-mvc/ivy.xml
index cd616c8c..70a3fbc7 100755
--- a/spring-webflow-samples/booking-mvc/ivy.xml
+++ b/spring-webflow-samples/booking-mvc/ivy.xml
@@ -46,8 +46,8 @@
 		<dependency org="org.springframework" name="org.springframework.transaction" rev="2.5.5.A" conf="compile->runtime"/>
 		<dependency org="org.springframework" name="org.springframework.web" rev="2.5.5.A" conf="compile->runtime"/>
 		<dependency org="org.springframework" name="org.springframework.web.servlet" rev="2.5.5.A" conf="compile->runtime"/>
-		<dependency org="org.springframework.security" name="org.springframework.security" rev="2.0.2.A" conf="compile->runtime"/>
-		<dependency org="org.springframework.security" name="org.springframework.security.taglibs" rev="2.0.2.A" conf="compile->runtime"/>
+		<dependency org="org.springframework.security" name="org.springframework.security" rev="2.0.4.A" conf="compile->runtime"/>
+		<dependency org="org.springframework.security" name="org.springframework.security.taglibs" rev="2.0.4.A" conf="compile->runtime"/>
  		<dependency org="org.springframework.webflow" name="org.springframework.js" rev="latest.integration" conf="compile->runtime"/>
   		<dependency org="org.springframework.webflow" name="org.springframework.webflow" rev="latest.integration" conf="compile->runtime"/>
 
diff --git a/spring-webflow-samples/booking-mvc/pom.xml b/spring-webflow-samples/booking-mvc/pom.xml
index d2862e26..c7db8a8c 100644
--- a/spring-webflow-samples/booking-mvc/pom.xml
+++ b/spring-webflow-samples/booking-mvc/pom.xml
@@ -125,12 +125,12 @@
 		<dependency>
 			<groupId>org.springframework.security</groupId>
 			<artifactId>org.springframework.security</artifactId>
-			<version>2.0.2.A</version>
+			<version>2.0.4.A</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.security</groupId>
 			<artifactId>org.springframework.security.taglibs</artifactId>
-			<version>2.0.2.A</version>
+			<version>2.0.4.A</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.webflow</groupId>
diff --git a/spring-webflow/ivy.xml b/spring-webflow/ivy.xml
index a89c93b0..6373fb42 100644
--- a/spring-webflow/ivy.xml
+++ b/spring-webflow/ivy.xml
@@ -38,7 +38,7 @@
 		<dependency org="org.springframework" name="org.springframework.web" rev="2.5.5.A" conf="compile->runtime"/>
 		<dependency org="org.springframework" name="org.springframework.web.portlet" rev="2.5.5.A" conf="optional->runtime" />
 		<dependency org="org.springframework" name="org.springframework.web.servlet" rev="2.5.5.A" conf="compile->runtime"/>
-		<dependency org="org.springframework.security" name="org.springframework.security" rev="2.0.2.A" conf="optional->runtime" />
+		<dependency org="org.springframework.security" name="org.springframework.security" rev="2.0.4.A" conf="optional->runtime" />
 		<dependency org="org.springframework.webflow" name="org.springframework.binding" rev="latest.integration" conf="compile->runtime"/>
 		<dependency org="org.springframework.webflow" name="org.springframework.js" rev="latest.integration" conf="compile->runtime"/>
 
diff --git a/spring-webflow/pom.xml b/spring-webflow/pom.xml
index 9429c471..0424e25e 100644
--- a/spring-webflow/pom.xml
+++ b/spring-webflow/pom.xml
@@ -15,27 +15,27 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-beans</artifactId>
-			<version>2.5.5</version>
+			<version>${spring.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-context</artifactId>
-			<version>2.5.5</version>
+			<version>${spring.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-core</artifactId>
-			<version>2.5.5</version>
+			<version>${spring.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-web</artifactId>
-			<version>2.5.5</version>
+			<version>${spring.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-webmvc</artifactId>
-			<version>2.5.5</version>
+			<version>${spring.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.webflow</groupId>
@@ -98,25 +98,25 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-orm</artifactId>
-			<version>2.5.5</version>
+			<version>${spring.version}</version>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-webmvc-portlet</artifactId>
-			<version>2.5.5</version>
+			<version>${spring.version}</version>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-tx</artifactId>
-			<version>2.5.5</version>
+			<version>${spring.version}</version>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.security</groupId>
 			<artifactId>spring-security-core</artifactId>
-			<version>2.0.2</version>
+			<version>2.0.4</version>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
@@ -126,4 +126,7 @@
 			<optional>true</optional>
 		</dependency>       
 	</dependencies>
+	<properties>
+		<spring.version>2.5.5</spring.version>
+	</properties>	
 </project>
\ No newline at end of file