From 6ac8d3242c0b9357bc85a03647483f61d0d266fd Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Wed, 3 Feb 2016 08:43:19 +0100 Subject: [PATCH] Update site with 3.x and 4.x branches #155 --- pom.xml | 1 + src/site/markdown/download.md.vm | 21 +++++++++++++++++---- src/site/markdown/index.md.vm | 23 +++++++++++++++++++++++ src/site/site.xml | 3 ++- 4 files changed, 43 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 0c424923c0..d9271c782e 100644 --- a/pom.xml +++ b/pom.xml @@ -56,6 +56,7 @@ true true 4.1.Final + 3.4.Final 4.0.34.Final diff --git a/src/site/markdown/download.md.vm b/src/site/markdown/download.md.vm index f9675465e4..d3625eb83b 100644 --- a/src/site/markdown/download.md.vm +++ b/src/site/markdown/download.md.vm @@ -4,10 +4,22 @@ Download lettuce lettuce is distributed under the [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt). - The link in the Mirrors column should display a list of available mirrors with a - default selection based on your inferred location. If you do not see that page, - try a different browser. The checksum and signature are links to - the originals on the main distribution server. + The checksum and signature are links to the originals on the main distribution server. + + +lettuce 3.x +----------- + +| | Download | Checksum | Signature | +| ----------------- |:-------------|:-------------|:-------------| +| lettuce (jar) | [lettuce-${lettuce3-release-version}.jar](http://search.maven.org/remotecontent?filepath=biz/paluch/redis/lettuce/${lettuce3-release-version}/lettuce-${lettuce3-release-version}.jar)|[lettuce-${lettuce3-release-version}.jar.md5](http://search.maven.org/remotecontent?filepath=biz/paluch/redis/lettuce/${lettuce3-release-version}/lettuce-${lettuce3-release-version}.jar.md5)|[lettuce-${lettuce3-release-version}.jar.asc](http://search.maven.org/remotecontent?filepath=biz/paluch/redis/lettuce/${lettuce3-release-version}/lettuce-${lettuce3-release-version}.jar.asc)| +| lettuce shaded (jar) | [lettuce-${lettuce3-release-version}-shaded.jar](http://search.maven.org/remotecontent?filepath=biz/paluch/redis/lettuce/${lettuce3-release-version}/lettuce-${lettuce3-release-version}-shaded.jar)|[lettuce-${lettuce3-release-version}-shaded.jar.md5](http://search.maven.org/remotecontent?filepath=biz/paluch/redis/lettuce/${lettuce3-release-version}/lettuce-${lettuce3-release-version}-shaded.jar.md5)|[lettuce-${lettuce3-release-version}-shaded.jar.asc](http://search.maven.org/remotecontent?filepath=biz/paluch/redis/lettuce/${lettuce3-release-version}/lettuce-${lettuce3-release-version}-shaded.jar.asc)| +| lettuce binary (zip) | [lettuce-${lettuce3-release-version}-bin.zip](https://github.com/mp911de/lettuce/releases/download/${lettuce3-release-version}/lettuce-${lettuce3-release-version}-bin.zip)|[lettuce-${lettuce3-release-version}-bin.zip.md5](https://github.com/mp911de/lettuce/releases/download/${lettuce3-release-version}/lettuce-${lettuce3-release-version}-bin.zip.md5)|[lettuce-${lettuce3-release-version}-bin.zip.asc](https://github.com/mp911de/lettuce/releases/download/${lettuce3-release-version}/lettuce-${lettuce3-release-version}-bin.zip.asc)| +| lettuce binary (tar.gz) | [lettuce-${lettuce3-release-version}-bin.tar.gz](https://github.com/mp911de/lettuce/releases/download/${lettuce3-release-version}/lettuce-${lettuce3-release-version}-bin.tar.gz)|[lettuce-${lettuce3-release-version}-bin.tar.gz.md5](https://github.com/mp911de/lettuce/releases/download/${lettuce3-release-version}/lettuce-${lettuce3-release-version}-bin.tar.gz.md5)|[lettuce-${lettuce3-release-version}-bin.tar.gz.asc](https://github.com/mp911de/lettuce/releases/download/${lettuce3-release-version}/lettuce-${lettuce3-release-version}-bin.tar.gz.asc)| + + +lettuce 4.x +----------- | | Download | Checksum | Signature | | ----------------- |:-------------|:-------------|:-------------| @@ -17,6 +29,7 @@ Download lettuce | lettuce binary (tar.gz) | [lettuce-${lettuce-release-version}-bin.tar.gz](https://github.com/mp911de/lettuce/releases/download/${lettuce-release-version}/lettuce-${lettuce-release-version}-bin.tar.gz)|[lettuce-${lettuce-release-version}-bin.tar.gz.md5](https://github.com/mp911de/lettuce/releases/download/${lettuce-release-version}/lettuce-${lettuce-release-version}-bin.tar.gz.md5)|[lettuce-${lettuce-release-version}-bin.tar.gz.asc](https://github.com/mp911de/lettuce/releases/download/${lettuce-release-version}/lettuce-${lettuce-release-version}-bin.tar.gz.asc)| + It is essential that you verify the integrity of the downloaded files using the PGP or MD5 signatures. The PGP signatures can be verified using PGP or GPG. First download the diff --git a/src/site/markdown/index.md.vm b/src/site/markdown/index.md.vm index 52811f4644..21fa8232eb 100644 --- a/src/site/markdown/index.md.vm +++ b/src/site/markdown/index.md.vm @@ -26,6 +26,29 @@ I'm developing and maintaining actively the fork of https://github.com/wg/lettuc [![Join the chat at https://gitter.im/mp911de/lettuce](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/mp911de/lettuce) [![Build Status](https://travis-ci.org/mp911de/lettuce.svg)](https://travis-ci.org/mp911de/lettuce) [![Coverage Status](https://img.shields.io/coveralls/mp911de/lettuce.svg)](https://coveralls.io/r/mp911de/lettuce) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/biz.paluch.redis/lettuce/badge.svg)](https://maven-badges.herokuapp.com/maven-central/biz.paluch.redis/lettuce) +- - - + +3.x and 4.x +------------ +lettuce is available in two major versions. The 3.x stream and the 4.x stream. Both streams are maintained. + +After this release, the 4.x branch will be promoted to the default branch. +Following rules should give a guidance for the stream in which a particular change is done: + +**Changes affecting both streams** + +* New Redis commands (such as HSTRLEN) +* Bugfixes + +**Changes for the 4.x stream only** + +* New Redis paradigms +* Enriching the API (such as multi-key command execution in the Cluster API) +* Technical improvements to the client (such as the Reactive API) + +The 3.x stream will be maintained at least until end of 2016. + +- - - How to get ------------- diff --git a/src/site/site.xml b/src/site/site.xml index c332116445..77ff93e8c3 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -16,7 +16,8 @@ - + +