This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 5bc3fd58b21 Rename Langchain4j property placeholder to follow the
traditional syntax (#13988)
5bc3fd58b21 is described below
commit 5bc3fd58b21f943b71d987e114d44de7c98b348e
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Tue Apr 30 11:01:58 2024 +0200
Rename Langchain4j property placeholder to follow the traditional syntax
(#13988)
Signed-off-by: Andrea Cosentino <anco...@gmail.com>
---
.../src/main/java/org/apache/camel/parser/XmlRouteParser.java | 5 ++---
.../apache/camel/parser/helper/CamelJavaRestDslParserHelper.java | 4 +---
components/camel-ai/camel-langchain4j-chat/pom.xml | 4 ++--
components/camel-ai/camel-langchain4j-embeddings/pom.xml | 6 +++---
components/camel-milvus/pom.xml | 2 +-
components/camel-pinecone/pom.xml | 2 +-
components/camel-qdrant/pom.xml | 2 +-
parent/pom.xml | 2 +-
8 files changed, 12 insertions(+), 15 deletions(-)
diff --git
a/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/XmlRouteParser.java
b/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/XmlRouteParser.java
index 5e219140b51..d99555f5fbf 100644
---
a/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/XmlRouteParser.java
+++
b/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/XmlRouteParser.java
@@ -132,8 +132,7 @@ public final class XmlRouteParser {
uri = trimEndpointUri(uri);
}
if (!Strings.isNullOrEmpty(uri)) {
- final CamelEndpointDetails detail =
- toCamelEndpointDetails(baseDir,
fullyQualifiedFileName, node, uri);
+ final CamelEndpointDetails detail =
toCamelEndpointDetails(baseDir, fullyQualifiedFileName, node, uri);
endpoints.add(detail);
}
}
@@ -159,7 +158,7 @@ public final class XmlRouteParser {
}
return toEndpointDetails(node, fileName, lineNumber, lineNumberEnd,
id, uri, consumerOnly,
- producerOnly);
+ producerOnly);
}
private static boolean isProducerOnly(String nodeName) {
diff --git
a/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelJavaRestDslParserHelper.java
b/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelJavaRestDslParserHelper.java
index 986dfa66ff8..6d4d29aedd2 100644
---
a/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelJavaRestDslParserHelper.java
+++
b/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelJavaRestDslParserHelper.java
@@ -120,8 +120,7 @@ public final class CamelJavaRestDslParserHelper {
Expression exp = es.getExpression();
boolean valid = isRest(exp);
if (valid) {
- final RestServiceDetails node =
- doParse(clazz, fullyQualifiedFileName,
configureMethod, exp, block);
+ final RestServiceDetails node = doParse(clazz,
fullyQualifiedFileName, configureMethod, exp, block);
answer.add(node);
}
@@ -129,7 +128,6 @@ public final class CamelJavaRestDslParserHelper {
}
}
-
return answer;
}
diff --git a/components/camel-ai/camel-langchain4j-chat/pom.xml
b/components/camel-ai/camel-langchain4j-chat/pom.xml
index 13f8f3f292c..0d700f4f399 100644
--- a/components/camel-ai/camel-langchain4j-chat/pom.xml
+++ b/components/camel-ai/camel-langchain4j-chat/pom.xml
@@ -42,7 +42,7 @@
<dependency>
<groupId>dev.langchain4j</groupId>
<artifactId>langchain4j</artifactId>
- <version>${langchain4j.version}</version>
+ <version>${langchain4j-version}</version>
</dependency>
<!-- for testing -->
@@ -54,7 +54,7 @@
<dependency>
<groupId>dev.langchain4j</groupId>
<artifactId>langchain4j-ollama</artifactId>
- <version>${langchain4j.version}</version>
+ <version>${langchain4j-version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-ai/camel-langchain4j-embeddings/pom.xml
b/components/camel-ai/camel-langchain4j-embeddings/pom.xml
index 885b168b610..06793560c05 100644
--- a/components/camel-ai/camel-langchain4j-embeddings/pom.xml
+++ b/components/camel-ai/camel-langchain4j-embeddings/pom.xml
@@ -50,7 +50,7 @@
<dependency>
<groupId>dev.langchain4j</groupId>
<artifactId>langchain4j-core</artifactId>
- <version>${langchain4j.version}</version>
+ <version>${langchain4j-version}</version>
</dependency>
<!-- test dependencies -->
@@ -89,13 +89,13 @@
<dependency>
<groupId>dev.langchain4j</groupId>
<artifactId>langchain4j-embeddings</artifactId>
- <version>${langchain4j.version}</version>
+ <version>${langchain4j-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>dev.langchain4j</groupId>
<artifactId>langchain4j-embeddings-all-minilm-l6-v2</artifactId>
- <version>${langchain4j.version}</version>
+ <version>${langchain4j-version}</version>
<scope>test</scope>
</dependency>
diff --git a/components/camel-milvus/pom.xml b/components/camel-milvus/pom.xml
index d7ac9a4850a..ffcd944e558 100644
--- a/components/camel-milvus/pom.xml
+++ b/components/camel-milvus/pom.xml
@@ -52,7 +52,7 @@
<dependency>
<groupId>dev.langchain4j</groupId>
<artifactId>langchain4j-core</artifactId>
- <version>${langchain4j.version}</version>
+ <version>${langchain4j-version}</version>
</dependency>
<dependency>
diff --git a/components/camel-pinecone/pom.xml
b/components/camel-pinecone/pom.xml
index 2706443d7bb..27d51d2677f 100644
--- a/components/camel-pinecone/pom.xml
+++ b/components/camel-pinecone/pom.xml
@@ -52,7 +52,7 @@
<dependency>
<groupId>dev.langchain4j</groupId>
<artifactId>langchain4j-core</artifactId>
- <version>${langchain4j.version}</version>
+ <version>${langchain4j-version}</version>
</dependency>
<dependency>
diff --git a/components/camel-qdrant/pom.xml b/components/camel-qdrant/pom.xml
index 28d5b47507a..cacfbf2117c 100644
--- a/components/camel-qdrant/pom.xml
+++ b/components/camel-qdrant/pom.xml
@@ -51,7 +51,7 @@
<dependency>
<groupId>dev.langchain4j</groupId>
<artifactId>langchain4j-core</artifactId>
- <version>${langchain4j.version}</version>
+ <version>${langchain4j-version}</version>
</dependency>
<dependency>
diff --git a/parent/pom.xml b/parent/pom.xml
index 6640bb01760..d9964ff0a46 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -316,7 +316,7 @@
<kotlinpoet-version>1.16.0</kotlinpoet-version>
<kubernetes-client-version>6.12.1</kubernetes-client-version>
<kudu-version>1.17.0</kudu-version>
- <langchain4j.version>0.30.0</langchain4j.version>
+ <langchain4j-version>0.30.0</langchain4j-version>
<leveldbjni-version>1.8</leveldbjni-version>
<leveldb-api-version>0.12</leveldb-api-version>
<leveldb-version>0.12</leveldb-version>
