From beb8e56947eba16f4512f753e2b4e55ca7e1a78e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 15 Jul 2026 12:32:45 -0400
Subject: [PATCH 1/2] fix(deps): update dependency
com.fasterxml.jackson:jackson-bom to v2.22.1 (#962)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
(cherry picked from commit 386bc95706ec6357370fff6722c44ae9a63a5157)
# Conflicts:
# pom.xml
---
pom.xml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/pom.xml b/pom.xml
index c3f8c134..7b184184 100644
--- a/pom.xml
+++ b/pom.xml
@@ -82,7 +82,11 @@
3.20.0
2.21.0
5.4.4
+<<<<<<< HEAD
2.21.3
+=======
+ 2.22.1
+>>>>>>> 386bc95 (fix(deps): update dependency com.fasterxml.jackson:jackson-bom to v2.22.1 (#962))
3.10.2
2.0.17
0.5.2
From 5dd6944506e95cda782417e4a3217f49491a454d Mon Sep 17 00:00:00 2001
From: Andrew Azores
Date: Wed, 15 Jul 2026 12:34:33 -0400
Subject: [PATCH 2/2] fixup! fix(deps): update dependency
com.fasterxml.jackson:jackson-bom to v2.22.1 (#962)
---
pom.xml | 4 ----
1 file changed, 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7b184184..d35002b4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -82,11 +82,7 @@
3.20.0
2.21.0
5.4.4
-<<<<<<< HEAD
- 2.21.3
-=======
2.22.1
->>>>>>> 386bc95 (fix(deps): update dependency com.fasterxml.jackson:jackson-bom to v2.22.1 (#962))
3.10.2
2.0.17
0.5.2