From 1f072b16488f4b5059e2638d56dddc15e4104f4d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 2 Oct 2024 14:48:09 -0400
Subject: [PATCH 1/2] build(deps): bump com.google.protobuf:protobuf-java from
 3.25.2 to 3.25.5 (#675)

build(deps): bump com.google.protobuf:protobuf-java

Bumps [com.google.protobuf:protobuf-java](https://github.com/protocolbuffers/protobuf) from 3.25.2 to 3.25.5.
- [Release notes](https://github.com/protocolbuffers/protobuf/releases)
- [Changelog](https://github.com/protocolbuffers/protobuf/blob/main/protobuf_release.bzl)
- [Commits](https://github.com/protocolbuffers/protobuf/compare/v3.25.2...v3.25.5)

---
updated-dependencies:
- dependency-name: com.google.protobuf:protobuf-java
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Elliott Baron <ebaron@redhat.com>
(cherry picked from commit 5eb83ab8d7d7077dc51c6e1137321b97564debb9)

# Conflicts:
#	pom.xml
---
 pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pom.xml b/pom.xml
index 39999ac0c..805d8221e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,9 +48,15 @@
     <org.apache.commons.lang3.version>3.13.0</org.apache.commons.lang3.version>
     <org.apache.commons.validator.version>1.7</org.apache.commons.validator.version>
     <org.projectnessie.cel.bom.version>0.4.4</org.projectnessie.cel.bom.version>
+<<<<<<< HEAD
     <com.google.protobuf-java.version>3.25.2</com.google.protobuf-java.version>
     <com.nimbusds.jose.jwt.version>9.37.3</com.nimbusds.jose.jwt.version>
     <org.testcontainers.bom.version>1.19.8</org.testcontainers.bom.version>
+=======
+    <com.google.protobuf-java.version>3.25.5</com.google.protobuf-java.version>
+    <com.nimbusds.jose.jwt.version>9.41.1</com.nimbusds.jose.jwt.version>
+    <org.testcontainers.bom.version>1.20.2</org.testcontainers.bom.version>
+>>>>>>> 5eb83ab (build(deps): bump com.google.protobuf:protobuf-java from 3.25.2 to 3.25.5 (#675))
     <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
     <quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
     <quarkus.platform.version>3.2.12.Final</quarkus.platform.version>

From 7d921d1f4d56f28cfbc66abf3fdad0ae0509ddf7 Mon Sep 17 00:00:00 2001
From: Andrew Azores <aazores@redhat.com>
Date: Wed, 2 Oct 2024 14:52:08 -0400
Subject: [PATCH 2/2] fixup! build(deps): bump
 com.google.protobuf:protobuf-java from 3.25.2 to 3.25.5 (#675)

---
 pom.xml | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 805d8221e..4baaa0bab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,15 +48,9 @@
     <org.apache.commons.lang3.version>3.13.0</org.apache.commons.lang3.version>
     <org.apache.commons.validator.version>1.7</org.apache.commons.validator.version>
     <org.projectnessie.cel.bom.version>0.4.4</org.projectnessie.cel.bom.version>
-<<<<<<< HEAD
-    <com.google.protobuf-java.version>3.25.2</com.google.protobuf-java.version>
+    <com.google.protobuf-java.version>3.25.5</com.google.protobuf-java.version>
     <com.nimbusds.jose.jwt.version>9.37.3</com.nimbusds.jose.jwt.version>
     <org.testcontainers.bom.version>1.19.8</org.testcontainers.bom.version>
-=======
-    <com.google.protobuf-java.version>3.25.5</com.google.protobuf-java.version>
-    <com.nimbusds.jose.jwt.version>9.41.1</com.nimbusds.jose.jwt.version>
-    <org.testcontainers.bom.version>1.20.2</org.testcontainers.bom.version>
->>>>>>> 5eb83ab (build(deps): bump com.google.protobuf:protobuf-java from 3.25.2 to 3.25.5 (#675))
     <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
     <quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
     <quarkus.platform.version>3.2.12.Final</quarkus.platform.version>