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 7b194c485e6e26a4f86cc497a2748bea24aa8290 Author: Tom Cunningham <[email protected]> AuthorDate: Fri Sep 29 14:14:08 2023 -0400 Override avro/commons-compress (#273) --- .../src/main/resources/pom.xml | 12 ++++++++++++ tooling/redhat-camel-spring-boot-bom/pom.xml | 12 ++++++++++++ 2 files changed, 24 insertions(+) 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 4945d735ad2..e1fa685691f 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 @@ -90,6 +90,18 @@ <artifactId>undertow-servlet</artifactId> <version>${undertow-version}</version> </dependency> + <!-- Overrides avro dependency version since SB's jackson version's takes precedence in camel-jackson-avro-starter --> + <dependency> + <groupId>org.apache.avro</groupId> + <artifactId>avro</artifactId> + <version>${avro-version}</version> + </dependency> + <!-- Override commons-compress version --> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-compress</artifactId> + <version>${commons-compress-version}</version> + </dependency> <!-- Overrides elastic-search dependency since SB is using an older version --> <dependency> <groupId>org.elasticsearch.client</groupId> diff --git a/tooling/redhat-camel-spring-boot-bom/pom.xml b/tooling/redhat-camel-spring-boot-bom/pom.xml index f11c251c5ab..8a5ffad44ee 100644 --- a/tooling/redhat-camel-spring-boot-bom/pom.xml +++ b/tooling/redhat-camel-spring-boot-bom/pom.xml @@ -90,6 +90,18 @@ <artifactId>undertow-servlet</artifactId> <version>2.3.7.Final</version> </dependency> + <!-- Overrides avro dependency version since SB's jackson version's takes precedence in camel-jackson-avro-starter --> + <dependency> + <groupId>org.apache.avro</groupId> + <artifactId>avro</artifactId> + <version>1.11.0</version> + </dependency> + <!-- Override commons-compress version --> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-compress</artifactId> + <version>1.21</version> + </dependency> <!-- Overrides elastic-search dependency since SB is using an older version --> <dependency> <groupId>org.elasticsearch.client</groupId>
