Merge branch 'master' into reset

.github/CONTRIBUTING.md

@@ -33,6 +33,8 @@ Set up test environments with ```make start```, tear down those environments wit
 * You can import code style file (located to hbase-formatter.xml) to Eclipse, IntelliJ
   * line break by column count seems not working with IntelliJ
 * <strike>You can run ```make format``` anytime to reformat without IDEs</strike>
+* DO NOT format the source codes within `io.redis.examples` test package.
+* A test class name MUST NOT end with `Example`.
 
 ## Adding commands
 

.github/ISSUE_TEMPLATE

@@ -1,3 +1,12 @@
+<!--
+Github issues should be used to report bugs and for detailed feature requests. 
+Everything else belongs in the [Jedis Google Group](https://groups.google.com/g/jedis_redis) 
+or [Jedis Github Discussions](https://github.com/redis/jedis/discussions).
+
+Please post general questions to Google Groups or Github discussions. 
+These can be closed without response when posted to Github issues.
+-->
+
 ### Expected behavior
 
 Write here what you're expecting ...

.github/dependabot.yml

@@ -0,0 +1,7 @@
+version: 2
+
+updates:
+  - package-ecosystem: "maven"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.github/release-drafter-config.yml

@@ -1,23 +1,26 @@
-name-template: '$NEXT_MAJOR_VERSION'
-tag-template: 'v$NEXT_MAJOR_VERSION'
+name-template: '$NEXT_MINOR_VERSION'
+tag-template: 'v$NEXT_MINOR_VERSION'
 autolabeler:
-  - label: 'chore'
+  - label: 'maintenance'
     files:
       - '*.md'
       - '.github/*'
   - label: 'bug'
     branch:
       - '/bug-.+'
-  - label: 'chore'
+  - label: 'maintenance'
     branch:
-      - '/chore-.+'
+      - '/maintenance-.+'
   - label: 'feature'
     branch:
       - '/feature-.+'
 categories:
-  - title: 'Breaking Changes'
+  - title: '🔥 Breaking Changes'
     labels:
       - 'breakingchange'
+  - title: '🧪 Experimental Features'
+    labels:
+      - 'experimental'
   - title: '🚀 New Features'
     labels:
       - 'feature'
@@ -29,12 +32,15 @@ categories:
       - 'bug'
       - 'BUG'
   - title: '🧰 Maintenance'
-    label: 'chore'
+    labels:
+      - 'maintenance'
+      - 'dependencies'
+      - 'testing'
 change-template: '- $TITLE (#$NUMBER)'
 exclude-labels:
   - 'skip-changelog'
 template: |
-  ## Changes
+  # Changes
 
   $CHANGES
 

.github/workflows/codeql-analysis.yml

@@ -24,24 +24,20 @@ jobs:
   analyze:
     name: Analyze
     runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        language: [ 'java' ]
-        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
-        # Learn more:
-        # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
+    permissions:
+      security-events: write
+      actions: read
+      contents: read
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v2
       with:
-        languages: ${{ matrix.language }}
+        languages: java
         # If you wish to specify custom queries, you can do so here or in a config file.
         # By default, queries listed here will override any specified in a config file.
         # Prefix the list here with "+" to use these queries and those in the config file.
@@ -50,7 +46,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
+      uses: github/codeql-action/autobuild@v2
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -64,4 +60,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2

.github/workflows/doctests.yml

@@ -0,0 +1,37 @@
+name: Documentation Tests
+
+on:
+  push:
+    tags-ignore:
+      - '*'
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  doctests:
+    runs-on: ubuntu-latest
+    services:
+      redis-stack:
+        image: redis/redis-stack-server:latest
+        options: >-
+          --health-cmd "redis-cli ping" --health-interval 10s --health-timeout 5s --health-retries 5
+        ports:
+          - 6379:6379
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Cache dependencies
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/.m2/repository
+            /var/cache/apt
+          key: jedis-${{hashFiles('**/pom.xml')}}
+      - name: Set up Java
+        uses: actions/setup-java@v2
+        with:
+          java-version: '11'
+          distribution: 'temurin'
+      - name: Run doctests
+        run: |
+          mvn -Pdoctests test

.github/workflows/integration.yml

@@ -10,11 +10,16 @@ on:
       - '**/*.rst'
     branches:
       - master
-      - '[0-9].[0-9]'
+      - '[0-9].x'
+      - '[0-9].[0-9].x'
   pull_request:
     branches:
       - master
-      - '[0-9].[0-9]'
+      - '[0-9].x'
+      - '[0-9].[0-9].x'
+  schedule:
+    - cron: '0 1 * * *' # nightly build
+  workflow_dispatch:
 
 jobs:
 
@@ -28,10 +33,10 @@ jobs:
         with:
           java-version: '8'
           distribution: 'temurin'
-      - name: stunnel
+      - name: System setup
         run: |
-          sudo apt-get update
-          sudo apt-get install -y stunnel make
+          sudo apt update
+          sudo apt install -y stunnel make
           make system-setup
       - name: Cache dependencies
         uses: actions/cache@v2
@@ -40,19 +45,36 @@ jobs:
             ~/.m2/repository
             /var/cache/apt
           key: jedis-${{hashFiles('**/pom.xml')}}
-      - name: mvn offline
+      - name: Maven offline
         run: |
           mvn -q dependency:go-offline
-      - name: run tests
+      - name: Build docs
+        run: |
+          mvn javadoc:jar
+      - name: Run tests
         run: |
           TEST="" make test
         env:
           JVM_OPTS: -Xmx3200m
           TERM: dumb
-      - name: redismod docker
-        run: docker run --name mod -p 52567:6379 -d redislabs/redismod:edge
-      - name: run tests
-        run: mvn -q -DmodulesDocker="mod:52567" -Dtest="redis.clients.jedis.modules.**" test
-      - name: codecov
+      - name: sleep 10s
+        run: sleep 10s
+      - name: Make - start
+        run: |
+          make start
+          sleep 2s
+      - name: Docker - mod or stack
+        run: docker run -p 52567:6379 -d redis/redis-stack-server:edge
+      - name: Test commands - default protocol
+        run: mvn -Dtest="redis.clients.jedis.commands.**" test
+      - name: Test commands - RESP3 protocol
+        run: mvn -DjedisProtocol=3 -Dtest="redis.clients.jedis.commands.**" test
+      - name: Test module commands - default protocol
+        run: mvn -DmodulesDocker="localhost:52567" -Dtest="redis.clients.jedis.modules.**" test
+      - name: Test module commands - RESP3 protocol
+        run: mvn -DjedisProtocol=3 -DmodulesDocker="localhost:52567" -Dtest="redis.clients.jedis.modules.**" test
+      - name: Make - stop
+        run: make stop
+      - name: Codecov
         run: |
           bash <(curl -s https://codecov.io/bash)

.github/workflows/snapshot.yml

@@ -3,12 +3,11 @@
 name: Publish Snapshot
 
 on:
-  workflow_run:
-    workflows: [Integration]
-    types: [completed]
+  push:
     branches:
       - master
-      - '[0-9].[0-9]'
+      - '[0-9].x'
+  workflow_dispatch:
 
 jobs:
 

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2021-2023, Redis, inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

Makefile

@@ -464,10 +464,7 @@ release:
 	make stop
 
 system-setup:
-	sudo apt-get install -y gcc-8 g++-8
-	cd /usr/bin ;\
-	sudo ln -sf gcc-8 gcc ;\
-	sudo ln -sf g++-8 g++
+	sudo apt install -y gcc g++
 	[ ! -e redis-git ] && git clone https://github.com/redis/redis.git --branch unstable --single-branch redis-git || true
 	$(MAKE) -C redis-git clean
 	$(MAKE) -C redis-git