Skip to content

Commit b0bc476

Browse files
authored
Merge branch 'master' into search-dialect-default-2
2 parents 201fbd4 + 6f35732 commit b0bc476

File tree

78 files changed

+258
-6255
lines changed

Some content is hidden

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

78 files changed

+258
-6255
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 4 additions & 5 deletions
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

Lines changed: 3 additions & 3 deletions
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

Lines changed: 3 additions & 3 deletions
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

Lines changed: 1 addition & 1 deletion
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/version-and-release.yml

Lines changed: 2 additions & 2 deletions
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'

docs/jedis-maven.md

Lines changed: 2 additions & 2 deletions
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
```

pom.xml

Lines changed: 5 additions & 5 deletions
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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,6 @@ private static ClusterCommandObjects createClusterCommandObjects(RedisProtocol p
4646
return cco;
4747
}
4848

49-
/**
50-
* This method must be called after constructor, if graph commands are going to be used.
51-
*/
52-
public void prepareGraphCommands() {
53-
super.prepareGraphCommands(provider);
54-
}
55-
5649
@Override
5750
public void close() {
5851
try {

0 commit comments

Comments
 (0)