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 8ce3614191 Fixed twilio and langchain4j conflict 8ce3614191 is described below commit 8ce3614191e9c018d92e078d58fc6f7dc2b38200 Author: JiriOndrusek <ondrusek.j...@gmail.com> AuthorDate: Mon Jul 8 11:12:48 2024 +0200 Fixed twilio and langchain4j conflict --- .../component/twilio/it/TwilioResource.java | 5 ++++- poms/bom/pom.xml | 22 ++++++++++++++++++++++ poms/bom/src/main/generated/flattened-full-pom.xml | 20 ++++++++++++++++++++ .../src/main/generated/flattened-reduced-pom.xml | 20 ++++++++++++++++++++ .../generated/flattened-reduced-verbose-pom.xml | 20 ++++++++++++++++++++ 5 files changed, 86 insertions(+), 1 deletion(-) diff --git a/integration-tests/twilio/src/main/java/org/apache/camel/quarkus/component/twilio/it/TwilioResource.java b/integration-tests/twilio/src/main/java/org/apache/camel/quarkus/component/twilio/it/TwilioResource.java index c81d4054a8..4b38c2db23 100644 --- a/integration-tests/twilio/src/main/java/org/apache/camel/quarkus/component/twilio/it/TwilioResource.java +++ b/integration-tests/twilio/src/main/java/org/apache/camel/quarkus/component/twilio/it/TwilioResource.java @@ -22,6 +22,7 @@ import java.util.Optional; import com.twilio.constant.EnumConstants; import com.twilio.http.HttpClient; +import com.twilio.http.IRequest; import com.twilio.http.NetworkHttpClient; import com.twilio.http.Request; import com.twilio.http.TwilioRestClient; @@ -80,8 +81,10 @@ public class TwilioResource { Optional<String> wireMockUrl = ConfigProvider.getConfig().getOptionalValue("wiremock.url", String.class); if (wireMockUrl.isPresent()) { HttpClient client = new NetworkHttpClient() { + @Override - public com.twilio.http.Response makeRequest(Request originalRequest) { + public <T extends IRequest> com.twilio.http.Response makeRequest(T r) { + Request originalRequest = (Request) r; String url = originalRequest.getUrl(); Request modified = new Request(originalRequest.getMethod(), diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index 5f7d920a52..4919376b8d 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -1808,11 +1808,33 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-langchain4j-chat</artifactId> <version>${camel.version}</version> + <!-- Required until quarkus upgrades to the same version of langchain4j --> + <exclusions> + <exclusion> + <artifactId>langchain4j-core</artifactId> + <groupId>dev.langchain4j</groupId> + </exclusion> + <exclusion> + <artifactId>langchain4j</artifactId> + <groupId>dev.langchain4j</groupId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-langchain4j-core</artifactId> <version>${camel.version}</version> + <!-- Required until quarkus upgrades to the same version of langchain4j --> + <exclusions> + <exclusion> + <artifactId>langchain4j-core</artifactId> + <groupId>dev.langchain4j</groupId> + </exclusion> + <exclusion> + <artifactId>langchain4j</artifactId> + <groupId>dev.langchain4j</groupId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.camel</groupId> diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index de847b6692..4e64abb35b 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -1745,11 +1745,31 @@ <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>langchain4j-core</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </exclusion> + <exclusion> + <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} --> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.camel</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>camel-langchain4j-core</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>langchain4j-core</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </exclusion> + <exclusion> + <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} --> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.camel</groupId><!-- 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 972c015568..58e1b37565 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -1745,11 +1745,31 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-langchain4j-chat</artifactId> <version>4.7.0-SNAPSHOT</version> + <exclusions> + <exclusion> + <groupId>dev.langchain4j</groupId> + <artifactId>langchain4j-core</artifactId> + </exclusion> + <exclusion> + <groupId>dev.langchain4j</groupId> + <artifactId>langchain4j</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-langchain4j-core</artifactId> <version>4.7.0-SNAPSHOT</version> + <exclusions> + <exclusion> + <groupId>dev.langchain4j</groupId> + <artifactId>langchain4j-core</artifactId> + </exclusion> + <exclusion> + <groupId>dev.langchain4j</groupId> + <artifactId>langchain4j</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.camel</groupId> 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 da49075648..80f014e96d 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -1745,11 +1745,31 @@ <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>langchain4j-core</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </exclusion> + <exclusion> + <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} --> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.camel</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>camel-langchain4j-core</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>langchain4j-core</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </exclusion> + <exclusion> + <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} --> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.camel</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->