From bfc364fd1276f848b7fde8937b594638790d1b35 Mon Sep 17 00:00:00 2001
From: Ted Nathan Husted <husted@apache.org>
Date: Wed, 16 Jan 2008 15:24:54 +0000
Subject: [PATCH] WW-2423, WW-2425, WW-2426 Update Spring, DWR, Freemarker, and
 SiteMesh dependencies per patch provided by Al Sutton.

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@612481 13f79535-47bb-0310-9956-ffa450edef68
---
 apps/blank/pom.xml         |  2 +-
 apps/showcase/pom.xml      |  4 ++--
 core/pom.xml               |  8 ++++----
 plugins/codebehind/pom.xml |  4 ++--
 plugins/dojo/pom.xml       |  4 ++--
 plugins/portlet/pom.xml    | 22 +++++++++++-----------
 plugins/sitegraph/pom.xml  |  4 ++--
 plugins/sitemesh/pom.xml   |  2 +-
 plugins/spring/pom.xml     | 10 +++++-----
 plugins/struts1/pom.xml    |  4 ++--
 10 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml
index 645433168..587e4b166 100644
--- a/apps/blank/pom.xml
+++ b/apps/blank/pom.xml
@@ -59,7 +59,7 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
-            <version>2.0.7</version>
+            <version>2.0.8</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml
index 1411c2dc8..cdf5e01a1 100644
--- a/apps/showcase/pom.xml
+++ b/apps/showcase/pom.xml
@@ -133,12 +133,12 @@
         <dependency>
             <groupId>opensymphony</groupId>
             <artifactId>sitemesh</artifactId>
-            <version>2.2.1</version>
+            <version>2.3</version>
         </dependency>
         <dependency>
             <groupId>uk.ltd.getahead</groupId>
             <artifactId>dwr</artifactId>
-            <version>1.1-beta-3</version>
+            <version>1.1.1</version>
         </dependency>
         <dependency>
             <groupId>log4j</groupId>
diff --git a/core/pom.xml b/core/pom.xml
index ac4fe5ba4..f5f175189 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -240,7 +240,7 @@
         <dependency>
             <groupId>org.freemarker</groupId>
             <artifactId>freemarker</artifactId>
-            <version>2.3.10</version>
+            <version>2.3.11</version>
         </dependency>
 
         <dependency>
@@ -267,7 +267,7 @@
         <dependency>
             <groupId>uk.ltd.getahead</groupId>
             <artifactId>dwr</artifactId>
-            <version>1.1-beta-3</version>
+            <version>1.1.1</version>
             <optional>true</optional>
         </dependency>
 
@@ -311,14 +311,14 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-mock</artifactId>
-            <version>2.0.7</version>
+            <version>2.0.8</version>
             <optional>true</optional>
         </dependency>
 
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
-            <version>2.0.7</version>
+            <version>2.0.8</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/plugins/codebehind/pom.xml b/plugins/codebehind/pom.xml
index 93bfebaf7..47a520fd6 100644
--- a/plugins/codebehind/pom.xml
+++ b/plugins/codebehind/pom.xml
@@ -56,13 +56,13 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-mock</artifactId>
-            <version>2.0.7</version>
+            <version>2.0.8</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
-            <version>2.0.7</version>
+            <version>2.0.8</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/plugins/dojo/pom.xml b/plugins/dojo/pom.xml
index 32ff654dd..73be8d10a 100644
--- a/plugins/dojo/pom.xml
+++ b/plugins/dojo/pom.xml
@@ -241,14 +241,14 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-mock</artifactId>
-            <version>2.0.7</version>
+            <version>2.0.8</version>
             <optional>true</optional>
         </dependency>
 
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
-            <version>2.0.7</version>
+            <version>2.0.8</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/plugins/portlet/pom.xml b/plugins/portlet/pom.xml
index b47320d44..890b876fa 100644
--- a/plugins/portlet/pom.xml
+++ b/plugins/portlet/pom.xml
@@ -123,25 +123,25 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-mock</artifactId>
-            <version>2.0.7</version>
-			<scope>test</scope>
+            <version>2.0.8</version>
+      <scope>test</scope>
         </dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-portlet</artifactId>
-			<version>2.0.7</version>
-			<scope>test</scope>
-		</dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-portlet</artifactId>
+      <version>2.0.8</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
-            <version>2.0.7</version>
+            <version>2.0.8</version>
       <scope>test</scope>
         </dependency>
-		<dependency>
+    <dependency>
             <groupId>commons-fileupload</groupId>
             <artifactId>commons-fileupload</artifactId>
-			<version>1.1.1</version>
+      <version>1.1.1</version>
       <scope>test</scope>
         </dependency>
    </dependencies>
diff --git a/plugins/sitegraph/pom.xml b/plugins/sitegraph/pom.xml
index d87c16d96..d3bbd0a9b 100644
--- a/plugins/sitegraph/pom.xml
+++ b/plugins/sitegraph/pom.xml
@@ -148,7 +148,7 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
-            <version>2.0.7</version>
+            <version>2.0.8</version>
             <scope>test</scope>
         </dependency>
 
@@ -156,7 +156,7 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-mock</artifactId>
-            <version>2.0.7</version>
+            <version>2.0.8</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/plugins/sitemesh/pom.xml b/plugins/sitemesh/pom.xml
index e9d17e774..5695ad7bb 100644
--- a/plugins/sitemesh/pom.xml
+++ b/plugins/sitemesh/pom.xml
@@ -44,7 +44,7 @@
         <dependency>
             <groupId>opensymphony</groupId>
             <artifactId>sitemesh</artifactId>
-            <version>2.2.1</version>
+            <version>2.3</version>
         </dependency>
         <!-- Velocity -->
         <dependency>
diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml
index 40dcce700..d40f893e5 100644
--- a/plugins/spring/pom.xml
+++ b/plugins/spring/pom.xml
@@ -44,31 +44,31 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-beans</artifactId>
-            <version>2.0.7</version>
+            <version>2.0.8</version>
         </dependency>
 
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
-            <version>2.0.7</version>
+            <version>2.0.8</version>
         </dependency>
 
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
-            <version>2.0.7</version>
+            <version>2.0.8</version>
         </dependency>
 
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
-            <version>2.0.7</version>
+            <version>2.0.8</version>
         </dependency>
 
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-mock</artifactId>
-            <version>2.0.7</version>
+            <version>2.0.8</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/plugins/struts1/pom.xml b/plugins/struts1/pom.xml
index 7790ad5f5..28a4726b7 100644
--- a/plugins/struts1/pom.xml
+++ b/plugins/struts1/pom.xml
@@ -58,14 +58,14 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-mock</artifactId>
-            <version>2.0.7</version>
+            <version>2.0.8</version>
             <optional>true</optional>
         </dependency>
 
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
-            <version>2.0.7</version>
+            <version>2.0.8</version>
             <scope>test</scope>
         </dependency>