Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: redis/jedis
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0ee5ce817d1ebabf8cc3dde07369bbaf30ab2a27
Choose a base ref
..
head repository: redis/jedis
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: cd10c730aa042047861424a0225fcb3e0414b7e9
Choose a head ref
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
@@ -31,7 +31,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
4 changes: 2 additions & 2 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
@@ -28,9 +28,9 @@ jobs:
- name: Setup Pages
uses: actions/configure-pages@v3
- name: Upload artifact
uses: actions/upload-pages-artifact@v1
uses: actions/upload-pages-artifact@v3
with:
path: 'docsbuild'
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v2
uses: actions/deploy-pages@v4
9 changes: 4 additions & 5 deletions .github/workflows/doctests.yml
Original file line number Diff line number Diff line change
@@ -2,9 +2,8 @@ name: Documentation Tests

on:
push:
tags-ignore:
- '*'
branches:
- master
- 'emb-examples'
pull_request:
workflow_dispatch:
@@ -21,16 +20,16 @@ jobs:
- 6379:6379

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Cache dependencies
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: |
~/.m2/repository
/var/cache/apt
key: jedis-${{hashFiles('**/pom.xml')}}
- name: Set up Java
uses: actions/setup-java@v2
uses: actions/setup-java@v4
with:
java-version: '11'
distribution: 'temurin'
6 changes: 3 additions & 3 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
@@ -25,9 +25,9 @@ jobs:
name: Build and Test
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up publishing to maven central
uses: actions/setup-java@v2
uses: actions/setup-java@v4
with:
java-version: '8'
distribution: 'temurin'
@@ -37,7 +37,7 @@ jobs:
sudo apt install -y stunnel make
make system-setup
- name: Cache dependencies
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: |
~/.m2/repository
6 changes: 3 additions & 3 deletions .github/workflows/snapshot.yml
Original file line number Diff line number Diff line change
@@ -15,17 +15,17 @@ jobs:
name: Deploy Snapshot
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up publishing to maven central
uses: actions/setup-java@v2
uses: actions/setup-java@v4
with:
java-version: '8'
distribution: 'temurin'
server-id: ossrh
server-username: MAVEN_USERNAME
server-password: MAVEN_PASSWORD
- name: Cache dependencies
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: |
~/.m2/repository
2 changes: 1 addition & 1 deletion .github/workflows/spellcheck.yml
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Check Spelling
uses: rojopolis/spellcheck-github-actions@0.33.1
with:
4 changes: 2 additions & 2 deletions .github/workflows/version-and-release.yml
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: get version from tag
id: get_version
@@ -19,7 +19,7 @@ jobs:
echo "VERSION=$realversion" >> $GITHUB_OUTPUT
- name: Set up publishing to maven central
uses: actions/setup-java@v2
uses: actions/setup-java@v4
with:
java-version: '8'
distribution: 'temurin'
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
@@ -62,7 +62,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-pool2</artifactId>
<version>2.12.0</version>
<version>2.12.1</version>
</dependency>
<dependency>
<groupId>org.json</groupId>
6 changes: 3 additions & 3 deletions src/test/java/io/redis/examples/ListExample.java
Original file line number Diff line number Diff line change
@@ -163,20 +163,20 @@ public void run() {
// REMOVE_END

// STEP_START ltrim
long res27 = jedis.lpush("bikes:repairs", "bike:1", "bike:2", "bike:3", "bike:4", "bike:5");
long res27 = jedis.rpush("bikes:repairs", "bike:1", "bike:2", "bike:3", "bike:4", "bike:5");
System.out.println(res27); // >>> 5

String res28 = jedis.ltrim("bikes:repairs", 0, 2);
System.out.println(res28); // >>> OK

List<String> res29 = jedis.lrange("bikes:repairs", 0, -1);
System.out.println(res29); // >>> [bike:5, bike:4, bike:3]
System.out.println(res29); // >>> [bike:1, bike:2, bike:3]
// STEP_END

// REMOVE_START
assertEquals(5, res27);
assertEquals("OK", res28);
assertEquals("[bike:5, bike:4, bike:3]", res29.toString());
assertEquals("[bike:1, bike:2, bike:3]", res29.toString());
jedis.del("bikes:repairs");
// REMOVE_END