From fe29f345db04b1478366c41aa8380ced273fad4b Mon Sep 17 00:00:00 2001
From: "octo-sts[bot]" <157150467+octo-sts[bot]@users.noreply.github.com>
Date: Fri, 15 Nov 2024 12:05:27 -0700
Subject: [PATCH] cassandra-reaper/3.7.0 package update (#34232)

<p align="center">
<img
src="https://raw.githubusercontent.com/wolfi-dev/.github/b535a42419ce0edb3c144c0edcff55a62b8ec1f8/profile/wolfi-logo-light-mode.svg"
/>
</p>

---------

Signed-off-by: wolfi-bot <121097084+wolfi-bot@users.noreply.github.com>
Co-authored-by: wolfi-bot <121097084+wolfi-bot@users.noreply.github.com>
Co-authored-by: Ritwik Srinivas <ritwikrsrinivas@gmail.com>
---
 cassandra-reaper.yaml                         |  9 ++---
 cassandra-reaper/src/server/pombump-deps.yaml |  7 ++++
 cassandra-reaper/upgrade-deps.patch           | 38 -------------------
 3 files changed, 11 insertions(+), 43 deletions(-)
 create mode 100644 cassandra-reaper/src/server/pombump-deps.yaml
 delete mode 100644 cassandra-reaper/upgrade-deps.patch

diff --git a/cassandra-reaper.yaml b/cassandra-reaper.yaml
index bd8f80cd188..d61e055a623 100644
--- a/cassandra-reaper.yaml
+++ b/cassandra-reaper.yaml
@@ -1,6 +1,6 @@
 package:
   name: cassandra-reaper
-  version: 3.6.1
+  version: 3.7.0
   epoch: 0
   description: Automated Repair Awesomeness for Apache Cassandra
   copyright:
@@ -34,11 +34,10 @@ pipeline:
     with:
       repository: https://github.com/thelastpickle/cassandra-reaper
       tag: ${{package.version}}
-      expected-commit: c98903c9d4b65b1ad1f6566498865524681239c7
+      expected-commit: 46356166424bf1822442f78c5373b4959e8af46c
 
-  - uses: patch
-    with:
-      patches: upgrade-deps.patch
+  - uses: maven/pombump
+    working-directory: src/server
 
   # Install native binary JAR to $HOME/.m2 so it can be used later
   - runs: |
diff --git a/cassandra-reaper/src/server/pombump-deps.yaml b/cassandra-reaper/src/server/pombump-deps.yaml
new file mode 100644
index 00000000000..6a31106d20c
--- /dev/null
+++ b/cassandra-reaper/src/server/pombump-deps.yaml
@@ -0,0 +1,7 @@
+patches:
+  - groupId: org.yaml
+    artifactId: snakeyaml
+    version: 1.33
+  - groupId: io.netty
+    artifactId: netty-handler
+    version: 4.1.115.Final
diff --git a/cassandra-reaper/upgrade-deps.patch b/cassandra-reaper/upgrade-deps.patch
deleted file mode 100644
index 6e7f341c518..00000000000
--- a/cassandra-reaper/upgrade-deps.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git a/src/server/pom.xml b/src/server/pom.xml
-index 58aa96bc..47e4f7b2 100644
---- a/src/server/pom.xml
-+++ b/src/server/pom.xml
-@@ -33,7 +33,7 @@
-         <jersey.version>2.35</jersey.version>
-         <logback.version>1.3.14</logback.version>
-         <cxf.version>3.4.5</cxf.version>
--        <shiro.version>1.12.0</shiro.version>
-+        <shiro.version>1.13.0</shiro.version>
-         <prometheus.version>0.12.0</prometheus.version>
-         <docker.directory>src/main/docker</docker.directory>
-         <timestamp>${maven.build.timestamp}</timestamp>
-@@ -160,16 +160,21 @@
-                     <groupId>com.boundary</groupId>
-                     <artifactId>high-scale-lib</artifactId>
-                 </exclusion>
--                <exclusion>
-+                <!-- <exclusion>
-                     <groupId>org.yaml</groupId>
-                     <artifactId>snakeyaml</artifactId>
--                </exclusion>
-+                </exclusion> -->
-             </exclusions>
-         </dependency>
-+        <dependency>
-+            <groupId>org.yaml</groupId>
-+            <artifactId>snakeyaml</artifactId>
-+            <version>1.33</version>
-+        </dependency>
-         <dependency>
-             <groupId>io.netty</groupId>
-             <artifactId>netty-handler</artifactId>
--            <version>4.1.70.Final</version>
-+            <version>4.1.94.Final</version>
-         </dependency>
-         <dependency>
-             <groupId>com.datastax.cassandra</groupId>