From 9215f6c13966314907ae5c2080a0d66712b2a301 Mon Sep 17 00:00:00 2001
From: Christoph Strobl <cstrobl@gopivotal.com>
Date: Wed, 19 Feb 2014 10:34:06 +0100
Subject: [PATCH] DATAREDIS-262 - Prepare 1.2.0.RC1 release.

Update changelog, notice, readme.
Renamed apache-license to license.
---
 build.gradle                                  |  4 +-
 docs/src/info/changelog.txt                   | 46 ++++++++++++++++++-
 .../info/{apache-license.txt => license.txt}  |  0
 docs/src/info/notice.txt                      |  3 ++
 docs/src/info/readme.txt                      |  4 +-
 5 files changed, 52 insertions(+), 5 deletions(-)
 rename docs/src/info/{apache-license.txt => license.txt} (100%)

diff --git a/build.gradle b/build.gradle
index 8c86b1635..d38fa0f91 100644
--- a/build.gradle
+++ b/build.gradle
@@ -119,8 +119,10 @@ jar {
     from("$rootDir/docs/src/info") {
         include "license.txt"
         include "notice.txt"
+        include "readme.txt"
+        include "changelog.txt"
         into "META-INF"
-        expand(copyright: new Date().format('yyyy'), version: project.version)
+        expand(copyright: new Date().format('2011-yyyy'), version: project.version)
     }
 }
 
diff --git a/docs/src/info/changelog.txt b/docs/src/info/changelog.txt
index 9182ce6da..89132bd07 100644
--- a/docs/src/info/changelog.txt
+++ b/docs/src/info/changelog.txt
@@ -1,10 +1,52 @@
-SPRING DATA REDIS INTEGRATION CHANGELOG
-=======================================
+SPRING DATA REDIS CHANGELOG
+===========================
 http://projects.spring.io/spring-data-redis/
 
 Commit changelog: http://github.com/spring-projects/spring-data-redis/tree/v[version]
 Issues changelog: http://jira.springsource.org/secure/ReleaseNote.jspa?projectId=10604
 
+Changes in version 1.2.0.RC1 (2014-02-19)
+----------------------------------------
+Fix
+  [DATAREDIS-166] - Intermittent corrupted input/output streams subscribing to both patterns and channels in RMLC
+  [DATAREDIS-170] - Canceling RMLC SubscriptionTask immediately after start can leave connection open
+  [DATAREDIS-188] - Infinite loop renaming a non-existent Collection when using Lettuce
+  [DATAREDIS-246] - RedisCacheManager‘s getCache method does not match the logical of CompositeCacheManager
+
+Improvement
+  [DATAREDIS-250] - Upgrade to Spring Framework 3.2.8.
+
+New Feature
+  [DATAREDIS-206] - Add support for time operation
+  [DATAREDIS-241] - Add a Jackson2 based RedisSerializer
+
+Task
+  [DATAREDIS-254] - Clean up codebase to match spring data conventions
+  [DATAREDIS-260] - Upgrade to latest jedis release
+  [DATAREDIS-264] - Update gradle version
+  [DATAREDIS-265] - Update Java source and target compatibility to Java 6
+  [DATAREDIS-266] - Overhaul documentation.
+
+
+Changes in version 1.1.1.RELEASE (2014-01-28)
+----------------------------------------
+
+Fix
+  [DATAREDIS-245] - Prevent excessive Thread creation in unit tests
+  [DATAREDIS-248] - Fix generics in DecoratingStringHashMapper to be Java 8 compatible
+  [DATAREDIS-257] - Shutdown the client when DefaultLettucePool is destroyed
+
+Improvement
+  [DATAREDIS-242] - Listener Container start() Returns Before Container is Really Started
+  [DATAREDIS-249] - Improve logging for tests in Gradle build
+  [DATAREDIS-251] - Fix tests to work against Redis 2.8.x
+
+Task
+  [DATAREDIS-243] - Ensure compatibility with Spring Framework 4.0
+  [DATAREDIS-247] - Testcases must be locale independent
+  [DATAREDIS-255] - Release 1.1.1
+
+
 Changes in version 1.1.0.RELEASE (2013-09-09)
 ----------------------------------------
 
diff --git a/docs/src/info/apache-license.txt b/docs/src/info/license.txt
similarity index 100%
rename from docs/src/info/apache-license.txt
rename to docs/src/info/license.txt
diff --git a/docs/src/info/notice.txt b/docs/src/info/notice.txt
index e6900be90..70d87aed0 100644
--- a/docs/src/info/notice.txt
+++ b/docs/src/info/notice.txt
@@ -1,3 +1,6 @@
+   Spring Data Redis ${version}
+   Copyright (c) [$copyright] Pivotal Software, Inc.
+
    ========================================================================
    == NOTICE file corresponding to section 4 d of the Apache License,    ==
    == Version 2.0, in this case for the Spring Integration distribution. ==
diff --git a/docs/src/info/readme.txt b/docs/src/info/readme.txt
index dbb9a4b56..e8de9ab3d 100644
--- a/docs/src/info/readme.txt
+++ b/docs/src/info/readme.txt
@@ -1,5 +1,5 @@
-SPRING DATA REDIS
------------------
+SPRING DATA REDIS $version (Feb. 19, 2014)
+------------------------------------------
 http://projects.spring.io/spring-data-redis/
 
 1. INTRODUCTION