diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml
index 62c4bcfd9..645433168 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.1</version>
+            <version>2.0.7</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/apps/pom.xml b/apps/pom.xml
index 77d1093ea..535c32cab 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -192,7 +192,7 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-mock</artifactId>
-            <version>2.0.1</version>
+            <version>2.0.7</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/apps/portlet/pom.xml b/apps/portlet/pom.xml
index 3fa240c5d..86de44ab9 100644
--- a/apps/portlet/pom.xml
+++ b/apps/portlet/pom.xml
@@ -96,13 +96,13 @@
         <dependency>
             <groupId>velocity</groupId>
             <artifactId>velocity</artifactId>
-            <version>1.4</version>
+            <version>1.5</version>
         </dependency>
 
         <dependency>
             <groupId>velocity-tools</groupId>
             <artifactId>velocity-tools</artifactId>
-            <version>1.1</version>
+            <version>1.3</version>
         </dependency>
         <dependency>
             <groupId>commons-digester</groupId>
diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml
index d8b5d3487..536d67498 100644
--- a/apps/showcase/pom.xml
+++ b/apps/showcase/pom.xml
@@ -120,13 +120,13 @@
         <dependency>
             <groupId>velocity</groupId>
             <artifactId>velocity</artifactId>
-            <version>1.4</version>
+            <version>1.5</version>
         </dependency>
 
         <dependency>
             <groupId>velocity-tools</groupId>
             <artifactId>velocity-tools</artifactId>
-            <version>1.1</version>
+            <version>1.3</version>
         </dependency>
 
 
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 76f8c03d5..730ce3c4e 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -258,14 +258,14 @@
         <dependency>
             <groupId>velocity</groupId>
             <artifactId>velocity</artifactId>
-            <version>1.4</version>
+            <version>1.5</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>velocity-tools</groupId>
             <artifactId>velocity-tools</artifactId>
-            <version>1.1</version>
+            <version>1.3</version>
             <scope>provided</scope>
         </dependency>
 
@@ -391,35 +391,35 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-beans</artifactId>
-            <version>1.2.8</version>
+            <version>2.0.7</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
-            <version>1.2.8</version>
+            <version>2.0.7</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
-            <version>1.2.8</version>
+            <version>2.0.7</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
-            <version>1.2.8</version>
+            <version>2.0.7</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-mock</artifactId>
-            <version>1.2.8</version>
+            <version>2.0.7</version>
             <scope>provided</scope>
         </dependency>
 
diff --git a/core/pom.xml b/core/pom.xml
index 493a34ad9..b410361b6 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -338,14 +338,14 @@
         <dependency>
             <groupId>velocity</groupId>
             <artifactId>velocity</artifactId>
-            <version>1.4</version>
+            <version>1.5</version>
             <optional>true</optional>
         </dependency>
 
         <dependency>
             <groupId>velocity-tools</groupId>
             <artifactId>velocity-tools</artifactId>
-            <version>1.1</version>
+            <version>1.3</version>
             <optional>true</optional>
         </dependency>
 
