From f950dfa491d24ee973751e44ed63ee99c2aea52a Mon Sep 17 00:00:00 2001 From: Thomas Darimont Date: Tue, 28 Jan 2014 12:53:30 +0100 Subject: [PATCH] DATAREDIS-255 - Prepare 1.1.1.RELEASE. Updated documentation, changelog, notice and readme. --- build.gradle | 6 ++++-- docs/src/api/overview.html | 2 +- docs/src/info/changelog.txt | 20 +++++++++++++++++-- .../info/{apache-license.txt => license.txt} | 0 docs/src/info/notice.txt | 3 +++ docs/src/info/readme.txt | 8 +++++--- docs/src/reference/docbook/index.xml | 10 ++++++++++ .../docbook/introduction/requirements.xml | 2 +- 8 files changed, 42 insertions(+), 9 deletions(-) rename docs/src/info/{apache-license.txt => license.txt} (100%) diff --git a/build.gradle b/build.gradle index 17b60a13f..d0c58baea 100644 --- a/build.gradle +++ b/build.gradle @@ -106,15 +106,17 @@ jar { manifest.attributes["Created-By"] = "${System.getProperty("java.version")} (${System.getProperty("java.specification.vendor")})" manifest.attributes['Implementation-Title'] = 'spring-data-redis' manifest.attributes['Implementation-Version'] = project.version - manifest.attributes['Implementation-URL'] = "http://www.springsource.org/spring-data/redis" + manifest.attributes['Implementation-URL'] = "http://http://projects.spring.io/spring-data-redis" manifest.attributes['Implementation-Vendor'] = "SpringSource" manifest.attributes['Implementation-Vendor-Id'] = "org.springframework" 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/api/overview.html b/docs/src/api/overview.html index d2bdf9b41..1bbadb805 100644 --- a/docs/src/api/overview.html +++ b/docs/src/api/overview.html @@ -16,7 +16,7 @@ This document is the API specification for the Spring Data project.

If you are interested in commercial training, consultancy and support for the Spring Data Framework, - SpringSource provides + Pivotal provides such commercial support.

diff --git a/docs/src/info/changelog.txt b/docs/src/info/changelog.txt index 97bfad0c7..4db5da9ad 100644 --- a/docs/src/info/changelog.txt +++ b/docs/src/info/changelog.txt @@ -1,10 +1,26 @@ -SPRING DATA REDIS INTEGRATION CHANGELOG +SPRING DATA REDIS CHANGELOG ======================================= -http://www.springsource.org/spring-data/redis +http://projects.spring.io/spring-data-redis Commit changelog: http://github.com/SpringSource/spring-data-redis/tree/v[version] Issues changelog: http://jira.springsource.org/secure/ReleaseNote.jspa?projectId=10604 +Changes in version 1.1.1.RELEASE (2014-01-28) +---------------------------------------- +Bug +[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..66d74dd1e 100644 --- a/docs/src/info/notice.txt +++ b/docs/src/info/notice.txt @@ -1,3 +1,6 @@ + Spring Data Redis ${version} + Copyright (c) [$copyright] SpringSource, a division of Pivotal, 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 0adb13a3e..37490b5d0 100644 --- a/docs/src/info/readme.txt +++ b/docs/src/info/readme.txt @@ -1,6 +1,8 @@ -SPRING DATA REDIS +Spring Data Redis $version (Jan 28, 2014) ----------------- -http://www.springsource.org/spring-data/redis +Spring Data Redis is released under the terms of the Apache Software License Version 2.0 (see license.txt). + +http://projects.spring.io/spring-data-redis/ 1. INTRODUCTION @@ -23,6 +25,6 @@ Please see the reference documentation. Additionally the blog at http://blog.springsource.com as well as sections of interest in the reference documentation. ADDITIONAL RESOURCES -Spring Data Homepage: http://www.springsource.org/spring-data/redis +Spring Data Homepage: http://projects.spring.io/spring-data-redis Spring Data Forum : http://forum.springsource.org/forumdisplay.php?f=80 Redis Homepage : http://redis.io \ No newline at end of file diff --git a/docs/src/reference/docbook/index.xml b/docs/src/reference/docbook/index.xml index f319bd27e..95d7825d8 100644 --- a/docs/src/reference/docbook/index.xml +++ b/docs/src/reference/docbook/index.xml @@ -21,6 +21,16 @@ Hickey SpringSource + + Thomas + Darimont + Pivotal + + + Christoph + Strobl + Pivotal + diff --git a/docs/src/reference/docbook/introduction/requirements.xml b/docs/src/reference/docbook/introduction/requirements.xml index dc2377b3e..f042b9b15 100644 --- a/docs/src/reference/docbook/introduction/requirements.xml +++ b/docs/src/reference/docbook/introduction/requirements.xml @@ -6,6 +6,6 @@ 3.0.x and above. In terms of key value stores, Redis 2.4.x or higher - is required. Spring Data Redis is currently tested against the latest 2.4 and 2.6 releases. + is required. Spring Data Redis is currently tested against the latest 2.4, 2.6, 2.8 releases. \ No newline at end of file