Skip to content

Commit 13c93d9

Browse files
chayimchayim
authored
Merge branch 'master' into ck-cispell
2 parents d46dea1 + 93fa07e commit 13c93d9

168 files changed

Lines changed: 10052 additions & 10126 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/release-drafter-config.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
name-template: '$NEXT_MINOR_VERSION'
22
tag-template: 'v$NEXT_MINOR_VERSION'
3+
filter-by-commitish: true
4+
commitish: master
35
autolabeler:
46
- label: 'maintenance'
57
files:
@@ -35,6 +37,8 @@ categories:
3537
labels:
3638
- 'maintenance'
3739
- 'dependencies'
40+
- 'documentation'
41+
- 'docs'
3842
- 'testing'
3943
change-template: '- $TITLE (#$NUMBER)'
4044
exclude-labels:

‎.github/workflows/doctests.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ name: Documentation Tests
22

33
on:
44
push:
5+
tags-ignore:
6+
- '*'
57
pull_request:
68
workflow_dispatch:
79

@@ -32,4 +34,4 @@ jobs:
3234
distribution: 'temurin'
3335
- name: Run doctests
3436
run: |
35-
mvn -Pdoctests test
37+
mvn -Pdoctests test

‎.github/workflows/integration.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,16 @@ on:
1010
- '**/*.rst'
1111
branches:
1212
- master
13-
- '[0-9].[0-9]'
1413
- '[0-9].x'
14+
- '[0-9].[0-9].x'
1515
pull_request:
1616
branches:
1717
- master
18-
- '[0-9].[0-9]'
1918
- '[0-9].x'
19+
- '[0-9].[0-9].x'
2020
schedule:
2121
- cron: '0 1 * * *' # nightly build
22+
workflow_dispatch:
2223

2324
jobs:
2425

‎.github/workflows/snapshot.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ on:
66
push:
77
branches:
88
- master
9-
- '[0-9].[0-9]'
9+
- '[0-9].x'
10+
workflow_dispatch:
1011

1112
jobs:
1213

‎.github/workflows/version-and-release.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
run: |
1717
realversion="${GITHUB_REF/refs\/tags\//}"
1818
realversion="${realversion//v/}"
19-
echo "::set-output name=VERSION::$realversion"
19+
echo "VERSION=$realversion" >> $GITHUB_OUTPUT
2020
2121
- name: Set up publishing to maven central
2222
uses: actions/setup-java@v2
@@ -32,14 +32,14 @@ jobs:
3232

3333
- name: Install gpg key
3434
run: |
35-
cat <(echo -e "${{ secrets.OSSRH_GPG_SECRET_KEY }}") | gpg --batch --import
35+
cat <(echo -e "${{ secrets.OSSH_GPG_SECRET_KEY }}") | gpg --batch --import
3636
gpg --list-secret-keys --keyid-format LONG
3737
3838
- name: Publish
3939
run: |
4040
mvn --no-transfer-progress \
4141
--batch-mode \
42-
-Dgpg.passphrase='${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}' \
42+
-Dgpg.passphrase='${{ secrets.OSSH_GPG_SECRET_KEY_PASSWORD }}' \
4343
-DskipTests deploy -P release
4444
env:
4545
MAVEN_USERNAME: ${{secrets.OSSH_USERNAME}}

‎LICENSE‎

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

