You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2022/03/18 10:05:47 UTC

[camel-quarkus] 12/12: Use com.github.java-json-tools:* instead of com.github.fge:* #3632

This is an automated email from the ASF dual-hosted git repository.

jamesnetherton pushed a commit to branch 2.7.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git

commit b03a9fc00b7d19dd8855b7e10d84dabb183bbf8f
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Thu Mar 17 12:35:42 2022 +0100

    Use com.github.java-json-tools:* instead of com.github.fge:* #3632
---
 extensions/openstack/runtime/pom.xml |  4 ++++
 pom.xml                              |  2 ++
 poms/bom/pom.xml                     | 15 +++++++++++++++
 3 files changed, 21 insertions(+)

diff --git a/extensions/openstack/runtime/pom.xml b/extensions/openstack/runtime/pom.xml
index 7adb2f6..771b4a2 100644
--- a/extensions/openstack/runtime/pom.xml
+++ b/extensions/openstack/runtime/pom.xml
@@ -57,6 +57,10 @@
             <artifactId>camel-openstack</artifactId>
         </dependency>
         <dependency>
+            <groupId>com.github.java-json-tools</groupId>
+            <artifactId>json-patch</artifactId>
+        </dependency>
+        <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-jackson</artifactId>
         </dependency>
diff --git a/pom.xml b/pom.xml
index 8accc9c..5f166ed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -99,6 +99,7 @@
         <jakarta.jms-api.version>2.0.3</jakarta.jms-api.version>
         <jakarta.jws.ws.api.version>2.1.0</jakarta.jws.ws.api.version>
         <jakarta.xml.ws.api.version>2.3.3</jakarta.xml.ws.api.version>
+        <java-json-tools.json-patch.version>1.13</java-json-tools.json-patch.version><!-- A replacement for com.github.fge:json-patch -->
         <jcodings.version>1.0.55</jcodings.version><!-- used by hbase -->
         <jodatime.version>2.10.6</jodatime.version><!-- Mess in transitive dependencies of Spark and Splunk -->
         <joni.version>2.1.31</joni.version><!-- used by json-validator -->
@@ -657,6 +658,7 @@
                                         </requireMavenVersion>
                                         <bannedDependencies>
                                             <excludes>
+                                                <exclude>com.github.fge:*</exclude><!-- Use com.github.java-json-tools:* instead -->
                                                 <exclude>com.google.code.findbugs:jsr305</exclude>
                                                 <exclude>com.sun.activation:javax.activation</exclude><!-- use com.sun.activation:jakarta.activation instead -->
                                                 <exclude>commons-logging:commons-logging</exclude><!-- use org.jboss.logging:commons-logging-jboss-logging instead of commons-logging and commons-logging-api -->
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index c7b522a..c4d7d87 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -2073,6 +2073,10 @@
                 <version>${camel.version}</version>
                 <exclusions>
                     <exclusion>
+                        <groupId>com.github.fge</groupId>
+                        <artifactId>*</artifactId>
+                    </exclusion>
+                    <exclusion>
                         <groupId>com.google.code.findbugs</groupId>
                         <artifactId>jsr305</artifactId>
                     </exclusion>
@@ -6192,6 +6196,17 @@
                 <version>${fommil.netlib.core.version}</version>
             </dependency>
             <dependency>
+                <groupId>com.github.java-json-tools</groupId>
+                <artifactId>json-patch</artifactId>
+                <version>${java-json-tools.json-patch.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>com.google.code.findbugs</groupId>
+                        <artifactId>jsr305</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
                 <groupId>com.github.jnr</groupId>
                 <artifactId>jnr-ffi</artifactId>
                 <version>${jnr-ffi.version}</version>