From 2700036a9f63e336d845e655b250404aa689858d Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Fri, 19 Feb 2010 21:17:07 +0000
Subject: [PATCH] INT-990 upgraded to Spring 3.0.1

---
 build.properties                                 | 2 +-
 org.springframework.integration.osgi/template.mf | 4 ++--
 org.springframework.integration.test/template.mf | 2 +-
 spring-integration-parent/pom.xml                | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build.properties b/build.properties
index 83855a5e2f..120043585a 100644
--- a/build.properties
+++ b/build.properties
@@ -7,6 +7,6 @@ ivy.cache.dir=${basedir}/../ivy-cache
 integration.repo.dir=${basedir}/../integration-repo
 javadoc.exclude.package.names=org/springframework/integration/samples/**
 # dependency versions
-spring.version=3.0.0.RELEASE
+spring.version=3.0.1.RELEASE-A
 junit.version=4.7.0
 mockito.version=1.8.0
diff --git a/org.springframework.integration.osgi/template.mf b/org.springframework.integration.osgi/template.mf
index ae024dc09a..24fcdf40e7 100644
--- a/org.springframework.integration.osgi/template.mf
+++ b/org.springframework.integration.osgi/template.mf
@@ -6,10 +6,10 @@ Import-Package: org.springframework.integration.handler;version="[2.0.0, 2.0.1)"
  org.springframework.integration.config;version="[2.0.0, 2.0.1)",
  org.springframework.integration.router;version="[2.0.0, 2.0.1)",
  org.springframework.integration.endpoint;version="[2.0.0, 2.0.1)",
- org.springframework.scheduling.concurrent;version="[3.0.0, 3.1.0]"
+ org.springframework.scheduling.concurrent;version="[3.0.0, 4.0.0)"
 Import-Template: org.springframework.integration.*;version="[2.0.0, 2.0.1)",
  org.springframework.osgi.*;version="[1.2.0, 2.0.1)",
- org.springframework.*;version="[3.0.0, 3.1.0]",
+ org.springframework.*;version="[3.0.0, 4.0.0)",
  org.apache.commons.logging.*;version="[1.1.1,1.1.1]",
  org.w3c.dom;version="0"
  
diff --git a/org.springframework.integration.test/template.mf b/org.springframework.integration.test/template.mf
index f7e9ee8cec..273fb780f2 100644
--- a/org.springframework.integration.test/template.mf
+++ b/org.springframework.integration.test/template.mf
@@ -8,6 +8,6 @@ Import-Template:
  org.springframework.integration.*;version="[2.0.0, 2.0.1)",
  junit.framework.*;version="[4.6.0, 4.7.0)",
  org.junit.*;version="[4.6.0, 4.7.0)",
- org.mockito.*;version="[1.6.0, 1.7.0)",
+ org.mockito.*;version="[1.6.0, 2.0.0)",
  org.hamcrest.*;version="[1.1.0, 1.1.0]",
  org.objenesis.*;version="[1.0.0, 2.0.0)"
diff --git a/spring-integration-parent/pom.xml b/spring-integration-parent/pom.xml
index b208d65fda..15a8dd0b54 100644
--- a/spring-integration-parent/pom.xml
+++ b/spring-integration-parent/pom.xml
@@ -13,7 +13,7 @@
   <properties>
     <org.eclipse.jdt.core.version>3.4.2.v_883_R34x</org.eclipse.jdt.core.version>
     <junit.version>4.7</junit.version>
-    <spring.version>3.0.0.RELEASE</spring.version>
+    <spring.version>3.0.1.RELEASE</spring.version>
     <maven.test.failure.ignore>true</maven.test.failure.ignore>
   </properties>
   <profiles>