Skip to content

Commit 1e9a4fb

Browse files
dolavbdolavb
authored
Merge branch 'master' into MultiNodePipelineExecutor
2 parents a50568a + 06ca054 commit 1e9a4fb

File tree

88 files changed

+703
-6446
lines changed

Some content is hidden

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

88 files changed

+703
-6446
lines changed

‎.github/workflows/codeql-analysis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131

3232
steps:
3333
- name: Checkout repository
34-
uses: actions/checkout@v3
34+
uses: actions/checkout@v4
3535

3636
# Initializes the CodeQL tools for scanning.
3737
- name: Initialize CodeQL

‎.github/workflows/docs.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ jobs:
2828
- name: Setup Pages
2929
uses: actions/configure-pages@v3
3030
- name: Upload artifact
31-
uses: actions/upload-pages-artifact@v1
31+
uses: actions/upload-pages-artifact@v3
3232
with:
3333
path: 'docsbuild'
3434
- name: Deploy to GitHub Pages
3535
id: deployment
36-
uses: actions/deploy-pages@v2
36+
uses: actions/deploy-pages@v4

‎.github/workflows/doctests.yml

+4-5
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@ name: Documentation Tests
22

33
on:
44
push:
5-
tags-ignore:
6-
- '*'
75
branches:
6+
- master
87
- 'emb-examples'
98
pull_request:
109
workflow_dispatch:
@@ -21,16 +20,16 @@ jobs:
2120
- 6379:6379
2221

2322
steps:
24-
- uses: actions/checkout@v3
23+
- uses: actions/checkout@v4
2524
- name: Cache dependencies
26-
uses: actions/cache@v2
25+
uses: actions/cache@v4
2726
with:
2827
path: |
2928
~/.m2/repository
3029
/var/cache/apt
3130
key: jedis-${{hashFiles('**/pom.xml')}}
3231
- name: Set up Java
33-
uses: actions/setup-java@v2
32+
uses: actions/setup-java@v4
3433
with:
3534
java-version: '11'
3635
distribution: 'temurin'

‎.github/workflows/integration.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ jobs:
2525
name: Build and Test
2626
runs-on: ubuntu-latest
2727
steps:
28-
- uses: actions/checkout@v2
28+
- uses: actions/checkout@v4
2929
- name: Set up publishing to maven central
30-
uses: actions/setup-java@v2
30+
uses: actions/setup-java@v4
3131
with:
3232
java-version: '8'
3333
distribution: 'temurin'
@@ -37,7 +37,7 @@ jobs:
3737
sudo apt install -y stunnel make
3838
make system-setup
3939
- name: Cache dependencies
40-
uses: actions/cache@v2
40+
uses: actions/cache@v4
4141
with:
4242
path: |
4343
~/.m2/repository

‎.github/workflows/snapshot.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@ jobs:
1515
name: Deploy Snapshot
1616
runs-on: ubuntu-latest
1717
steps:
18-
- uses: actions/checkout@v2
18+
- uses: actions/checkout@v4
1919
- name: Set up publishing to maven central
20-
uses: actions/setup-java@v2
20+
uses: actions/setup-java@v4
2121
with:
2222
java-version: '8'
2323
distribution: 'temurin'
2424
server-id: ossrh
2525
server-username: MAVEN_USERNAME
2626
server-password: MAVEN_PASSWORD
2727
- name: Cache dependencies
28-
uses: actions/cache@v2
28+
uses: actions/cache@v4
2929
with:
3030
path: |
3131
~/.m2/repository

‎.github/workflows/spellcheck.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66
runs-on: ubuntu-latest
77
steps:
88
- name: Checkout
9-
uses: actions/checkout@v3
9+
uses: actions/checkout@v4
1010
- name: Check Spelling
1111
uses: rojopolis/[email protected]
1212
with:

‎.github/workflows/test-on-docker.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
fail-fast: false
3737
matrix:
3838
redis_version:
39-
- "8.0-M02"
39+
- "8.0-M04-pre"
4040
- "7.4.1"
4141
- "7.2.6"
4242
# - "6.2.16"

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
runs-on: ubuntu-latest
1010

1111
steps:
12-
- uses: actions/checkout@v2
12+
- uses: actions/checkout@v4
1313

