From 29a489b15691f88de60f074a0edb7a8c1dbea4b5 Mon Sep 17 00:00:00 2001
From: mpollack <mpollack@gopivotal.com>
Date: Fri, 16 May 2014 15:51:10 -0400
Subject: [PATCH] SHL-149 Upgrade to Spring Framework 4.

* update changelog
* update sample app to reference to be released 1.1.RC3 shell
* fix version in sample app readme
---
 docs/src/info/changelog.txt   | 13 ++++++++++++-
 gradle.properties             |  2 +-
 samples/helloworld/pom.xml    |  2 +-
 samples/helloworld/readme.txt |  2 +-
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/docs/src/info/changelog.txt b/docs/src/info/changelog.txt
index c29518df..ed91a8c6 100644
--- a/docs/src/info/changelog.txt
+++ b/docs/src/info/changelog.txt
@@ -5,7 +5,18 @@ http://www.springsource.org/spring-shell
 Commit changelog: http://github.com/SpringSource/spring-shell/tree/[version]
 Issues changelog: http://jira.springsource.org/secure/ReleaseNote.jspa?projectId=10361
 
-Changes in version 1.1 RC1 (2014-4-15)
+Changes in version 1.1 RC3 (2014-5-16)
+--------------------------------------
+** Bug
+* [SHL-140] - Fix completions for the "help" builtin command
+
+** Improvement
+* [SHL-134] - Grab the entire input line as parameter to CliCommand
+* [SHL-139] - Add support for common escapes
+* [SHL-143] - Upgrade to gradle 1.11
+* [SHL-149] - Upgrad to Spring Framework 4
+
+Changes in version 1.1 RC2 (2014-4-15)
 --------------------------------------
 ** Bug
 * [SHL-133] - Shell command "! ls /tmp"  fails
diff --git a/gradle.properties b/gradle.properties
index 9fbd0781..3f7f7818 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,7 @@
 slf4jVersion=1.7.2
 jlineVersion=2.11
 junitVersion=4.11
-springVersion=3.1.2.RELEASE
+springVersion=4.0.3.RELEASE
 commonsioVersion=2.3
 hamcrestVersion=1.3
 version=1.1.0.BUILD-SNAPSHOT
diff --git a/samples/helloworld/pom.xml b/samples/helloworld/pom.xml
index 0281bf94..e3bdb99f 100644
--- a/samples/helloworld/pom.xml
+++ b/samples/helloworld/pom.xml
@@ -11,7 +11,7 @@
 	<url>http://maven.apache.org</url>
 
 	<properties>
-		<spring.shell.version>1.1.0.RC2</spring.shell.version>
+		<spring.shell.version>1.1.0.RC3</spring.shell.version>
 		<jar.mainclass>org.springframework.shell.Bootstrap</jar.mainclass>
 		<log4j.version>1.2.17</log4j.version>
 		<junit.version>4.10</junit.version>
diff --git a/samples/helloworld/readme.txt b/samples/helloworld/readme.txt
index 0b618bab..110843b2 100644
--- a/samples/helloworld/readme.txt
+++ b/samples/helloworld/readme.txt
@@ -4,7 +4,7 @@ Maven 3:
   $>mvn package
   
 2.run spring shell
-  $>java -jar target/helloworld-1.0.1.RELEASE.jar
+  $>java -jar target/helloworld-1.1.0.RELEASE.jar