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 364248cc94910551c576144a47c506911ca5172d Author: JiriOndrusek <[email protected]> AuthorDate: Wed Jun 5 14:50:42 2024 +0200 Proper fix of longchain4j version conflict --- poms/bom/pom.xml | 11 ++++++----- poms/bom/src/main/generated/flattened-full-pom.xml | 11 ++++++----- .../src/main/generated/flattened-reduced-pom.xml | 21 ++++++--------------- .../generated/flattened-reduced-verbose-pom.xml | 21 ++++++--------------- 4 files changed, 24 insertions(+), 40 deletions(-) diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index 7d4df42bb6..8f9db31dff 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -1781,6 +1781,12 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-langchain4j-chat</artifactId> <version>${camel.version}</version> + <exclusions> + <exclusion> + <groupId>dev.langchain4j</groupId> + <artifactId>*</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.camel</groupId> @@ -6617,11 +6623,6 @@ <artifactId>commons-lang</artifactId> <version>${commons-lang.version}</version> </dependency> - <dependency> - <groupId>dev.langchain4j</groupId> - <artifactId>langchain4j</artifactId> - <version>${langchain4j-version}</version> - </dependency> <dependency> <groupId>io.dropwizard.metrics</groupId> <artifactId>dropwizard-core</artifactId> diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 22952304cc..8084ab23cc 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -1718,6 +1718,12 @@ <groupId>org.apache.camel</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>camel-langchain4j-chat</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <version>4.7.0-SNAPSHOT</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <exclusions> + <exclusion> + <groupId>dev.langchain4j</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>*</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.camel</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -6539,11 +6545,6 @@ <artifactId>commons-lang</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <version>2.6</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> - <dependency> - <groupId>dev.langchain4j</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <artifactId>langchain4j</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>0.31.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - </dependency> <dependency> <groupId>io.dropwizard.metrics</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>dropwizard-core</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 88df08ffe7..6a9d1dc774 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -1718,6 +1718,12 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-langchain4j-chat</artifactId> <version>4.7.0-SNAPSHOT</version> + <exclusions> + <exclusion> + <groupId>dev.langchain4j</groupId> + <artifactId>*</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.camel</groupId> @@ -6519,11 +6525,6 @@ <artifactId>commons-cli</artifactId> <version>1.4</version> </dependency> - <dependency> - <groupId>dev.langchain4j</groupId> - <artifactId>langchain4j</artifactId> - <version>0.31.0</version> - </dependency> <dependency> <groupId>io.minio</groupId> <artifactId>minio</artifactId> @@ -7692,16 +7693,6 @@ <artifactId>groovy</artifactId> <version>4.0.21</version> </dependency> - <dependency> - <groupId>org.apache.groovy</groupId> - <artifactId>groovy-json</artifactId> - <version>4.0.21</version> - </dependency> - <dependency> - <groupId>org.apache.groovy</groupId> - <artifactId>groovy-xml</artifactId> - <version>4.0.21</version> - </dependency> <dependency> <groupId>software.amazon.awssdk</groupId> <artifactId>annotations</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 4bbd71ad5f..b0518255c4 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -1718,6 +1718,12 @@ <groupId>org.apache.camel</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>camel-langchain4j-chat</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <version>4.7.0-SNAPSHOT</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <exclusions> + <exclusion> + <groupId>dev.langchain4j</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>*</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.camel</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -6519,11 +6525,6 @@ <artifactId>commons-cli</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <version>1.4</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> - <dependency> - <groupId>dev.langchain4j</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <artifactId>langchain4j</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>0.31.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - </dependency> <dependency> <groupId>io.minio</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>minio</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -7692,16 +7693,6 @@ <artifactId>groovy</artifactId><!-- org.apache.groovy:groovy-bom:4.0.21 --> <version>4.0.21</version><!-- org.apache.groovy:groovy-bom:4.0.21 --> </dependency> - <dependency> - <groupId>org.apache.groovy</groupId><!-- org.apache.groovy:groovy-bom:4.0.21 --> - <artifactId>groovy-json</artifactId><!-- org.apache.groovy:groovy-bom:4.0.21 --> - <version>4.0.21</version><!-- org.apache.groovy:groovy-bom:4.0.21 --> - </dependency> - <dependency> - <groupId>org.apache.groovy</groupId><!-- org.apache.groovy:groovy-bom:4.0.21 --> - <artifactId>groovy-xml</artifactId><!-- org.apache.groovy:groovy-bom:4.0.21 --> - <version>4.0.21</version><!-- org.apache.groovy:groovy-bom:4.0.21 --> - </dependency> <dependency> <groupId>software.amazon.awssdk</groupId><!-- software.amazon.awssdk:bom:2.25.60 --> <artifactId>annotations</artifactId><!-- software.amazon.awssdk:bom:2.25.60 -->
