[pull] master from lettuce-io:master

.github/CODE_OF_CONDUCT.md

@@ -0,0 +1,44 @@
+# Contributor Code of Conduct
+
+As contributors and maintainers of this project, and in the interest of fostering an open
+and welcoming community, we pledge to respect all people who contribute through reporting
+issues, posting feature requests, updating documentation, submitting pull requests or
+patches, and other activities.
+
+We are committed to making participation in this project a harassment-free experience for
+everyone, regardless of level of experience, gender, gender identity and expression,
+sexual orientation, disability, personal appearance, body size, race, ethnicity, age,
+religion, or nationality.
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery
+* Personal attacks
+* Trolling or insulting/derogatory comments
+* Public or private harassment
+* Publishing other's private information, such as physical or electronic addresses,
+  without explicit permission
+* Other unethical or unprofessional conduct
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments,
+commits, code, wiki edits, issues, and other contributions that are not aligned to this
+Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors
+that they deem inappropriate, threatening, offensive, or harmful.
+
+By adopting this Code of Conduct, project maintainers commit themselves to fairly and
+consistently applying these principles to every aspect of managing this project. Project
+maintainers who do not follow or enforce the Code of Conduct may be permanently removed
+from the project team.
+
+This Code of Conduct applies both within project spaces and in public spaces when an
+individual is representing the project or its community.
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by
+contacting a project maintainer at lettuce-redis-client-users@googlegroups.com. All complaints will
+be reviewed and investigated and will result in a response that is deemed necessary and
+appropriate to the circumstances. Maintainers are obligated to maintain confidentiality
+with regard to the reporter of an incident.
+
+This Code of Conduct is adapted from the
+[Contributor Covenant](https://contributor-covenant.org), version 1.3.0, available at
+[contributor-covenant.org/version/1/3/0/](https://contributor-covenant.org/version/1/3/0/).

.github/CONTRIBUTING.md

@@ -1,21 +1,82 @@
-# Contributing to lettuce
+# Contributing to Lettuce
 
-If you would like to contribute code you can do so through GitHub by forking the repository and sending a pull request.
+Lettuce is released under the Apache 2.0 license. If you would like to contribute something, or simply want to hack on the code this document should help you get started.
 
-When submitting code, please make every effort to follow existing conventions and style in order to keep the code as readable as possible.
-Formatting settings are provided for Eclipse in https://github.com/mp911de/lettuce/blob/master/formatting.xml
+## Code of Conduct
+
+This project adheres to the Contributor Covenant [code of
+conduct](CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code. Please report unacceptable behavior to lettuce-redis-client-users@googlegroups.com.
+
+## Using GitHub Issues
+
+We use GitHub issues to track bugs and enhancements. If you have a general usage question please ask on [Stack Overflow](https://stackoverflow.com). 
+The Lettuce team and the broader community monitor the [`lettuce`](https://stackoverflow.com/tags/lettuce) tag.
+
+If you are reporting a bug, please help to speed up problem diagnosis by providing as much information as possible. 
+Ideally, that would include a small sample project that reproduces the problem.
+
+## Quickstart
+
+For the impatient, if you want to submit a quick pull request:
+
+* Don't create a pull request upfront. Create a feature request ticket first, so we can discuss your idea.
+* Upon agreeing the feature is a good fit for Lettuce, please:
+  * Make sure there is a ticket in GitHub issues.
+  * Make sure you use the code formatters provided here and have them applied to your changes. Don’t submit any formatting related changes.
+  * Make sure you submit test cases (unit or integration tests) that back your changes.
+  * Try to reuse existing test sample code (domain classes). Try not to amend existing test cases but create new ones dedicated to the changes you’re making to the codebase. Try to test as locally as possible but potentially also add integration tests.
+
+When submitting code, please make every effort to follow existing conventions and style in order to keep the code as readable as possible. Formatting changes create a lot of noise and reduce the likelyhood of merging the pull request.
+Formatting settings are provided for Eclipse in https://github.com/lettuce-io/lettuce-core/blob/master/formatting.xml
 
 ## Bugreports
 
 If you report a bug, please ensure to specify the following:
 
-* lettuce version (e.g. 3.2.Final)
-* Contextual information (what were you trying to do using lettuce)
-* Simplest possible steps to reproduce
-   * JUnit tests to reproduce are great but not obligatory
+* Check GitHub issues whether someone else already filed a ticket. If not, then feel free to create another one.
+* Comments on closed tickets are typically a bad idea as there's little attention on closed tickets. Please create a new one.
+* Lettuce version (e.g. 3.2.Final).
+* Contextual information (what were you trying to do using Lettuce).
+* Simplest possible steps to reproduce:
+   * Ideally, a [Minimal, Complete, and Verifiable example](https://stackoverflow.com/help/mcve).
+   * JUnit tests to reproduce are great but not obligatory.
+
+## Features
+
+If you want to request a feature, please ensure to specify the following:
+
+* What do you want to achieve?
+* Contextual information (what were you trying to do using Lettuce).
+* Ideally, but not required: Describe your idea how you would implement it.
+
+## Questions
+
+If you have a question, then check one of the following places first as GitHub issues are for bugs and feature requests. Typically, forums, chats, and mailing lists are the best place to ask your question as you can expect to get an answer faster there:
+
+**Checkout the docs**
+
+* [Reference documentation](https://lettuce.io/docs/)
+* [Wiki](https://github.com/lettuce-io/lettuce-core/wiki)
+* [Javadoc](https://lettuce.io/core/release/api/)
+
+**Communication**
+
+* Google Group/Mailing List (General discussion, announcements and releases): [lettuce-redis-client-users](https://groups.google.com/d/forum/lettuce-redis-client-users) or [lettuce-redis-client-users@googlegroups.com](mailto:lettuce-redis-client-users@googlegroups.com)
+* Stack Overflow (Questions): [Questions about Lettuce](https://stackoverflow.com/questions/tagged/lettuce)
+* Gitter (General discussion): [![Join the chat at https://gitter.im/lettuce-io/Lobby](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/lettuce-io/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
+### Building from Source
+
+Lettuce source can be built from the command line using Maven on JDK 1.8 or above.
+
+The project can be built from the root directory using the standard Maven command:
 
-## License
+```bash
+	$ mvn clean test
+```
 
-By contributing your code, you agree to license your contribution under the terms of [Apache License 2.0] (http://www.apache.org/licenses/LICENSE-2.0).
+You can run a full build including integration tests using the `make` command:
 
-All files are released with the Apache 2.0 license.
+```bash
+	$ make test
+```

.github/ISSUE_TEMPLATE/Bug_report.md

@@ -0,0 +1,52 @@
+---
+name: 🐛 Bug Report
+about: If something isn't working as expected 🤔.
+labels: 'type: bug'
+---
+
+## Bug Report
+
+<!-- First of all: Have you checked the docs https://github.com/lettuce-io/lettuce-core/wiki, GitHub issues, or Stack Overflow whether someone else has already reported your issue? -->
+
+#### Current Behavior
+
+<!-- A clear and concise description of the behavior.-->
+
+<details>
+<summary>Stack trace</summary>
+
+```java
+// your stack trace here;
+```
+
+</details>
+
+#### Input Code
+
+<!-- Java/Kotlin/Scala/Groovy/… or Repo link if applicable: -->
+
+<details>
+<summary>Input Code</summary>
+
+```java
+// your code here;
+```
+
+</details>
+
+#### Expected behavior/code
+
+<!-- A clear and concise description of what you expected to happen (or code). -->
+
+#### Environment
+
+- Lettuce version(s): [e.g. 5.0.0.RELEASE, 4.2.2.Final]
+- Redis version: [e.g. 4.0.9]
+
+#### Possible Solution
+
+<!-- Only if you have suggestions on a fix for the bug -->
+
+#### Additional context
+
+<!-- Add any other context about the problem here. Do not add code as screenshots. -->

.github/ISSUE_TEMPLATE/Feature_request.md

@@ -0,0 +1,26 @@
+---
+name: 🚀 Feature Request
+about: I have a suggestion (and may want to implement it 🙂)!
+labels: 'type: enhancement'
+---
+
+## Feature Request
+
+<!-- First of all: Have you checked the docs https://github.com/lettuce-io/lettuce-core/wiki, GitHub issues, or Stack Overflow whether someone else has already reported your issue? Maybe the feature already exists?-->
+
+#### Is your feature request related to a problem? Please describe
+
+A clear and concise description of what the problem is. Ex. I have an issue when [...]
+
+#### Describe the solution you'd like
+
+A clear and concise description of what you want to happen. Add any considered drawbacks.
+
+#### Describe alternatives you've considered
+
+A clear and concise description of any alternative solutions or features you've considered.
+
+#### Teachability, Documentation, Adoption, Migration Strategy
+
+If you can, explain how users will be able to use this and possibly write out a version the docs.
+Maybe a screenshot or design?

.github/ISSUE_TEMPLATE/Help_us.md

@@ -0,0 +1,15 @@
+---
+name: 🤝 Support us on Lettuce
+about: If you would like to support our efforts in maintaining this community-driven project 🙌!
+
+---
+
+Help support Lettuce!
+
+Lettuce has always been a community project, not really backed or owned by any single (or group) of companies. While some maintainers used to work at companies supporting open source no one was working on it full time and there certainly isn't a huge company or team anywhere doing all this work.
+
+---
+
+As a group of volunteers you can help us in a few ways
+
+- Giving developer time on the project. (Message us on [Twitter](https://twitter.com/LettuceDriver) or [Gitter](https://gitter.im/lettuce-io/Lobby) for guidance). Companies should be paying their employees to contribute back to the open source projects they use everyday.

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,4 @@
+contact_links:
+  - name: Questions
+    url: https://gitter.im/lettuce-io/Lobby
+    about: Please ask questions on Gitter or StackOverflow.

.github/PULL_REQUEST_TEMPLATE.md

@@ -3,10 +3,11 @@ Thank you for proposing a pull request. This template will guide you through the
 -->
 Make sure that:
 
-- [ ] You have read the [contribution guidelines](https://github.com/mp911de/lettuce/blob/master/.github/CONTRIBUTING.md).
-- [ ] You use the code formatters provided [here](https://github.com/mp911de/lettuce/blob/master/formatting.xml) and have them applied to your changes. Don’t submit any formatting related changes.
+- [ ] You have read the [contribution guidelines](https://github.com/lettuce-io/lettuce-core/blob/master/.github/CONTRIBUTING.md).
+- [ ] You have created a feature request first to discuss your contribution intent. Please reference the feature request ticket number in the pull request.
+- [ ] You use the code formatters provided [here](https://github.com/lettuce-io/lettuce-core/blob/master/formatting.xml) and have them applied to your changes. Don’t submit any formatting related changes.
 - [ ] You submit test cases (unit or integration tests) that back your changes.
 
  <!--
 Great! Live long and prosper.
--->
+-->

.gitignore

@@ -1,7 +1,6 @@
 target/
 *.rdb
 *.aof
-
 -
 atlassian-ide-plugin.xml
 *.iml
@@ -14,8 +13,4 @@ work/
 .settings
 dependency-reduced-pom.xml
 .idea
-.vagrant
-Vagrantfile
-CluTest.java
-
-CluTest.java
+.flattened-pom.xml

.travis.yml

@@ -1,26 +1,67 @@
+dist: xenial
+
+os: linux
+
 language: java
-jdk:
-  - oraclejdk8
-env:
-  matrix:
-    - PROFILE=netty-40
-    - PROFILE=netty-41
-sudo: false
-before_install:
-  - if [[ ! -f stunnel.tar.gz ]]; then wget -O stunnel.tar.gz ftp://ftp.stunnel.org/stunnel/archive/5.x/stunnel-5.33.tar.gz; fi
-  - if [[ ! -f ./stunnel-5.33/configure ]]; then tar -xzf stunnel.tar.gz; fi
-  - if [[ ! -f ./stunnel-5.33/src/stunnel ]]; then cd ./stunnel-5.33; ./configure; make; cd ..; fi
-  - export PATH="$PATH:$(pwd)/stunnel-5.33/src"
-install: make prepare ssl-keys
-script: make test-coveralls PROFILE=${PROFILE}
+
+jobs:
+  include:
+    - jdk: openjdk8
+      env:
+        - JDK='OpenJDK 8'
+        - REDIS=unstable
+    - jdk: openjdk8
+      env:
+        - JDK='OpenJDK 8'
+        - PROFILE=jmh
+    - jdk: openjdk8
+      env:
+        - JDK='OpenJDK 8'
+        - REDIS=6.0
+    - jdk: openjdk8
+      env:
+        - JDK='OpenJDK 8'
+        - REDIS=5.0
+    - jdk: openjdk8
+      env:
+        - JDK='OpenJDK 8'
+        - REDIS=4.0
+    - jdk: openjdk8
+      env:
+        - JDK='OpenJDK 8'
+        - REDIS=3.2
+    - env: JDK='OpenJDK 12'
+      before_install: wget https://github.com/sormuras/bach/raw/master/install-jdk.sh && . ./install-jdk.sh -f 12
+    - env: JDK='OpenJDK 13'
+      before_install: wget https://github.com/sormuras/bach/raw/master/install-jdk.sh && . ./install-jdk.sh -f 13
+    - env: JDK='OpenJDK 14'
+      before_install: wget https://github.com/sormuras/bach/raw/master/install-jdk.sh && . ./install-jdk.sh -f 14
+    - env: JDK='OpenJDK EA'
+      before_install: wget https://github.com/sormuras/bach/raw/master/install-jdk.sh && . ./install-jdk.sh
+  allow_failures:
+    - env: JDK='OpenJDK EA'
+
+install:
+  - if [[ ! -f downloads/stunnel-5.56.tar.gz ]]; then wget -O downloads/stunnel-5.56.tar.gz ftp://ftp.stunnel.org/stunnel/archive/5.x/stunnel-5.56.tar.gz; fi
+  - if [[ ! -f ./stunnel-5.56/configure ]]; then tar -xzf downloads/stunnel-5.56.tar.gz; fi
+  - if [[ ! -f ./stunnel-5.56/src/stunnel ]]; then cd ./stunnel-5.56; ./configure; make; cd ..; fi
+  - export PATH="$PATH:$(pwd)/stunnel-5.56/src"
+  - make prepare ssl-keys
+
+script: make test-coverage PROFILE=${PROFILE:-ci}
+
+after_success:
+  - bash <(curl -s https://codecov.io/bash)
+
 cache:
   directories:
     - '$HOME/.m2/repository'
-    - '$TRAVIS_BUILD_DIR/stunnel-5.33'
+    - 'downloads'
+    - 'stunnel-5.56'
+
 notifications:
   webhooks:
     urls:
-      - https://webhooks.gitter.im/e/c34b69f37ca13d2f8642
+      - https://webhooks.gitter.im/e/7c2a962829d225c47a31
     on_success: change  # options: [always|never|change] default: always
     on_failure: always  # options: [always|never|change] default: always
-    on_start: false     # default: false