This is an automated email from the ASF dual-hosted git repository.
jiriondrusek pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 815336616dc966ea7f0c235cb2e9ddcb5e4a353f
Author: Jiri Ondrusek <ondrusek.j...@gmail.com>
AuthorDate: Fri Feb 28 08:56:24 2025 +0100
Fix of the rebasing conflict
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 04425db5e8..fd716bb5d5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,8 +51,8 @@
<quarkiverse-artemis.version>3.7.0</quarkiverse-artemis.version><!--
https://repo1.maven.org/maven2/io/quarkiverse/artemis/quarkus-artemis-parent/
-->
<quarkiverse-cxf.version>3.19.0</quarkiverse-cxf.version><!-- This
should be in sync with quarkus-platform
https://repo1.maven.org/maven2/io/quarkiverse/cxf/quarkus-cxf-parent/ -->
<quarkiverse-freemarker.version>1.2.0</quarkiverse-freemarker.version><!--
https://repo1.maven.org/maven2/io/quarkiverse/freemarker/quarkus-freemarker-parent/
-->
- <quarkiverse-fury.version>0.3.0</quarkiverse-fury.version><!--
https://repo1.maven.org/maven2/io/quarkiverse/fury/quarkus-fury-parent/ -->
- <quarkiverse-groovy.version>3.19.2</quarkiverse-groovy.version><!--
https://repo1.maven.org/maven2/io/quarkiverse/groovy/quarkus-groovy-parent/ -->
+ <quarkiverse-fury.version>0.3.1</quarkiverse-fury.version><!--
https://repo1.maven.org/maven2/io/quarkiverse/fury/quarkus-fury-parent/ -->
+ <quarkiverse-groovy.version>3.19.0</quarkiverse-groovy.version><!--
https://repo1.maven.org/maven2/io/quarkiverse/groovy/quarkus-groovy-parent/ -->
<quarkiverse-jackson-jq.version>2.2.0</quarkiverse-jackson-jq.version><!--
https://repo1.maven.org/maven2/io/quarkiverse/jackson-jq/quarkus-jackson-jq-parent/
-->
<quarkiverse-jgit.version>3.3.3</quarkiverse-jgit.version><!--
https://repo1.maven.org/maven2/io/quarkiverse/jgit/quarkus-jgit-parent/ -->
<quarkiverse-jsch.version>3.0.13</quarkiverse-jsch.version><!--
https://repo1.maven.org/maven2/io/quarkiverse/jsch/quarkus-jsch-parent/ -->
