This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 82d9bd45f6a810782a6b49c1c740a92d7076aad3 Author: JiriOndrusek <ondrusek.j...@gmail.com> AuthorDate: Thu Aug 31 09:24:49 2023 +0200 Fixed dependency confilct after upgrade of Snakeyaml engine to 2.7 i Camel + generated files --- poms/bom/pom.xml | 5 +++++ poms/bom/src/main/generated/flattened-full-pom.xml | 5 +++++ poms/bom/src/main/generated/flattened-reduced-pom.xml | 5 +++++ poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 5 +++++ 4 files changed, 20 insertions(+) diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index 5c15f01a69..d492a01cb5 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -6550,6 +6550,11 @@ </exclusion> </exclusions> </dependency> + <dependency> + <groupId>org.snakeyaml</groupId> + <artifactId>snakeyaml-engine</artifactId> + <version>${snakeyaml-engine-version}</version> + </dependency> <dependency> <groupId>org.apache.xmlgraphics</groupId> <artifactId>xmlgraphics-commons</artifactId> diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index e9e4031937..330e8012e5 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6473,6 +6473,11 @@ </exclusion> </exclusions> </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} --> + <version>2.7</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </dependency> <dependency> <groupId>org.apache.xmlgraphics</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>xmlgraphics-commons</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 e767256f71..320116600d 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6428,6 +6428,11 @@ </exclusion> </exclusions> </dependency> + <dependency> + <groupId>org.snakeyaml</groupId> + <artifactId>snakeyaml-engine</artifactId> + <version>2.7</version> + </dependency> <dependency> <groupId>org.apache.xmlgraphics</groupId> <artifactId>xmlgraphics-commons</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 cf20d3b7f3..b984a10201 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -6428,6 +6428,11 @@ </exclusion> </exclusions> </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} --> + <version>2.7</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </dependency> <dependency> <groupId>org.apache.xmlgraphics</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>xmlgraphics-commons</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->