This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 1d0c632d49597c9afa094d9678b798c5b01f7e65 Author: JiriOndrusek <ondrusek.j...@gmail.com> AuthorDate: Thu Sep 7 09:46:13 2023 +0200 Kudu dependency conflict fix + generated files --- pom.xml | 1 + poms/bom/pom.xml | 11 +++++++++++ poms/bom/src/main/generated/flattened-full-pom.xml | 13 ++++++++++++- poms/bom/src/main/generated/flattened-reduced-pom.xml | 13 ++++++++++++- .../src/main/generated/flattened-reduced-verbose-pom.xml | 13 ++++++++++++- 5 files changed, 48 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index ab5afdf56c..fdad5e8f88 100644 --- a/pom.xml +++ b/pom.xml @@ -72,6 +72,7 @@ <animal-sniffer.version>1.18</animal-sniffer.version> <antlr3.version>3.5.2</antlr3.version><!-- Spark, Stringtemplate and probably others --> <avro.version>1.11.2</avro.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.apache.avro:avro --> + <audience-annotations.version>${yetus-audience-annotations-version}</audience-annotations.version> <awssdk.version>2.20.128</awssdk.version><!-- @sync io.quarkiverse.amazonservices:quarkus-amazon-services-parent:${quarkiverse-amazonservices.version} prop:awssdk.version --> <awscrt.version>0.24.0</awscrt.version><!-- @sync software.amazon.awssdk:aws-sdk-java-pom:${awssdk.version} prop:awscrt.version --> <assertj.version>3.24.2</assertj.version><!-- @sync io.quarkus:quarkus-build-parent:${quarkus.version} prop:assertj.version --> diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index 7d2f579f8d..6f0b3225af 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -6538,6 +6538,12 @@ <groupId>org.apache.kudu</groupId> <artifactId>kudu-client</artifactId> <version>${kudu.version}</version> + <exclusions> + <exclusion> + <groupId>com.google.code.findbugs</groupId> + <artifactId>jsr305</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.pdfbox</groupId> @@ -6550,6 +6556,11 @@ </exclusion> </exclusions> </dependency> + <dependency> + <groupId>org.apache.yetus</groupId> + <artifactId>audience-annotations</artifactId> + <version>${audience-annotations.version}</version> + </dependency> <dependency> <groupId>org.snakeyaml</groupId> <artifactId>snakeyaml-engine</artifactId> diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 8823a6145b..ab2dc60466 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6460,7 +6460,13 @@ <dependency> <groupId>org.apache.kudu</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>kudu-client</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>1.16.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>1.17.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <exclusions> + <exclusion> + <groupId>com.google.code.findbugs</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>jsr305</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.pdfbox</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -6473,6 +6479,11 @@ </exclusion> </exclusions> </dependency> + <dependency> + <groupId>org.apache.yetus</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>audience-annotations</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>0.14.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </dependency> <dependency> <groupId>org.snakeyaml</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>snakeyaml-engine</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index f199ca37b2..063e5a5fa8 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6415,7 +6415,13 @@ <dependency> <groupId>org.apache.kudu</groupId> <artifactId>kudu-client</artifactId> - <version>1.16.0</version> + <version>1.17.0</version> + <exclusions> + <exclusion> + <groupId>com.google.code.findbugs</groupId> + <artifactId>jsr305</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.pdfbox</groupId> @@ -6428,6 +6434,11 @@ </exclusion> </exclusions> </dependency> + <dependency> + <groupId>org.apache.yetus</groupId> + <artifactId>audience-annotations</artifactId> + <version>0.14.1</version> + </dependency> <dependency> <groupId>org.snakeyaml</groupId> <artifactId>snakeyaml-engine</artifactId> diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index f56405d82c..f526fe09d2 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -6415,7 +6415,13 @@ <dependency> <groupId>org.apache.kudu</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>kudu-client</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>1.16.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>1.17.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <exclusions> + <exclusion> + <groupId>com.google.code.findbugs</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>jsr305</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.pdfbox</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -6428,6 +6434,11 @@ </exclusion> </exclusions> </dependency> + <dependency> + <groupId>org.apache.yetus</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>audience-annotations</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>0.14.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </dependency> <dependency> <groupId>org.snakeyaml</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>snakeyaml-engine</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->