‎LICENSE.txt‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎Makefile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ daemonize yes
209209
protected-mode no
210210
requirepass cluster
211211
port 7379
212-
cluster-node-timeout 50
212+
cluster-node-timeout 15000
213213
pidfile /tmp/redis_cluster_node1.pid
214214
logfile /tmp/redis_cluster_node1.log
215215
save ""
@@ -223,7 +223,7 @@ daemonize yes
223223
protected-mode no
224224
requirepass cluster
225225
port 7380
226-
cluster-node-timeout 50
226+
cluster-node-timeout 15000
227227
pidfile /tmp/redis_cluster_node2.pid
228228
logfile /tmp/redis_cluster_node2.log
229229
save ""
@@ -237,7 +237,7 @@ daemonize yes
237237
protected-mode no
238238
requirepass cluster
239239
port 7381
240-
cluster-node-timeout 50
240+
cluster-node-timeout 15000
241241
pidfile /tmp/redis_cluster_node3.pid
242242
logfile /tmp/redis_cluster_node3.log
243243
save ""
@@ -251,7 +251,7 @@ daemonize yes
251251
protected-mode no
252252
requirepass cluster
253253
port 7382
254-
cluster-node-timeout 50
254+
cluster-node-timeout 15000
255255
pidfile /tmp/redis_cluster_node4.pid
256256
logfile /tmp/redis_cluster_node4.log
257257
save ""
@@ -265,7 +265,7 @@ daemonize yes
265265
protected-mode no
266266
requirepass cluster
267267
port 7383
268-
cluster-node-timeout 5000
268+
cluster-node-timeout 15000
269269
pidfile /tmp/redis_cluster_node5.pid
270270
logfile /tmp/redis_cluster_node5.log
271271
save ""

‎README.md‎

