fixup! build(deps): bump com.google.protobuf:protobuf-java from 3.25.…

…2 to 3.25.5 (#675)
cryostatio · Oct 2, 2024 · 0f434c2 · 0f434c2
1 parent 1f072b1
commit 0f434c2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git 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>

diff --git a/src/main/webui b/src/main/webui