1414
- name: get version from tag
1515
id: get_version
@@ -19,7 +19,7 @@ jobs:
1919
echo "VERSION=$realversion" >> $GITHUB_OUTPUT
2020
2121
- name: Set up publishing to maven central
22-
uses: actions/setup-java@v2
22+
uses: actions/setup-java@v4
2323
with:
2424
java-version: '8'
2525
distribution: 'temurin'

‎Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
PATH := ./redis-git/src:${PATH}
22

33
# Supported test env versions
4-
SUPPORTED_TEST_ENV_VERSIONS := 8.0-M02 7.4.1 7.2.6 6.2.16
5-
DEFAULT_TEST_ENV_VERSION := 8.0-M02
4+
SUPPORTED_TEST_ENV_VERSIONS := 8.0-M04-pre, 8.0-M02 7.4.1 7.2.6 6.2.16
5+
DEFAULT_TEST_ENV_VERSION := 8.0-M04-pre
66
REDIS_ENV_WORK_DIR := $(or ${REDIS_ENV_WORK_DIR},/tmp/redis-env-work)
77

88
define REDIS1_CONF

‎docs/jedis-maven.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<dependency>
77
<groupId>redis.clients</groupId>
88
<artifactId>jedis</artifactId>
9-
<version>5.0.0</version>
9+
<version>5.2.0</version>
1010
</dependency>
1111
```
1212

@@ -28,7 +28,7 @@ and
2828
<dependency>
2929
<groupId>redis.clients</groupId>
3030
<artifactId>jedis</artifactId>
31-
<version>5.1.0-SNAPSHOT</version>
31+
<version>6.0.0-SNAPSHOT</version>
3232
</dependency>
3333
</dependencies>
3434
```

‎docs/redisjson.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# RedisJSON Jedis Quick Start
22

3-
Jedis supports [RedisJSON](https://oss.redis.com/redisjson/) and [RediSearch](https://oss.redis.com/redisearch/).
3+
Jedis supports [RedisJSON](https://redis.io/docs/latest/develop/data-types/json/) and [RediSearch](https://redis.io/docs/latest/develop/interact/search-and-query/).
44

55
The latest versions of RedisJSON let you store, manipulate, index, and query JSON.
66
To use these features with Jedis, you'll need to use the `UnifiedJedis` interface or a sub-class of it.

‎pom.xml

+5-5
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<packaging>jar</packaging>
1010
<groupId>redis.clients</groupId>
1111
<artifactId>jedis</artifactId>
12-
<version>5.3.0-SNAPSHOT</version>
12+
<version>6.0.0-SNAPSHOT</version>
1313
<name>Jedis</name>
1414
<description>Jedis is a blazingly small and sane Redis java client.</description>
1515
<url>https://github.com/redis/jedis</url>
@@ -62,17 +62,17 @@
6262
<dependency>
6363
<groupId>org.apache.commons</groupId>
6464
<artifactId>commons-pool2</artifactId>
65-
<version>2.12.0</version>
65+
<version>2.12.1</version>
6666
</dependency>
6767
<dependency>
6868
<groupId>org.json</groupId>
6969
<artifactId>json</artifactId>
70-
<version>20240303</version>
70+
<version>20250107</version>
7171
</dependency>
7272
<dependency>
7373
<groupId>com.google.code.gson</groupId>
7474
<artifactId>gson</artifactId>
75-
<version>2.11.0</version>
75+
<version>2.12.1</version>
7676
</dependency>
7777

7878
<dependency>
@@ -145,7 +145,7 @@
145145
<dependency>
146146
<groupId>org.apache.httpcomponents.client5</groupId>
147147
<artifactId>httpclient5-fluent</artifactId>
148-
<version>5.4.1</version>
148+
<version>5.4.2</version>
149149
<scope>test</scope>
150150
</dependency>
151151

‎src/main/java/redis/clients/jedis/ClusterPipeline.java

-7
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,6 @@ private static ClusterCommandObjects createClusterCommandObjects(RedisProtocol p
5454
return cco;
5555
}
5656

57-
/**
58-
* This method must be called after constructor, if graph commands are going to be used.
59-
*/
60-
public void prepareGraphCommands() {
61-
super.prepareGraphCommands(provider);
62-
}
63-
6457
@Override
6558
public void close() {
6659
try {

0 commit comments

Comments
 (0)