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 f334dab28c12c0b2637115bb7e1139316a213c5e Author: Tom Cunningham <[email protected]> AuthorDate: Tue Jan 9 11:46:13 2024 -0500 Add dependencyManagement entries for artifacts being overwritten in redhat BOM (#312) --- pom.xml | 35 ++++++++++++++++++++++++++ tooling/camel-spring-boot-dependencies/pom.xml | 10 ++++++++ 2 files changed, 45 insertions(+) diff --git a/pom.xml b/pom.xml index ac8d1735ba8..2aed1249dcd 100644 --- a/pom.xml +++ b/pom.xml @@ -174,6 +174,41 @@ <artifactId>openshift-maven-plugin</artifactId> <version>${openshift-maven-plugin-version}</version> </dependency> + <!-- org.apache.tomcat:catalina dependencyManagement entry + is necessary for PME align to the correct tomcat-version --> + <dependency> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat-catalina</artifactId> + <version>${tomcat-version}</version> + </dependency> + <!-- io.projectreactor.netty:reactor-netty-http dependencyManagement entry + is necessary for PME align to the correct reactor-netty-version --> + <dependency> + <groupId>io.projectreactor.netty</groupId> + <artifactId>reactor-netty-http</artifactId> + <version>${reactor-netty-version}</version> + </dependency> + <!-- org.json:json dependencyManagement entry + is necessary for PME align to the correct org-json-json-version --> + <dependency> + <groupId>org.json</groupId> + <artifactId>json</artifactId> + <version>${org-json-json-version}</version> + </dependency> + + <!-- org.apache.activemq:artemis-version dependencyManagement entry + is necessary for PME align to the correct artemis-version --> + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>artemis-commons</artifactId> + <version>${artemis-version}</version> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> + </dependency> </dependencies> </dependencyManagement> diff --git a/tooling/camel-spring-boot-dependencies/pom.xml b/tooling/camel-spring-boot-dependencies/pom.xml index 32e30d69fe0..5d79d0f6416 100644 --- a/tooling/camel-spring-boot-dependencies/pom.xml +++ b/tooling/camel-spring-boot-dependencies/pom.xml @@ -4054,6 +4054,11 @@ <artifactId>maven-plugin-annotations</artifactId> <version>3.6.4</version> </dependency> + <dependency> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat-catalina</artifactId> + <version>10.1.16</version> + </dependency> <dependency> <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-core-asl</artifactId> @@ -4089,6 +4094,11 @@ <artifactId>camel-sap-starter</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.json</groupId> + <artifactId>json</artifactId> + <version>20231013</version> + </dependency> <dependency> <groupId>org.xerial.snappy</groupId> <artifactId>snappy-java</artifactId>
