From f73532239be188c2d22e2b99e8de3c4936160437 Mon Sep 17 00:00:00 2001
From: Chris Beams <cbeams@vmware.com>
Date: Thu, 11 Nov 2010 07:36:47 -0800
Subject: [PATCH] Align Gradle build with Maven update to Spring 3.0.5

---
 build.gradle                           |  2 +-
 spring-amqp-samples/helloworld/pom.xml | 32 +++++++--------
 spring-amqp-samples/stocks/pom.xml     | 54 +++++++++++++-------------
 3 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/build.gradle b/build.gradle
index 6e56ab5d..b23f91e5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -100,7 +100,7 @@ configure(javaprojects) {
     apply plugin: 'eclipse' // `gradle eclipse` to generate .classpath/.project
     apply plugin: 'idea' // `gradle idea` to generate .ipr/.iml
 
-    springVersion = '3.0.3.RELEASE'
+    springVersion = '3.0.5.RELEASE'
     rabbitVersion = '2.1.0'
     erlangVersion = '1.5.3'
     slf4jVersion = '1.5.10'
diff --git a/spring-amqp-samples/helloworld/pom.xml b/spring-amqp-samples/helloworld/pom.xml
index fc4d3d5c..765d249b 100644
--- a/spring-amqp-samples/helloworld/pom.xml
+++ b/spring-amqp-samples/helloworld/pom.xml
@@ -50,6 +50,12 @@
       <version>1.5.4</version>
       <scope>runtime</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-oxm</artifactId>
+      <version>3.0.5.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>org.springframework.amqp</groupId>
       <artifactId>spring-amqp</artifactId>
@@ -76,9 +82,9 @@
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>spring-context-support</artifactId>
-      <version>3.0.3.RELEASE</version>
-      <scope>runtime</scope>
+      <artifactId>spring-aop</artifactId>
+      <version>3.0.5.RELEASE</version>
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.rabbitmq</groupId>
@@ -86,24 +92,18 @@
       <version>2.1.0</version>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-aop</artifactId>
-      <version>3.0.3.RELEASE</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-oxm</artifactId>
-      <version>3.0.3.RELEASE</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>
-      <version>3.0.3.RELEASE</version>
+      <version>3.0.5.RELEASE</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context-support</artifactId>
+      <version>3.0.5.RELEASE</version>
+      <scope>runtime</scope>
+    </dependency>
     <dependency>
       <groupId>org.springframework.amqp</groupId>
       <artifactId>spring-rabbit</artifactId>
diff --git a/spring-amqp-samples/stocks/pom.xml b/spring-amqp-samples/stocks/pom.xml
index 6f11e1da..e17ed458 100644
--- a/spring-amqp-samples/stocks/pom.xml
+++ b/spring-amqp-samples/stocks/pom.xml
@@ -50,6 +50,24 @@
       <version>1.0.0.BUILD-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-oxm</artifactId>
+      <version>3.0.5.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-beans</artifactId>
+      <version>3.0.5.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+      <version>3.0.5.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>org.springframework.amqp</groupId>
       <artifactId>spring-amqp</artifactId>
@@ -58,8 +76,8 @@
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>spring-context</artifactId>
-      <version>3.0.3.RELEASE</version>
+      <artifactId>spring-core</artifactId>
+      <version>3.0.5.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -68,18 +86,6 @@
       <version>1.2.14</version>
       <scope>runtime</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-beans</artifactId>
-      <version>3.0.3.RELEASE</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-core</artifactId>
-      <version>3.0.3.RELEASE</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
@@ -104,16 +110,10 @@
       <version>1.5.4</version>
       <scope>runtime</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-context-support</artifactId>
-      <version>3.0.3.RELEASE</version>
-      <scope>runtime</scope>
-    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-aop</artifactId>
-      <version>3.0.3.RELEASE</version>
+      <version>3.0.5.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -136,15 +136,15 @@
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>spring-oxm</artifactId>
-      <version>3.0.3.RELEASE</version>
-      <scope>compile</scope>
+      <artifactId>spring-test</artifactId>
+      <version>3.0.5.RELEASE</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>spring-test</artifactId>
-      <version>3.0.3.RELEASE</version>
-      <scope>test</scope>
+      <artifactId>spring-context-support</artifactId>
+      <version>3.0.5.RELEASE</version>
+      <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework.amqp</groupId>