You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by fm...@apache.org on 2024/01/25 12:46:52 UTC
(camel-spring-boot) 39/40: Override version of org.json:json - need a newer version than the one coming in from spring boot (#311)
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit e3a84a1d41c2743f40d1fae38eb539001376101d
Author: Tom Cunningham <tc...@redhat.com>
AuthorDate: Thu Dec 7 08:38:34 2023 -0500
Override version of org.json:json - need a newer version than the one coming in from spring boot (#311)
---
pom.xml | 1 +
.../src/main/resources/pom.xml | 6 ++++++
tooling/redhat-camel-spring-boot-bom/pom.xml | 6 ++++++
3 files changed, 13 insertions(+)
diff --git a/pom.xml b/pom.xml
index 4afc2586737..ac8d1735ba8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -139,6 +139,7 @@
<maven-javadoc-plugin-version>3.4.1</maven-javadoc-plugin-version>
<maven-surefire-plugin-version>3.1.2</maven-surefire-plugin-version>
<mycila-license-version>3.0</mycila-license-version>
+ <org-json-json-version>20231013</org-json-json-version>
<reactor-netty-version>1.1.13</reactor-netty-version>
<springdoc-version>2.2.0</springdoc-version>
<surefire.version>${maven-surefire-plugin-version}</surefire.version>
diff --git a/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml b/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
index 0031736cc58..ed28efa63a6 100644
--- a/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
+++ b/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
@@ -135,6 +135,12 @@
<artifactId>reactor-netty-http</artifactId>
<version>${reactor-netty-version}</version>
</dependency>
+ <!-- Override for org.json:json -->
+ <dependency>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ <version>${org-json-json-version}</version>
+ </dependency>
<!-- Overrides for tomcat -->
<dependency>
<groupId>org.apache.tomcat</groupId>
diff --git a/tooling/redhat-camel-spring-boot-bom/pom.xml b/tooling/redhat-camel-spring-boot-bom/pom.xml
index 56d5fda0ae1..5b71c5b1d72 100644
--- a/tooling/redhat-camel-spring-boot-bom/pom.xml
+++ b/tooling/redhat-camel-spring-boot-bom/pom.xml
@@ -135,6 +135,12 @@
<artifactId>reactor-netty-http</artifactId>
<version>1.1.13</version>
</dependency>
+ <!-- Override for org.json:json -->
+ <dependency>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ <version>20231013</version>
+ </dependency>
<!-- Overrides for tomcat -->
<dependency>
<groupId>org.apache.tomcat</groupId>