This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch jackson-2.15.0-3.x
in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git
commit dfe224660455d8989697ff488f2f080bb30ec129
Author: Aurélien Pupier <apup...@redhat.com>
AuthorDate: Tue May 9 14:16:53 2023 +0200
Upgrade Jackson from 2.14.1 to 2.15.0
Signed-off-by: Aurélien Pupier <apup...@redhat.com>
---
pom.xml | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/pom.xml b/pom.xml
index 74b4d5ac..4fa08d7d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,10 +58,17 @@
<maven-groovy-plugin.version>2.1.1</maven-groovy-plugin.version>
<apache-rat-plugin.version>0.14</apache-rat-plugin.version>
+<<<<<<< HEAD
<camel.version>3.20.1</camel.version>
<slf4j.version>1.7.36</slf4j.version>
<log4j.version>2.19.0</log4j.version>
<jackson.version>2.14.1</jackson.version>
+=======
+ <camel.version>4.0.0-M2</camel.version>
+ <slf4j.version>2.0.6</slf4j.version>
+ <log4j.version>2.20.0</log4j.version>
+ <jackson.version>2.15.0</jackson.version>
+>>>>>>> 53b1adde (Upgrade Jackson from 2.14.1 to 2.15.0)
<camel.k.extension.version>6.1.1</camel.k.extension.version>
<commons.io.version>2.11.0</commons.io.version>
<junit.jupiter.version>5.9.1</junit.jupiter.version>
