From 9c145bb83e96338989cc7f0fa351e375e644db22 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Aug 2024 17:44:32 +0000
Subject: [PATCH 1/2] build: bump redis.clients:jedis from 1.4.0 to 5.1.5

Bumps [redis.clients:jedis](https://github.com/redis/jedis) from 1.4.0 to 5.1.5.
- [Release notes](https://github.com/redis/jedis/releases)
- [Commits](https://github.com/redis/jedis/compare/jedis-1.4.0...v5.1.5)

---
updated-dependencies:
- dependency-name: redis.clients:jedis
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apm-agent-plugins/apm-redis-plugin/apm-jedis-2-tests/pom.xml  | 2 +-
 apm-agent-plugins/apm-redis-plugin/apm-jedis-3-tests/pom.xml  | 2 +-
 apm-agent-plugins/apm-redis-plugin/apm-jedis-4-plugin/pom.xml | 2 +-
 apm-agent-plugins/apm-redis-plugin/apm-jedis-5-tests/pom.xml  | 2 +-
 apm-agent-plugins/apm-redis-plugin/apm-jedis-plugin/pom.xml   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apm-agent-plugins/apm-redis-plugin/apm-jedis-2-tests/pom.xml b/apm-agent-plugins/apm-redis-plugin/apm-jedis-2-tests/pom.xml
index 0989546e26..a91a13f106 100644
--- a/apm-agent-plugins/apm-redis-plugin/apm-jedis-2-tests/pom.xml
+++ b/apm-agent-plugins/apm-redis-plugin/apm-jedis-2-tests/pom.xml
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>redis.clients</groupId>
             <artifactId>jedis</artifactId>
-            <version>2.10.2</version>
+            <version>5.1.5</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/apm-agent-plugins/apm-redis-plugin/apm-jedis-3-tests/pom.xml b/apm-agent-plugins/apm-redis-plugin/apm-jedis-3-tests/pom.xml
index 37f1484d27..de5ad632b7 100644
--- a/apm-agent-plugins/apm-redis-plugin/apm-jedis-3-tests/pom.xml
+++ b/apm-agent-plugins/apm-redis-plugin/apm-jedis-3-tests/pom.xml
@@ -46,7 +46,7 @@
         <dependency>
             <groupId>redis.clients</groupId>
             <artifactId>jedis</artifactId>
-            <version>3.9.0</version>
+            <version>5.1.5</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/apm-agent-plugins/apm-redis-plugin/apm-jedis-4-plugin/pom.xml b/apm-agent-plugins/apm-redis-plugin/apm-jedis-4-plugin/pom.xml
index 442233cb08..3c93970c8e 100644
--- a/apm-agent-plugins/apm-redis-plugin/apm-jedis-4-plugin/pom.xml
+++ b/apm-agent-plugins/apm-redis-plugin/apm-jedis-4-plugin/pom.xml
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>redis.clients</groupId>
             <artifactId>jedis</artifactId>
-            <version>4.4.3</version>
+            <version>5.1.5</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/apm-agent-plugins/apm-redis-plugin/apm-jedis-5-tests/pom.xml b/apm-agent-plugins/apm-redis-plugin/apm-jedis-5-tests/pom.xml
index 25a19047ba..99594c6b89 100644
--- a/apm-agent-plugins/apm-redis-plugin/apm-jedis-5-tests/pom.xml
+++ b/apm-agent-plugins/apm-redis-plugin/apm-jedis-5-tests/pom.xml
@@ -46,7 +46,7 @@
         <dependency>
             <groupId>redis.clients</groupId>
             <artifactId>jedis</artifactId>
-            <version>5.1.4</version>
+            <version>5.1.5</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/apm-agent-plugins/apm-redis-plugin/apm-jedis-plugin/pom.xml b/apm-agent-plugins/apm-redis-plugin/apm-jedis-plugin/pom.xml
index 1949a34663..7bb2dac525 100644
--- a/apm-agent-plugins/apm-redis-plugin/apm-jedis-plugin/pom.xml
+++ b/apm-agent-plugins/apm-redis-plugin/apm-jedis-plugin/pom.xml
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>redis.clients</groupId>
             <artifactId>jedis</artifactId>
-            <version>1.4.0</version>
+            <version>5.1.5</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

From e5244333f8a2134fd7178503fb9a8f8c217a375d Mon Sep 17 00:00:00 2001
From: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com>
Date: Tue, 27 Aug 2024 12:04:15 +0200
Subject: [PATCH 2/2] keep older versions

---
 apm-agent-plugins/apm-redis-plugin/apm-jedis-2-tests/pom.xml  | 2 +-
 apm-agent-plugins/apm-redis-plugin/apm-jedis-3-tests/pom.xml  | 2 +-
 apm-agent-plugins/apm-redis-plugin/apm-jedis-4-plugin/pom.xml | 2 +-
 apm-agent-plugins/apm-redis-plugin/apm-jedis-plugin/pom.xml   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apm-agent-plugins/apm-redis-plugin/apm-jedis-2-tests/pom.xml b/apm-agent-plugins/apm-redis-plugin/apm-jedis-2-tests/pom.xml
index a91a13f106..0989546e26 100644
--- a/apm-agent-plugins/apm-redis-plugin/apm-jedis-2-tests/pom.xml
+++ b/apm-agent-plugins/apm-redis-plugin/apm-jedis-2-tests/pom.xml
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>redis.clients</groupId>
             <artifactId>jedis</artifactId>
-            <version>5.1.5</version>
+            <version>2.10.2</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/apm-agent-plugins/apm-redis-plugin/apm-jedis-3-tests/pom.xml b/apm-agent-plugins/apm-redis-plugin/apm-jedis-3-tests/pom.xml
index de5ad632b7..37f1484d27 100644
--- a/apm-agent-plugins/apm-redis-plugin/apm-jedis-3-tests/pom.xml
+++ b/apm-agent-plugins/apm-redis-plugin/apm-jedis-3-tests/pom.xml
@@ -46,7 +46,7 @@
         <dependency>
             <groupId>redis.clients</groupId>
             <artifactId>jedis</artifactId>
-            <version>5.1.5</version>
+            <version>3.9.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/apm-agent-plugins/apm-redis-plugin/apm-jedis-4-plugin/pom.xml b/apm-agent-plugins/apm-redis-plugin/apm-jedis-4-plugin/pom.xml
index 3c93970c8e..442233cb08 100644
--- a/apm-agent-plugins/apm-redis-plugin/apm-jedis-4-plugin/pom.xml
+++ b/apm-agent-plugins/apm-redis-plugin/apm-jedis-4-plugin/pom.xml
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>redis.clients</groupId>
             <artifactId>jedis</artifactId>
-            <version>5.1.5</version>
+            <version>4.4.3</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/apm-agent-plugins/apm-redis-plugin/apm-jedis-plugin/pom.xml b/apm-agent-plugins/apm-redis-plugin/apm-jedis-plugin/pom.xml
index 7bb2dac525..1949a34663 100644
--- a/apm-agent-plugins/apm-redis-plugin/apm-jedis-plugin/pom.xml
+++ b/apm-agent-plugins/apm-redis-plugin/apm-jedis-plugin/pom.xml
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>redis.clients</groupId>
             <artifactId>jedis</artifactId>
-            <version>5.1.5</version>
+            <version>1.4.0</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>