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
The following commit(s) were added to refs/heads/camel-main by this push:
new 8d7a2d2da9 Proper fix of longchain4j version conflict
8d7a2d2da9 is described below
commit 8d7a2d2da92788b4aabe2e5779c77ebc9c7f8071
Author: JiriOndrusek <[email protected]>
AuthorDate: Wed Jun 5 14:50:42 2024 +0200
Proper fix of longchain4j version conflict
---
pom.xml | 2 +-
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 ++++++---------------
5 files changed, 25 insertions(+), 41 deletions(-)
diff --git a/pom.xml b/pom.xml
index 8741b6bcc2..c66deed07e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -133,7 +133,7 @@
<kudu.version>${kudu-version}</kudu.version>
<kotlin.version>1.9.23</kotlin.version><!-- @sync
io.quarkus:quarkus-bom:${quarkus.version}
dep:org.jetbrains.kotlin:kotlin-stdlib -->
<kryo.version>2.24.0</kryo.version><!-- @sync
org.apache.flink:flink-core:${flink-version} dep:com.esotericsoftware.kryo:kryo
-->
-
<langchain4j.version>${langchain4j-version}</langchain4j.version><!--temporary
use version from camel, unitil qyarkus updates to 0.31.0 sync
io.quarkiverse.langchain4j:quarkus-langchain4j-parent:${quarkiverse-langchain4j.version}
prop:langchain4j.version -->
+ <langchain4j.version>0.30.0</langchain4j.version><!-- @sync
io.quarkiverse.langchain4j:quarkus-langchain4j-parent:${quarkiverse-langchain4j.version}
prop:langchain4j.version -->
<mapstruct.version>${mapstruct-version}</mapstruct.version>
<minio.version>8.5.7</minio.version><!-- @sync
io.quarkiverse.minio:quarkus-minio-parent:${quarkiverse-minio.version}
prop:minio.version -->
<msal4j.version>1.15.0</msal4j.version><!-- @sync
com.azure:azure-identity:${azure-identity.version}
dep:com.microsoft.azure:msal4j -->
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index a10de19e10..555c710bd1 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>
@@ -6607,11 +6613,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 19c342a77a..79405f3375 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} -->
@@ -6529,11 +6535,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 d002c0b4ea..55c8be041a 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>
@@ -6509,11 +6515,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>
@@ -7682,16 +7683,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 1a93dee4cb..1957653339 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} -->
@@ -6509,11 +6515,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} -->
@@ -7682,16 +7683,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 -->