@@ -374,14 +374,14 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-mock</artifactId>
-            <version>1.2.8</version>
+            <version>2.0.7</version>
             <optional>true</optional>
         </dependency>
 
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
-            <version>1.2.8</version>
+            <version>2.0.7</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/core/src/main/java/org/apache/struts2/views/velocity/VelocityManager.java b/core/src/main/java/org/apache/struts2/views/velocity/VelocityManager.java
index f8783c670..c3b64e177 100644
--- a/core/src/main/java/org/apache/struts2/views/velocity/VelocityManager.java
+++ b/core/src/main/java/org/apache/struts2/views/velocity/VelocityManager.java
@@ -96,17 +96,17 @@ public class VelocityManager {
     private Properties velocityProperties;
 
     private String customConfigFile;
-    
+
     private List<TagLibrary> tagLibraries;
-    
+
     public VelocityManager() {
     }
-    
+
     @Inject
     public void setObjectFactory(ObjectFactory fac) {
         this.objectFactory = fac;
     }
-    
+
     @Inject
     public void setContainer(Container container) {
         List<TagLibrary> list = new ArrayList<TagLibrary>();
@@ -190,7 +190,7 @@ public class VelocityManager {
 
         if (toolboxManager != null && ctx != null) {
             ChainedContext chained = new ChainedContext(context, req, res, ctx);
-            chained.setToolbox(toolboxManager.getToolboxContext(chained));
+            chained.setToolbox(toolboxManager.getToolbox(chained));
             return chained;
         } else {
             return context;
@@ -539,7 +539,7 @@ public class VelocityManager {
 
         // components
         StringBuffer sb = new StringBuffer();
-        
+
         for (TagLibrary tagLibrary : tagLibraries) {
             List<Class> directives = tagLibrary.getVelocityDirectiveClasses();
             for (Class directive : directives) {
diff --git a/plugins/codebehind/pom.xml b/plugins/codebehind/pom.xml
index 8d1f6ec4e..93bfebaf7 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>1.2.8</version>
+            <version>2.0.7</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
-            <version>1.2.8</version>
+            <version>2.0.7</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/plugins/dojo/pom.xml b/plugins/dojo/pom.xml
index 314c07d95..f5c5b6c0b 100644
--- a/plugins/dojo/pom.xml
+++ b/plugins/dojo/pom.xml
@@ -102,7 +102,7 @@
         <dependency>
             <groupId>velocity</groupId>
             <artifactId>velocity</artifactId>
-            <version>1.4</version>
+            <version>1.5</version>
             <optional>true</optional>
         </dependency>
 
@@ -196,14 +196,14 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-mock</artifactId>
-            <version>1.2.8</version>
+            <version>2.0.7</version>
             <optional>true</optional>
         </dependency>
 
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
-            <version>1.2.8</version>
+            <version>2.0.7</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/plugins/portlet/pom.xml b/plugins/portlet/pom.xml
index 490cd74bb..3c721301d 100644
--- a/plugins/portlet/pom.xml
+++ b/plugins/portlet/pom.xml
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
- * $Id: pom.xml 559206 2007-07-24 21:01:18Z apetrelli $
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
+<!--
+/*
+ * $Id: pom.xml 559206 2007-07-24 21:01:18Z apetrelli $
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
@@ -59,14 +59,14 @@
         <dependency>
             <groupId>velocity</groupId>
             <artifactId>velocity</artifactId>
-            <version>1.4</version>
+            <version>1.5</version>
             <optional>true</optional>
         </dependency>
 
         <dependency>
             <groupId>velocity-tools</groupId>
             <artifactId>velocity-tools</artifactId>
-            <version>1.1</version>
+            <version>1.3</version>
             <optional>true</optional>
         </dependency>
 
@@ -123,13 +123,13 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-mock</artifactId>
-            <version>2.0.6</version>
+            <version>2.0.7</version>
       <scope>test</scope>
         </dependency>
     <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
-            <version>2.0.6</version>
+            <version>2.0.7</version>
       <scope>test</scope>
         </dependency>
    </dependencies>
diff --git a/plugins/sitegraph/pom.xml b/plugins/sitegraph/pom.xml
index 3acca652c..d87c16d96 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>1.2.8</version>
+            <version>2.0.7</version>
             <scope>test</scope>
         </dependency>
 
@@ -156,7 +156,7 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-mock</artifactId>
-            <version>1.2.8</version>
+            <version>2.0.7</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/plugins/sitemesh/pom.xml b/plugins/sitemesh/pom.xml
index cba2c906b..94d8f80a9 100644
--- a/plugins/sitemesh/pom.xml
+++ b/plugins/sitemesh/pom.xml
@@ -50,14 +50,14 @@
         <dependency>
             <groupId>velocity</groupId>
             <artifactId>velocity</artifactId>
-            <version>1.4</version>
+            <version>1.5</version>
             <optional>true</optional>
         </dependency>
 
         <dependency>
             <groupId>velocity-tools</groupId>
             <artifactId>velocity-tools</artifactId>
-            <version>1.1</version>
+            <version>1.3</version>
             <optional>true</optional>
         </dependency>
 
diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml
index cbf48a8fb..40dcce700 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.1</version>
+            <version>2.0.7</version>
         </dependency>
 
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
-            <version>2.0.1</version>
+            <version>2.0.7</version>
         </dependency>
 
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
-            <version>2.0.1</version>
+            <version>2.0.7</version>
         </dependency>
 
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
-            <version>2.0.1</version>
+            <version>2.0.7</version>
         </dependency>
 
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-mock</artifactId>
-            <version>2.0.1</version>
+            <version>2.0.7</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/plugins/struts1/pom.xml b/plugins/struts1/pom.xml
index 89bdf6952..7790ad5f5 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>1.2.8</version>
+            <version>2.0.7</version>
             <optional>true</optional>
         </dependency>
 
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
-            <version>1.2.8</version>
+            <version>2.0.7</version>
             <scope>test</scope>
         </dependency>