Lines changed: 42 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -6,33 +6,45 @@
66
[![MIT licensed](https://img.shields.io/badge/license-MIT-blue.svg)](./LICENSE.txt)
77
[![Integration](https://github.com/redis/jedis/actions/workflows/integration.yml/badge.svg?branch=master)](https://github.com/redis/jedis/actions/workflows/integration.yml)
88
[![codecov](https://codecov.io/gh/redis/jedis/branch/master/graph/badge.svg?token=pAstxAAjYo)](https://codecov.io/gh/redis/jedis)
9-
[![Discord](https://img.shields.io/discord/697882427875393627?style=flat-square)](https://discord.gg/qRhBuY8Z)
9+
[![Discord](https://img.shields.io/discord/697882427875393627?style=flat-square)](https://discord.gg/redis)
1010

1111
## What is Jedis?
1212

1313
Jedis is a Java client for [Redis](https://github.com/redis/redis "Redis") designed for performance and ease of use.
1414

1515
Are you looking for a high-level library to handle object mapping? See [redis-om-spring](https://github.com/redis/redis-om-spring)!
1616

17-
## Contributing
17+
## How do I Redis?
1818

19-
We'd love your contributions!
19+
[Learn for free at Redis University](https://university.redis.com/)
2020

21-
**Bug reports** are always welcome! [You can open a bug report on GitHub](https://github.com/redis/jedis/issues/new).
21+
[Build faster with the Redis Launchpad](https://launchpad.redis.com/)
2222

23-
You can also **contribute documentation** -- or anything to improve Jedis. Please see
24-
[contribution guideline](https://github.com/redis/jedis/blob/master/.github/CONTRIBUTING.md) for more details.
23+
[Try the Redis Cloud](https://redis.com/try-free/)
24+
25+
[Dive in developer tutorials](https://developer.redis.com/)
26+
27+
[Join the Redis community](https://redis.com/community/)
28+
29+
[Work at Redis](https://redis.com/company/careers/jobs/)
2530

2631
## Supported Redis versions
2732

28-
The most recent version of this library supports redis version [5.0](https://github.com/redis/redis/blob/5.0/00-RELEASENOTES), [6.0](https://github.com/redis/redis/blob/6.0/00-RELEASENOTES), [6.2](https://github.com/redis/redis/blob/6.2/00-RELEASENOTES), and [7.0](https://github.com/redis/redis/blob/7.0/00-RELEASENOTES).
33+
The most recent version of this library supports redis version
34+
[5.0](https://github.com/redis/redis/blob/5.0/00-RELEASENOTES),
35+
[6.0](https://github.com/redis/redis/blob/6.0/00-RELEASENOTES),
36+
[6.2](https://github.com/redis/redis/blob/6.2/00-RELEASENOTES),
37+
[7.0](https://github.com/redis/redis/blob/7.0/00-RELEASENOTES) and
38+
[7.2](https://github.com/redis/redis/blob/7.2/00-RELEASENOTES).
2939

3040
The table below highlights version compatibility of the most-recent library versions and Redis versions. Compatibility means communication features, and Redis command capabilities.
3141

32-
| Library version | Supported redis versions |
33-
|-----------------|-------------------|
34-
| 3.9+ | 5.0 and 6.2 Family of releases |
35-
| >= 4.0 | Version 5.0 to current |
42+
43+
| Jedis version | Supported Redis versions | JDK Compatibility |
44+
|---------------|--------------------------------|-------------------|
45+
| 3.9+ | 5.0 and 6.2 Family of releases | 8, 11 |
46+
| >= 4.0 | Version 5.0 to current | 8, 11, 17 |
47+
| >= 5.0 | Version 6.0 to current | 8, 11, 17 |
3648

3749
## Getting started
3850

@@ -42,7 +54,7 @@ To get started with Jedis, first add it as a dependency in your Java project. If
4254
<dependency>
4355
<groupId>redis.clients</groupId>
4456
<artifactId>jedis</artifactId>
45-
<version>4.4.3</version>
57+
<version>5.0.0</version>
4658
</dependency>
4759
```
4860

@@ -108,6 +120,13 @@ Now you can use the `JedisCluster` instance and send commands like you would wit
108120
jedis.sadd("planets", "Mars");
109121
```
110122

123+
## Using Redis modules
124+
125+
Jedis includes support for [Redis modules](https://redis.io/docs/modules/) such as
126+
[RedisJSON](https://oss.redis.com/redisjson/) and [RediSearch](https://oss.redis.com/redisearch/).
127+
128+
See the [RedisJSON Jedis](docs/redisjson.md) or [RediSearch Jedis](docs/redisearch.md) for details.
129+
111130
## Failover
112131

113132
Jedis supports retry and failover for your Redis deployments. This is useful when:
@@ -126,25 +145,26 @@ You can also check the [latest Jedis Javadocs](https://www.javadoc.io/doc/redis.
126145
Some specific use-case examples can be found in [`redis.clients.jedis.examples`
127146
package](src/test/java/redis/clients/jedis/examples/) of the test source codes.
128147

129-
## Using Redis modules
148+
## Troubleshooting
130149

131-
Jedis includes support for [Redis modules](https://redis.io/docs/modules/) such as
132-
[RedisJSON](https://oss.redis.com/redisjson/) and [RediSearch](https://oss.redis.com/redisearch/).
150+
If you run into trouble or have any questions, we're here to help!
133151

134-
See the [RedisJSON Jedis](docs/redisjson.md) or [RediSearch Jedis](docs/redisearch.md) for details.
152+
Hit us up on the [Redis Discord Server](http://discord.gg/redis) or
153+
[Jedis GitHub Discussions](https://github.com/redis/jedis/discussions) or
154+
[Jedis mailing list](http://groups.google.com/group/jedis_redis).
135155

136-
## Troubleshooting
156+
## Contributing
137157

138-
If you run into trouble or have any questions, we're here to help!
158+
We'd love your contributions!
139159

140-
Hit us up on the [Redis Discord Server](http://discord.gg/redis) or [open an issue on GitHub](https://github.com/redis/jedis).
160+
Bug reports are always welcome! [You can open a bug report on GitHub](https://github.com/redis/jedis/issues/new).
141161

142-
You can also find help on the [Jedis mailing list](http://groups.google.com/group/jedis_redis) or the
143-
[GitHub Discussions](https://github.com/redis/jedis/discussions).
162+
You can also contribute documentation -- or anything to improve Jedis. Please see
163+
[contribution guideline](https://github.com/redis/jedis/blob/master/.github/CONTRIBUTING.md) for more details.
144164

145165
## License
146166

147-
Jedis is licensed under the [MIT license](https://github.com/redis/jedis/blob/master/LICENSE.txt).
167+
Jedis is licensed under the [MIT license](https://github.com/redis/jedis/blob/master/LICENSE).
148168

149169
## Sponsorship
150170

0 commit comments

Comments
 (0)