This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch milvus-CAMEL-20880 in repository https://gitbox.apache.org/repos/asf/camel.git
commit 67d05a0ebfd762aead31271b5a95990876486a8d Author: Andrea Cosentino <[email protected]> AuthorDate: Mon Jun 17 11:37:07 2024 +0200 CAMEL-20880 - Move AI related component to camel-ai middle folder - Milvus Signed-off-by: Andrea Cosentino <[email protected]> --- components/{ => camel-ai}/camel-milvus/pom.xml | 2 +- .../org/apache/camel/component/milvus/MilvusComponentConfigurer.java | 0 .../apache/camel/component/milvus/MilvusConfigurationConfigurer.java | 0 .../org/apache/camel/component/milvus/MilvusEndpointConfigurer.java | 0 .../org/apache/camel/component/milvus/MilvusEndpointUriFactory.java | 0 .../resources/META-INF/org/apache/camel/component/milvus/milvus.json | 0 .../resources/META-INF/services/org/apache/camel/component.properties | 0 .../resources/META-INF/services/org/apache/camel/component/milvus | 0 .../META-INF/services/org/apache/camel/configurer/milvus-component | 0 .../META-INF/services/org/apache/camel/configurer/milvus-endpoint | 0 .../configurer/org.apache.camel.component.milvus.MilvusConfiguration | 0 .../resources/META-INF/services/org/apache/camel/transformer.properties | 0 .../META-INF/services/org/apache/camel/transformer/milvus-embeddings | 0 .../services/org/apache/camel/transformer/milvus-embeddings.json | 0 .../META-INF/services/org/apache/camel/urifactory/milvus-endpoint | 0 .../{ => camel-ai}/camel-milvus/src/main/docs/milvus-component.adoc | 0 .../src/main/java/org/apache/camel/component/milvus/Milvus.java | 0 .../src/main/java/org/apache/camel/component/milvus/MilvusAction.java | 0 .../main/java/org/apache/camel/component/milvus/MilvusComponent.java | 0 .../java/org/apache/camel/component/milvus/MilvusConfiguration.java | 0 .../src/main/java/org/apache/camel/component/milvus/MilvusEndpoint.java | 0 .../src/main/java/org/apache/camel/component/milvus/MilvusProducer.java | 0 .../component/milvus/transform/MilvusEmbeddingsDataTypeTransformer.java | 0 .../org/apache/camel/component/milvus/MilvusCreateCollectionTest.java | 0 .../test/java/org/apache/camel/component/milvus/MilvusTestSupport.java | 0 .../test/java/org/apache/camel/component/milvus/MilvusUpsertTest.java | 0 .../java/org/apache/camel/component/milvus/it/MilvusComponentIT.java | 0 .../{ => camel-ai}/camel-milvus/src/test/resources/log4j2.properties | 0 components/camel-ai/pom.xml | 1 + components/pom.xml | 1 - core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java | 2 +- docs/components/modules/ROOT/examples/json/milvus.json | 2 +- docs/components/modules/ROOT/pages/milvus-component.adoc | 2 +- .../src/main/java/org/apache/camel/maven/packaging/MojoHelper.java | 2 +- 34 files changed, 6 insertions(+), 6 deletions(-) diff --git a/components/camel-milvus/pom.xml b/components/camel-ai/camel-milvus/pom.xml similarity index 99% rename from components/camel-milvus/pom.xml rename to components/camel-ai/camel-milvus/pom.xml index e84bd234f85..ec1f9f1b286 100644 --- a/components/camel-milvus/pom.xml +++ b/components/camel-ai/camel-milvus/pom.xml @@ -22,8 +22,8 @@ <modelVersion>4.0.0</modelVersion> <parent> + <artifactId>camel-ai-parent</artifactId> <groupId>org.apache.camel</groupId> - <artifactId>components</artifactId> <version>4.7.0-SNAPSHOT</version> </parent> diff --git a/components/camel-milvus/src/generated/java/org/apache/camel/component/milvus/MilvusComponentConfigurer.java b/components/camel-ai/camel-milvus/src/generated/java/org/apache/camel/component/milvus/MilvusComponentConfigurer.java similarity index 100% rename from components/camel-milvus/src/generated/java/org/apache/camel/component/milvus/MilvusComponentConfigurer.java rename to components/camel-ai/camel-milvus/src/generated/java/org/apache/camel/component/milvus/MilvusComponentConfigurer.java diff --git a/components/camel-milvus/src/generated/java/org/apache/camel/component/milvus/MilvusConfigurationConfigurer.java b/components/camel-ai/camel-milvus/src/generated/java/org/apache/camel/component/milvus/MilvusConfigurationConfigurer.java similarity index 100% rename from components/camel-milvus/src/generated/java/org/apache/camel/component/milvus/MilvusConfigurationConfigurer.java rename to components/camel-ai/camel-milvus/src/generated/java/org/apache/camel/component/milvus/MilvusConfigurationConfigurer.java diff --git a/components/camel-milvus/src/generated/java/org/apache/camel/component/milvus/MilvusEndpointConfigurer.java b/components/camel-ai/camel-milvus/src/generated/java/org/apache/camel/component/milvus/MilvusEndpointConfigurer.java similarity index 100% rename from components/camel-milvus/src/generated/java/org/apache/camel/component/milvus/MilvusEndpointConfigurer.java rename to components/camel-ai/camel-milvus/src/generated/java/org/apache/camel/component/milvus/MilvusEndpointConfigurer.java diff --git a/components/camel-milvus/src/generated/java/org/apache/camel/component/milvus/MilvusEndpointUriFactory.java b/components/camel-ai/camel-milvus/src/generated/java/org/apache/camel/component/milvus/MilvusEndpointUriFactory.java similarity index 100% rename from components/camel-milvus/src/generated/java/org/apache/camel/component/milvus/MilvusEndpointUriFactory.java rename to components/camel-ai/camel-milvus/src/generated/java/org/apache/camel/component/milvus/MilvusEndpointUriFactory.java diff --git a/components/camel-milvus/src/generated/resources/META-INF/org/apache/camel/component/milvus/milvus.json b/components/camel-ai/camel-milvus/src/generated/resources/META-INF/org/apache/camel/component/milvus/milvus.json similarity index 100% rename from components/camel-milvus/src/generated/resources/META-INF/org/apache/camel/component/milvus/milvus.json rename to components/camel-ai/camel-milvus/src/generated/resources/META-INF/org/apache/camel/component/milvus/milvus.json diff --git a/components/camel-milvus/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-ai/camel-milvus/src/generated/resources/META-INF/services/org/apache/camel/component.properties similarity index 100% rename from components/camel-milvus/src/generated/resources/META-INF/services/org/apache/camel/component.properties rename to components/camel-ai/camel-milvus/src/generated/resources/META-INF/services/org/apache/camel/component.properties diff --git a/components/camel-milvus/src/generated/resources/META-INF/services/org/apache/camel/component/milvus b/components/camel-ai/camel-milvus/src/generated/resources/META-INF/services/org/apache/camel/component/milvus similarity index 100% rename from components/camel-milvus/src/generated/resources/META-INF/services/org/apache/camel/component/milvus rename to components/camel-ai/camel-milvus/src/generated/resources/META-INF/services/org/apache/camel/component/milvus diff --git a/components/camel-milvus/src/generated/resources/META-INF/services/org/apache/camel/configurer/milvus-component b/components/camel-ai/camel-milvus/src/generated/resources/META-INF/services/org/apache/camel/configurer/milvus-component similarity index 100% rename from components/camel-milvus/src/generated/resources/META-INF/services/org/apache/camel/configurer/milvus-component rename to components/camel-ai/camel-milvus/src/generated/resources/META-INF/services/org/apache/camel/configurer/milvus-component diff --git a/components/camel-milvus/src/generated/resources/META-INF/services/org/apache/camel/configurer/milvus-endpoint b/components/camel-ai/camel-milvus/src/generated/resources/META-INF/services/org/apache/camel/configurer/milvus-endpoint similarity index 100% rename from components/camel-milvus/src/generated/resources/META-INF/services/org/apache/camel/configurer/milvus-endpoint rename to components/camel-ai/camel-milvus/src/generated/resources/META-INF/services/org/apache/camel/configurer/milvus-endpoint diff --git a/components/camel-milvus/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.component.milvus.MilvusConfiguration b/components/camel-ai/camel-milvus/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.component.milvus.MilvusConfiguration similarity index 100% rename from components/camel-milvus/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.component.milvus.MilvusConfiguration rename to components/camel-ai/camel-milvus/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.component.milvus.MilvusConfiguration diff --git a/components/camel-milvus/src/generated/resources/META-INF/services/org/apache/camel/transformer.properties b/components/camel-ai/camel-milvus/src/generated/resources/META-INF/services/org/apache/camel/transformer.properties similarity index 100% rename from components/camel-milvus/src/generated/resources/META-INF/services/org/apache/camel/transformer.properties rename to components/camel-ai/camel-milvus/src/generated/resources/META-INF/services/org/apache/camel/transformer.properties diff --git a/components/camel-milvus/src/generated/resources/META-INF/services/org/apache/camel/transformer/milvus-embeddings b/components/camel-ai/camel-milvus/src/generated/resources/META-INF/services/org/apache/camel/transformer/milvus-embeddings similarity index 100% rename from components/camel-milvus/src/generated/resources/META-INF/services/org/apache/camel/transformer/milvus-embeddings rename to components/camel-ai/camel-milvus/src/generated/resources/META-INF/services/org/apache/camel/transformer/milvus-embeddings diff --git a/components/camel-milvus/src/generated/resources/META-INF/services/org/apache/camel/transformer/milvus-embeddings.json b/components/camel-ai/camel-milvus/src/generated/resources/META-INF/services/org/apache/camel/transformer/milvus-embeddings.json similarity index 100% rename from components/camel-milvus/src/generated/resources/META-INF/services/org/apache/camel/transformer/milvus-embeddings.json rename to components/camel-ai/camel-milvus/src/generated/resources/META-INF/services/org/apache/camel/transformer/milvus-embeddings.json diff --git a/components/camel-milvus/src/generated/resources/META-INF/services/org/apache/camel/urifactory/milvus-endpoint b/components/camel-ai/camel-milvus/src/generated/resources/META-INF/services/org/apache/camel/urifactory/milvus-endpoint similarity index 100% rename from components/camel-milvus/src/generated/resources/META-INF/services/org/apache/camel/urifactory/milvus-endpoint rename to components/camel-ai/camel-milvus/src/generated/resources/META-INF/services/org/apache/camel/urifactory/milvus-endpoint diff --git a/components/camel-milvus/src/main/docs/milvus-component.adoc b/components/camel-ai/camel-milvus/src/main/docs/milvus-component.adoc similarity index 100% rename from components/camel-milvus/src/main/docs/milvus-component.adoc rename to components/camel-ai/camel-milvus/src/main/docs/milvus-component.adoc diff --git a/components/camel-milvus/src/main/java/org/apache/camel/component/milvus/Milvus.java b/components/camel-ai/camel-milvus/src/main/java/org/apache/camel/component/milvus/Milvus.java similarity index 100% rename from components/camel-milvus/src/main/java/org/apache/camel/component/milvus/Milvus.java rename to components/camel-ai/camel-milvus/src/main/java/org/apache/camel/component/milvus/Milvus.java diff --git a/components/camel-milvus/src/main/java/org/apache/camel/component/milvus/MilvusAction.java b/components/camel-ai/camel-milvus/src/main/java/org/apache/camel/component/milvus/MilvusAction.java similarity index 100% rename from components/camel-milvus/src/main/java/org/apache/camel/component/milvus/MilvusAction.java rename to components/camel-ai/camel-milvus/src/main/java/org/apache/camel/component/milvus/MilvusAction.java diff --git a/components/camel-milvus/src/main/java/org/apache/camel/component/milvus/MilvusComponent.java b/components/camel-ai/camel-milvus/src/main/java/org/apache/camel/component/milvus/MilvusComponent.java similarity index 100% rename from components/camel-milvus/src/main/java/org/apache/camel/component/milvus/MilvusComponent.java rename to components/camel-ai/camel-milvus/src/main/java/org/apache/camel/component/milvus/MilvusComponent.java diff --git a/components/camel-milvus/src/main/java/org/apache/camel/component/milvus/MilvusConfiguration.java b/components/camel-ai/camel-milvus/src/main/java/org/apache/camel/component/milvus/MilvusConfiguration.java similarity index 100% rename from components/camel-milvus/src/main/java/org/apache/camel/component/milvus/MilvusConfiguration.java rename to components/camel-ai/camel-milvus/src/main/java/org/apache/camel/component/milvus/MilvusConfiguration.java diff --git a/components/camel-milvus/src/main/java/org/apache/camel/component/milvus/MilvusEndpoint.java b/components/camel-ai/camel-milvus/src/main/java/org/apache/camel/component/milvus/MilvusEndpoint.java similarity index 100% rename from components/camel-milvus/src/main/java/org/apache/camel/component/milvus/MilvusEndpoint.java rename to components/camel-ai/camel-milvus/src/main/java/org/apache/camel/component/milvus/MilvusEndpoint.java diff --git a/components/camel-milvus/src/main/java/org/apache/camel/component/milvus/MilvusProducer.java b/components/camel-ai/camel-milvus/src/main/java/org/apache/camel/component/milvus/MilvusProducer.java similarity index 100% rename from components/camel-milvus/src/main/java/org/apache/camel/component/milvus/MilvusProducer.java rename to components/camel-ai/camel-milvus/src/main/java/org/apache/camel/component/milvus/MilvusProducer.java diff --git a/components/camel-milvus/src/main/java/org/apache/camel/component/milvus/transform/MilvusEmbeddingsDataTypeTransformer.java b/components/camel-ai/camel-milvus/src/main/java/org/apache/camel/component/milvus/transform/MilvusEmbeddingsDataTypeTransformer.java similarity index 100% rename from components/camel-milvus/src/main/java/org/apache/camel/component/milvus/transform/MilvusEmbeddingsDataTypeTransformer.java rename to components/camel-ai/camel-milvus/src/main/java/org/apache/camel/component/milvus/transform/MilvusEmbeddingsDataTypeTransformer.java diff --git a/components/camel-milvus/src/test/java/org/apache/camel/component/milvus/MilvusCreateCollectionTest.java b/components/camel-ai/camel-milvus/src/test/java/org/apache/camel/component/milvus/MilvusCreateCollectionTest.java similarity index 100% rename from components/camel-milvus/src/test/java/org/apache/camel/component/milvus/MilvusCreateCollectionTest.java rename to components/camel-ai/camel-milvus/src/test/java/org/apache/camel/component/milvus/MilvusCreateCollectionTest.java diff --git a/components/camel-milvus/src/test/java/org/apache/camel/component/milvus/MilvusTestSupport.java b/components/camel-ai/camel-milvus/src/test/java/org/apache/camel/component/milvus/MilvusTestSupport.java similarity index 100% rename from components/camel-milvus/src/test/java/org/apache/camel/component/milvus/MilvusTestSupport.java rename to components/camel-ai/camel-milvus/src/test/java/org/apache/camel/component/milvus/MilvusTestSupport.java diff --git a/components/camel-milvus/src/test/java/org/apache/camel/component/milvus/MilvusUpsertTest.java b/components/camel-ai/camel-milvus/src/test/java/org/apache/camel/component/milvus/MilvusUpsertTest.java similarity index 100% rename from components/camel-milvus/src/test/java/org/apache/camel/component/milvus/MilvusUpsertTest.java rename to components/camel-ai/camel-milvus/src/test/java/org/apache/camel/component/milvus/MilvusUpsertTest.java diff --git a/components/camel-milvus/src/test/java/org/apache/camel/component/milvus/it/MilvusComponentIT.java b/components/camel-ai/camel-milvus/src/test/java/org/apache/camel/component/milvus/it/MilvusComponentIT.java similarity index 100% rename from components/camel-milvus/src/test/java/org/apache/camel/component/milvus/it/MilvusComponentIT.java rename to components/camel-ai/camel-milvus/src/test/java/org/apache/camel/component/milvus/it/MilvusComponentIT.java diff --git a/components/camel-milvus/src/test/resources/log4j2.properties b/components/camel-ai/camel-milvus/src/test/resources/log4j2.properties similarity index 100% rename from components/camel-milvus/src/test/resources/log4j2.properties rename to components/camel-ai/camel-milvus/src/test/resources/log4j2.properties diff --git a/components/camel-ai/pom.xml b/components/camel-ai/pom.xml index 655ea050a3f..9a57ed63021 100644 --- a/components/camel-ai/pom.xml +++ b/components/camel-ai/pom.xml @@ -39,6 +39,7 @@ <module>camel-langchain4j-core</module> <module>camel-langchain4j-chat</module> <module>camel-langchain4j-embeddings</module> + <module>camel-milvus</module> <module>camel-qdrant</module> </modules> diff --git a/components/pom.xml b/components/pom.xml index 6fde6bfbe9a..c0a3f38c0a3 100644 --- a/components/pom.xml +++ b/components/pom.xml @@ -208,7 +208,6 @@ <module>camel-micrometer</module> <module>camel-micrometer-prometheus</module> <module>camel-microprofile</module> - <module>camel-milvus</module> <module>camel-mina</module> <module>camel-minio</module> <module>camel-mllp</module> diff --git a/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java b/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java index ad29dad2a23..9f0de97dac8 100644 --- a/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java +++ b/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java @@ -180,7 +180,7 @@ public final class SensitiveUtils { + "|\\Qverificationcode\\E" + "|\\Qwebhookverifytoken\\E" + "|\\Qzookeeperpassword\\E" - // SENSITIVE-PATTERN: END + // SENSITIVE-PATTERN: END ; private SensitiveUtils() { diff --git a/docs/components/modules/ROOT/examples/json/milvus.json b/docs/components/modules/ROOT/examples/json/milvus.json index 57556162721..33a495ce5e1 120000 --- a/docs/components/modules/ROOT/examples/json/milvus.json +++ b/docs/components/modules/ROOT/examples/json/milvus.json @@ -1 +1 @@ -../../../../../../components/camel-milvus/src/generated/resources/META-INF/org/apache/camel/component/milvus/milvus.json \ No newline at end of file +../../../../../../components/camel-ai/camel-milvus/src/generated/resources/META-INF/org/apache/camel/component/milvus/milvus.json \ No newline at end of file diff --git a/docs/components/modules/ROOT/pages/milvus-component.adoc b/docs/components/modules/ROOT/pages/milvus-component.adoc index 44c89744e65..19e8bf873b5 120000 --- a/docs/components/modules/ROOT/pages/milvus-component.adoc +++ b/docs/components/modules/ROOT/pages/milvus-component.adoc @@ -1 +1 @@ -../../../../../components/camel-milvus/src/main/docs/milvus-component.adoc \ No newline at end of file +../../../../../components/camel-ai/camel-milvus/src/main/docs/milvus-component.adoc \ No newline at end of file diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/MojoHelper.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/MojoHelper.java index 1879265b1cd..4594e9cbf85 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/MojoHelper.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/MojoHelper.java @@ -39,7 +39,7 @@ public final class MojoHelper { case "camel-ai": return Arrays.asList(dir.resolve("camel-chatscript"), dir.resolve("camel-djl"), dir.resolve("camel-langchain4j-core"), dir.resolve("camel-langchain4j-chat"), - dir.resolve("camel-langchain4j-embeddings"), dir.resolve("camel-qdrant")); + dir.resolve("camel-langchain4j-embeddings"), dir.resolve("camel-qdrant"), dir.resolve("camel-milvus")); case "camel-as2": return Collections.singletonList(dir.resolve("camel-as2-component")); case "camel-avro-rpc":
