diff --git a/models/spring-ai-anthropic/src/test/java/org/springframework/ai/anthropic/client/AnthropicChatClientMethodInvokingFunctionCallbackIT.java b/models/spring-ai-anthropic/src/test/java/org/springframework/ai/anthropic/client/AnthropicChatClientMethodInvokingFunctionCallbackIT.java index 6ed41d3d019..fbea3c91a9d 100644 --- a/models/spring-ai-anthropic/src/test/java/org/springframework/ai/anthropic/client/AnthropicChatClientMethodInvokingFunctionCallbackIT.java +++ b/models/spring-ai-anthropic/src/test/java/org/springframework/ai/anthropic/client/AnthropicChatClientMethodInvokingFunctionCallbackIT.java @@ -162,7 +162,7 @@ void methodGetWeatherToolContext() { assertThat(arguments).containsEntry("tool", "value"); assertThat(arguments).containsKey(ToolContext.TOOL_CALL_HISTORY); List tootConversationMessages = (List) arguments.get(ToolContext.TOOL_CALL_HISTORY); - assertThat(tootConversationMessages).hasSize(6); + assertThat(tootConversationMessages.size() == 6 || tootConversationMessages.size() == 2).isTrue(); } @Test diff --git a/models/spring-ai-ollama/pom.xml b/models/spring-ai-ollama/pom.xml index a0c1b394ea0..9f8e340dd81 100644 --- a/models/spring-ai-ollama/pom.xml +++ b/models/spring-ai-ollama/pom.xml @@ -98,25 +98,4 @@ test - - - - - org.apache.maven.plugins - maven-failsafe-plugin - ${maven-failsafe-plugin.version} - - ${skip.model.ollama} - - - - - integration-test - verify - - - - - - diff --git a/pom.xml b/pom.xml index fc760168a69..43e19fdec31 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,8 @@ --> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.ai @@ -237,14 +238,15 @@ 0.0.4 1.0.0-alpha.4 - 1.6.2 + 1.6.2 1.5.1 0.0.6 3.11.0 3.1.2 - 3.1.2 + 3.5.2 3.5.0 3.3.0 0.8.10 @@ -265,35 +267,6 @@ 9.3 true - - true - - true - true - false - true - true - true - true - true - true - true - true - true - false - true - true - true - true - true - - - true - true - - - true - @@ -442,7 +415,7 @@ plain - + false @@ -538,27 +511,23 @@ the original author or authors. - + 2024 - - Copyright 2023 - ${year} the original author or authors. - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - https://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - + Copyright 2023 - ${year} the original author or + authors. Licensed under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + https://www.apache.org/licenses/LICENSE-2.0 Unless required + by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" + BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + express or implied. See the License for the specific + language governing permissions and limitations under the + License. **/.antlr/** @@ -605,8 +574,10 @@ maven-javadoc-plugin ${maven-javadoc-plugin.version} - org.springframework.ai.sample.*,org.springframework.ai.testcontainers.service.connection.* - ${project.basedir}/spring-ai-docs/src/main/javadoc/overview.html + + org.springframework.ai.sample.*,org.springframework.ai.testcontainers.service.connection.* + + ${project.basedir}/spring-ai-docs/src/main/javadoc/overview.html false false none @@ -654,30 +625,136 @@ - + - full-vectorstore-tests - - false - false - false - false - false - false - false - false - false - false - false - false - false - false - false - false - false - false - false - + ci-fast-integration-tests + + false + + + + + org.apache.maven.plugins + maven-failsafe-plugin + ${maven-failsafe-plugin.version} + + + + + + + org.springframework.ai.azure.openai/**/*IT.java + org.springframework.ai.bedrock/**/*IT.java + + org.springframework.ai.huggingface/**/*IT.java + org.springframework.ai.minimax/**/*IT.java + org.springframework.ai.mistralai/**/*IT.java + org.springframework.ai.moonshot/**/*IT.java + org.springframework.ai.oci/**/*IT.java + org.springframework.ai.ollama/**/*IT.java + + org.springframework.ai.postgresml/**/*IT.java + org.springframework.ai.qianfan/**/*IT.java + org.springframework.ai.stabilityai/**/*IT.java + org.springframework.ai.transformers/**/*IT.java + org.springframework.ai.vertexai.embedding/**/*IT.java + org.springframework.ai.vertexai.gemini/**/*IT.java + org.springframework.ai.watsonx/**/*IT.java + org.springframework.ai.zhipuai/**/*IT.java + + + org.springframework.ai.vectorstore**/CosmosDB**IT.java + org.springframework.ai.vectorstore.azure/**IT.java + org.springframework.ai.chat.memory/**/Cassandra**IT.java + org.springframework.ai.vectorstore**/Cassandra**IT.java + org.springframework.ai.chroma/**IT.java + + org.springframework.ai.vectorstore**/Coherence**IT.java + org.springframework.ai.vectorstore**/Elasticsearch**IT.java + org.springframework.ai.vectorstore**/GemFire**IT.java + org.springframework.ai.vectorstore**/Hana**IT.java + org.springframework.ai.vectorstore**/Hana**IT.java + org.springframework.ai.vectorstore**/Milvus**IT.java + org.springframework.ai.vectorstore**/Mongo**IT.java + org.springframework.ai.vectorstore**/Mongo**IT.java + org.springframework.ai.vectorstore**/Neo4j**IT.java + org.springframework.ai.vectorstore**/OpenSearch**IT.java + org.springframework.ai.vectorstore**/Oracle**IT.java + + org.springframework.ai.vectorstore**/Pinecone**IT.java + org.springframework.ai.vectorstore.qdrant/**/**IT.java + + org.springframework.ai.vectorstore**/Redis**IT.java + org.springframework.ai.vectorstore**/Typesense**IT.java + org.springframework.ai.vectorstore**/Weaviate**IT.java + + + + + + + org.springframework.ai.autoconfigure.azure/**/**IT.java + org.springframework.ai.autoconfigure.bedrock/**/**IT.java + org.springframework.ai.autoconfigure.huggingface/**/**IT.java + + org.springframework.ai.autoconfigure.chat/**/**IT.java + org.springframework.ai.autoconfigure.embedding/**/**IT.java + org.springframework.ai.autoconfigure.image/**/**IT.java + + + org.springframework.ai.autoconfigure.minimax/**/**IT.java + org.springframework.ai.autoconfigure.mistralai/**/**IT.java + org.springframework.ai.autoconfigure.moonshot/**/**IT.java + org.springframework.ai.autoconfigure.oci/**/**IT.java + org.springframework.ai.autoconfigure.ollama/**/**IT.java + + org.springframework.ai.autoconfigure.postgresml/**/**IT.java + org.springframework.ai.autoconfigure.qianfan/**/**IT.java + + org.springframework.ai.autoconfigure.retry/**/**IT.java + + org.springframework.ai.autoconfigure.stabilityai/**/**IT.java + org.springframework.ai.autoconfigure.transformers/**/**IT.java + + org.springframework.ai.autoconfigure.vectorstore/**/**IT.java + + org.springframework.ai.autoconfigure.vertexai/**/**IT.java + org.springframework.ai.autoconfigure.watsonxai/**/**IT.java + org.springframework.ai.autoconfigure.zhipuai/**/**IT.java + + org.springframework.ai.autoconfigure.zhipuai/**/**IT.java + + + org.springframework.ai.testcontainers/**/**IT.java + + + package org.springframework.ai.docker.compose/**/**IT.java + + + org.springframework.ai.integration.tests/**/**IT.java + + + + + + + + integration-test + verify + + + + + + test-coverage @@ -801,4 +878,4 @@ - + \ No newline at end of file diff --git a/spring-ai-spring-boot-docker-compose/pom.xml b/spring-ai-spring-boot-docker-compose/pom.xml index 9b42b81559f..e9712b83332 100644 --- a/spring-ai-spring-boot-docker-compose/pom.xml +++ b/spring-ai-spring-boot-docker-compose/pom.xml @@ -176,25 +176,4 @@ - - - - - org.apache.maven.plugins - maven-failsafe-plugin - ${maven-failsafe-plugin.version} - - ${skip.docker-compose} - - - - - integration-test - verify - - - - - - diff --git a/spring-ai-spring-boot-docker-compose/src/test/java/org/springframework/ai/docker/compose/service/connection/chroma/ChromaDockerComposeConnectionDetailsFactoryTests.java b/spring-ai-spring-boot-docker-compose/src/test/java/org/springframework/ai/docker/compose/service/connection/chroma/ChromaDockerComposeConnectionDetailsFactoryIT.java similarity index 86% rename from spring-ai-spring-boot-docker-compose/src/test/java/org/springframework/ai/docker/compose/service/connection/chroma/ChromaDockerComposeConnectionDetailsFactoryTests.java rename to spring-ai-spring-boot-docker-compose/src/test/java/org/springframework/ai/docker/compose/service/connection/chroma/ChromaDockerComposeConnectionDetailsFactoryIT.java index 190ffa9ad95..0d7dd90baf9 100644 --- a/spring-ai-spring-boot-docker-compose/src/test/java/org/springframework/ai/docker/compose/service/connection/chroma/ChromaDockerComposeConnectionDetailsFactoryTests.java +++ b/spring-ai-spring-boot-docker-compose/src/test/java/org/springframework/ai/docker/compose/service/connection/chroma/ChromaDockerComposeConnectionDetailsFactoryIT.java @@ -20,13 +20,13 @@ import org.testcontainers.utility.DockerImageName; import org.springframework.ai.autoconfigure.vectorstore.chroma.ChromaConnectionDetails; -import org.springframework.boot.docker.compose.service.connection.test.AbstractDockerComposeIntegrationTests; +import org.springframework.boot.docker.compose.service.connection.test.AbstractDockerComposeIT; import static org.assertj.core.api.Assertions.assertThat; -class ChromaDockerComposeConnectionDetailsFactoryTests extends AbstractDockerComposeIntegrationTests { +class ChromaDockerComposeConnectionDetailsFactoryIT extends AbstractDockerComposeIT { - ChromaDockerComposeConnectionDetailsFactoryTests() { + ChromaDockerComposeConnectionDetailsFactoryIT() { super("chroma-compose.yaml", DockerImageName.parse("chromadb/chroma")); } diff --git a/spring-ai-spring-boot-docker-compose/src/test/java/org/springframework/ai/docker/compose/service/connection/chroma/ChromaWithTokenDockerComposeConnectionDetailsFactoryTests.java b/spring-ai-spring-boot-docker-compose/src/test/java/org/springframework/ai/docker/compose/service/connection/chroma/ChromaWithTokenDockerComposeConnectionDetailsFactoryIT.java similarity index 86% rename from spring-ai-spring-boot-docker-compose/src/test/java/org/springframework/ai/docker/compose/service/connection/chroma/ChromaWithTokenDockerComposeConnectionDetailsFactoryTests.java rename to spring-ai-spring-boot-docker-compose/src/test/java/org/springframework/ai/docker/compose/service/connection/chroma/ChromaWithTokenDockerComposeConnectionDetailsFactoryIT.java index 87e11ed4ce9..ee5caf04a48 100644 --- a/spring-ai-spring-boot-docker-compose/src/test/java/org/springframework/ai/docker/compose/service/connection/chroma/ChromaWithTokenDockerComposeConnectionDetailsFactoryTests.java +++ b/spring-ai-spring-boot-docker-compose/src/test/java/org/springframework/ai/docker/compose/service/connection/chroma/ChromaWithTokenDockerComposeConnectionDetailsFactoryIT.java @@ -20,13 +20,13 @@ import org.testcontainers.utility.DockerImageName; import org.springframework.ai.autoconfigure.vectorstore.chroma.ChromaConnectionDetails; -import org.springframework.boot.docker.compose.service.connection.test.AbstractDockerComposeIntegrationTests; +import org.springframework.boot.docker.compose.service.connection.test.AbstractDockerComposeIT; import static org.assertj.core.api.Assertions.assertThat; -class ChromaWithTokenDockerComposeConnectionDetailsFactoryTests extends AbstractDockerComposeIntegrationTests { +class ChromaWithTokenDockerComposeConnectionDetailsFactoryIT extends AbstractDockerComposeIT { - ChromaWithTokenDockerComposeConnectionDetailsFactoryTests() { + ChromaWithTokenDockerComposeConnectionDetailsFactoryIT() { super("chroma-with-token-compose.yaml", DockerImageName.parse("chromadb/chroma")); } diff --git a/spring-ai-spring-boot-docker-compose/src/test/java/org/springframework/ai/docker/compose/service/connection/mongo/MongoDbAtlasLocalDockerComposeConnectionDetailsFactoryTests.java b/spring-ai-spring-boot-docker-compose/src/test/java/org/springframework/ai/docker/compose/service/connection/mongo/MongoDbAtlasLocalDockerComposeConnectionDetailsFactoryIT.java similarity index 88% rename from spring-ai-spring-boot-docker-compose/src/test/java/org/springframework/ai/docker/compose/service/connection/mongo/MongoDbAtlasLocalDockerComposeConnectionDetailsFactoryTests.java rename to spring-ai-spring-boot-docker-compose/src/test/java/org/springframework/ai/docker/compose/service/connection/mongo/MongoDbAtlasLocalDockerComposeConnectionDetailsFactoryIT.java index 61cbe8a95e1..a85e7438c09 100644 --- a/spring-ai-spring-boot-docker-compose/src/test/java/org/springframework/ai/docker/compose/service/connection/mongo/MongoDbAtlasLocalDockerComposeConnectionDetailsFactoryTests.java +++ b/spring-ai-spring-boot-docker-compose/src/test/java/org/springframework/ai/docker/compose/service/connection/mongo/MongoDbAtlasLocalDockerComposeConnectionDetailsFactoryIT.java @@ -20,13 +20,13 @@ import org.testcontainers.utility.DockerImageName; import org.springframework.boot.autoconfigure.mongo.MongoConnectionDetails; -import org.springframework.boot.docker.compose.service.connection.test.AbstractDockerComposeIntegrationTests; +import org.springframework.boot.docker.compose.service.connection.test.AbstractDockerComposeIT; import static org.assertj.core.api.Assertions.assertThat; -class MongoDbAtlasLocalDockerComposeConnectionDetailsFactoryTests extends AbstractDockerComposeIntegrationTests { +class MongoDbAtlasLocalDockerComposeConnectionDetailsFactoryIT extends AbstractDockerComposeIT { - protected MongoDbAtlasLocalDockerComposeConnectionDetailsFactoryTests() { + protected MongoDbAtlasLocalDockerComposeConnectionDetailsFactoryIT() { super("mongo-compose.yaml", DockerImageName.parse("mongodb/mongodb-atlas-local")); } diff --git a/spring-ai-spring-boot-docker-compose/src/test/java/org/springframework/ai/docker/compose/service/connection/ollama/OllamaDockerComposeConnectionDetailsFactoryTests.java b/spring-ai-spring-boot-docker-compose/src/test/java/org/springframework/ai/docker/compose/service/connection/ollama/OllamaDockerComposeConnectionDetailsFactoryIT.java similarity index 86% rename from spring-ai-spring-boot-docker-compose/src/test/java/org/springframework/ai/docker/compose/service/connection/ollama/OllamaDockerComposeConnectionDetailsFactoryTests.java rename to spring-ai-spring-boot-docker-compose/src/test/java/org/springframework/ai/docker/compose/service/connection/ollama/OllamaDockerComposeConnectionDetailsFactoryIT.java index 9b72828195d..b37cce4860d 100644 --- a/spring-ai-spring-boot-docker-compose/src/test/java/org/springframework/ai/docker/compose/service/connection/ollama/OllamaDockerComposeConnectionDetailsFactoryTests.java +++ b/spring-ai-spring-boot-docker-compose/src/test/java/org/springframework/ai/docker/compose/service/connection/ollama/OllamaDockerComposeConnectionDetailsFactoryIT.java @@ -20,13 +20,13 @@ import org.testcontainers.utility.DockerImageName; import org.springframework.ai.autoconfigure.ollama.OllamaConnectionDetails; -import org.springframework.boot.docker.compose.service.connection.test.AbstractDockerComposeIntegrationTests; +import org.springframework.boot.docker.compose.service.connection.test.AbstractDockerComposeIT; import static org.assertj.core.api.Assertions.assertThat; -class OllamaDockerComposeConnectionDetailsFactoryTests extends AbstractDockerComposeIntegrationTests { +class OllamaDockerComposeConnectionDetailsFactoryIT extends AbstractDockerComposeIT { - OllamaDockerComposeConnectionDetailsFactoryTests() { + OllamaDockerComposeConnectionDetailsFactoryIT() { super("ollama-compose.yaml", DockerImageName.parse("ollama/ollama")); } diff --git a/spring-ai-spring-boot-docker-compose/src/test/java/org/springframework/ai/docker/compose/service/connection/opensearch/AwsOpenSearchDockerComposeConnectionDetailsFactoryTests.java b/spring-ai-spring-boot-docker-compose/src/test/java/org/springframework/ai/docker/compose/service/connection/opensearch/AwsOpenSearchDockerComposeConnectionDetailsFactoryIT.java similarity index 87% rename from spring-ai-spring-boot-docker-compose/src/test/java/org/springframework/ai/docker/compose/service/connection/opensearch/AwsOpenSearchDockerComposeConnectionDetailsFactoryTests.java rename to spring-ai-spring-boot-docker-compose/src/test/java/org/springframework/ai/docker/compose/service/connection/opensearch/AwsOpenSearchDockerComposeConnectionDetailsFactoryIT.java index a03a275de6d..9f39463d4ac 100644 --- a/spring-ai-spring-boot-docker-compose/src/test/java/org/springframework/ai/docker/compose/service/connection/opensearch/AwsOpenSearchDockerComposeConnectionDetailsFactoryTests.java +++ b/spring-ai-spring-boot-docker-compose/src/test/java/org/springframework/ai/docker/compose/service/connection/opensearch/AwsOpenSearchDockerComposeConnectionDetailsFactoryIT.java @@ -20,13 +20,13 @@ import org.testcontainers.utility.DockerImageName; import org.springframework.ai.autoconfigure.vectorstore.opensearch.AwsOpenSearchConnectionDetails; -import org.springframework.boot.docker.compose.service.connection.test.AbstractDockerComposeIntegrationTests; +import org.springframework.boot.docker.compose.service.connection.test.AbstractDockerComposeIT; import static org.assertj.core.api.Assertions.assertThat; -class AwsOpenSearchDockerComposeConnectionDetailsFactoryTests extends AbstractDockerComposeIntegrationTests { +class AwsOpenSearchDockerComposeConnectionDetailsFactoryIT extends AbstractDockerComposeIT { - AwsOpenSearchDockerComposeConnectionDetailsFactoryTests() { + AwsOpenSearchDockerComposeConnectionDetailsFactoryIT() { super("localstack-compose.yaml", DockerImageName.parse("localstack/localstack:3.5.0")); } diff --git a/spring-ai-spring-boot-docker-compose/src/test/java/org/springframework/ai/docker/compose/service/connection/opensearch/OpenSearchDockerComposeConnectionDetailsFactoryTests.java b/spring-ai-spring-boot-docker-compose/src/test/java/org/springframework/ai/docker/compose/service/connection/opensearch/OpenSearchDockerComposeConnectionDetailsFactoryIT.java similarity index 87% rename from spring-ai-spring-boot-docker-compose/src/test/java/org/springframework/ai/docker/compose/service/connection/opensearch/OpenSearchDockerComposeConnectionDetailsFactoryTests.java rename to spring-ai-spring-boot-docker-compose/src/test/java/org/springframework/ai/docker/compose/service/connection/opensearch/OpenSearchDockerComposeConnectionDetailsFactoryIT.java index 097d4d14364..892080a8861 100644 --- a/spring-ai-spring-boot-docker-compose/src/test/java/org/springframework/ai/docker/compose/service/connection/opensearch/OpenSearchDockerComposeConnectionDetailsFactoryTests.java +++ b/spring-ai-spring-boot-docker-compose/src/test/java/org/springframework/ai/docker/compose/service/connection/opensearch/OpenSearchDockerComposeConnectionDetailsFactoryIT.java @@ -20,13 +20,13 @@ import org.testcontainers.utility.DockerImageName; import org.springframework.ai.autoconfigure.vectorstore.opensearch.OpenSearchConnectionDetails; -import org.springframework.boot.docker.compose.service.connection.test.AbstractDockerComposeIntegrationTests; +import org.springframework.boot.docker.compose.service.connection.test.AbstractDockerComposeIT; import static org.assertj.core.api.Assertions.assertThat; -class OpenSearchDockerComposeConnectionDetailsFactoryTests extends AbstractDockerComposeIntegrationTests { +class OpenSearchDockerComposeConnectionDetailsFactoryIT extends AbstractDockerComposeIT { - OpenSearchDockerComposeConnectionDetailsFactoryTests() { + OpenSearchDockerComposeConnectionDetailsFactoryIT() { super("opensearch-compose.yaml", DockerImageName.parse("opensearchproject/opensearch")); } diff --git a/spring-ai-spring-boot-docker-compose/src/test/java/org/springframework/ai/docker/compose/service/connection/qdrant/QdrantDockerComposeConnectionDetailsFactoryTests.java b/spring-ai-spring-boot-docker-compose/src/test/java/org/springframework/ai/docker/compose/service/connection/qdrant/QdrantDockerComposeConnectionDetailsFactoryIT.java similarity index 87% rename from spring-ai-spring-boot-docker-compose/src/test/java/org/springframework/ai/docker/compose/service/connection/qdrant/QdrantDockerComposeConnectionDetailsFactoryTests.java rename to spring-ai-spring-boot-docker-compose/src/test/java/org/springframework/ai/docker/compose/service/connection/qdrant/QdrantDockerComposeConnectionDetailsFactoryIT.java index 7dd990bc06b..d1547198218 100644 --- a/spring-ai-spring-boot-docker-compose/src/test/java/org/springframework/ai/docker/compose/service/connection/qdrant/QdrantDockerComposeConnectionDetailsFactoryTests.java +++ b/spring-ai-spring-boot-docker-compose/src/test/java/org/springframework/ai/docker/compose/service/connection/qdrant/QdrantDockerComposeConnectionDetailsFactoryIT.java @@ -20,13 +20,13 @@ import org.testcontainers.utility.DockerImageName; import org.springframework.ai.autoconfigure.vectorstore.qdrant.QdrantConnectionDetails; -import org.springframework.boot.docker.compose.service.connection.test.AbstractDockerComposeIntegrationTests; +import org.springframework.boot.docker.compose.service.connection.test.AbstractDockerComposeIT; import static org.assertj.core.api.Assertions.assertThat; -class QdrantDockerComposeConnectionDetailsFactoryTests extends AbstractDockerComposeIntegrationTests { +class QdrantDockerComposeConnectionDetailsFactoryIT extends AbstractDockerComposeIT { - QdrantDockerComposeConnectionDetailsFactoryTests() { + QdrantDockerComposeConnectionDetailsFactoryIT() { super("qdrant-compose.yaml", DockerImageName.parse("qdrant/qdrant")); } diff --git a/spring-ai-spring-boot-docker-compose/src/test/java/org/springframework/ai/docker/compose/service/connection/typesense/TypesenseDockerComposeConnectionDetailsFactoryTests.java b/spring-ai-spring-boot-docker-compose/src/test/java/org/springframework/ai/docker/compose/service/connection/typesense/TypesenseDockerComposeConnectionDetailsFactoryIT.java similarity index 87% rename from spring-ai-spring-boot-docker-compose/src/test/java/org/springframework/ai/docker/compose/service/connection/typesense/TypesenseDockerComposeConnectionDetailsFactoryTests.java rename to spring-ai-spring-boot-docker-compose/src/test/java/org/springframework/ai/docker/compose/service/connection/typesense/TypesenseDockerComposeConnectionDetailsFactoryIT.java index baa0d731d6f..d27a345240d 100644 --- a/spring-ai-spring-boot-docker-compose/src/test/java/org/springframework/ai/docker/compose/service/connection/typesense/TypesenseDockerComposeConnectionDetailsFactoryTests.java +++ b/spring-ai-spring-boot-docker-compose/src/test/java/org/springframework/ai/docker/compose/service/connection/typesense/TypesenseDockerComposeConnectionDetailsFactoryIT.java @@ -20,13 +20,13 @@ import org.testcontainers.utility.DockerImageName; import org.springframework.ai.autoconfigure.vectorstore.typesense.TypesenseConnectionDetails; -import org.springframework.boot.docker.compose.service.connection.test.AbstractDockerComposeIntegrationTests; +import org.springframework.boot.docker.compose.service.connection.test.AbstractDockerComposeIT; import static org.assertj.core.api.Assertions.assertThat; -class TypesenseDockerComposeConnectionDetailsFactoryTests extends AbstractDockerComposeIntegrationTests { +class TypesenseDockerComposeConnectionDetailsFactoryIT extends AbstractDockerComposeIT { - TypesenseDockerComposeConnectionDetailsFactoryTests() { + TypesenseDockerComposeConnectionDetailsFactoryIT() { super("typesense-compose.yaml", DockerImageName.parse("typesense/typesense:26.0")); } diff --git a/spring-ai-spring-boot-docker-compose/src/test/java/org/springframework/ai/docker/compose/service/connection/weaviate/WeaviateDockerComposeConnectionDetailsFactoryTests.java b/spring-ai-spring-boot-docker-compose/src/test/java/org/springframework/ai/docker/compose/service/connection/weaviate/WeaviateDockerComposeConnectionDetailsFactoryIT.java similarity index 86% rename from spring-ai-spring-boot-docker-compose/src/test/java/org/springframework/ai/docker/compose/service/connection/weaviate/WeaviateDockerComposeConnectionDetailsFactoryTests.java rename to spring-ai-spring-boot-docker-compose/src/test/java/org/springframework/ai/docker/compose/service/connection/weaviate/WeaviateDockerComposeConnectionDetailsFactoryIT.java index 58f6a5a4944..3cc30eb196d 100644 --- a/spring-ai-spring-boot-docker-compose/src/test/java/org/springframework/ai/docker/compose/service/connection/weaviate/WeaviateDockerComposeConnectionDetailsFactoryTests.java +++ b/spring-ai-spring-boot-docker-compose/src/test/java/org/springframework/ai/docker/compose/service/connection/weaviate/WeaviateDockerComposeConnectionDetailsFactoryIT.java @@ -20,13 +20,13 @@ import org.testcontainers.utility.DockerImageName; import org.springframework.ai.autoconfigure.vectorstore.weaviate.WeaviateConnectionDetails; -import org.springframework.boot.docker.compose.service.connection.test.AbstractDockerComposeIntegrationTests; +import org.springframework.boot.docker.compose.service.connection.test.AbstractDockerComposeIT; import static org.assertj.core.api.Assertions.assertThat; -class WeaviateDockerComposeConnectionDetailsFactoryTests extends AbstractDockerComposeIntegrationTests { +class WeaviateDockerComposeConnectionDetailsFactoryIT extends AbstractDockerComposeIT { - WeaviateDockerComposeConnectionDetailsFactoryTests() { + WeaviateDockerComposeConnectionDetailsFactoryIT() { super("weaviate-compose.yaml", DockerImageName.parse("semitechnologies/weaviate")); } diff --git a/spring-ai-spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/test/AbstractDockerComposeIntegrationTests.java b/spring-ai-spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/test/AbstractDockerComposeIT.java similarity index 95% rename from spring-ai-spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/test/AbstractDockerComposeIntegrationTests.java rename to spring-ai-spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/test/AbstractDockerComposeIT.java index 8c6289c87d4..26d26baccbb 100644 --- a/spring-ai-spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/test/AbstractDockerComposeIntegrationTests.java +++ b/spring-ai-spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/test/AbstractDockerComposeIT.java @@ -51,7 +51,7 @@ */ @DisabledIfProcessUnavailable({ "docker", "version" }) @DisabledIfProcessUnavailable({ "docker", "compose" }) -public abstract class AbstractDockerComposeIntegrationTests { +public abstract class AbstractDockerComposeIT { @TempDir private static Path tempDir; @@ -60,7 +60,7 @@ public abstract class AbstractDockerComposeIntegrationTests { private final DockerImageName dockerImageName; - protected AbstractDockerComposeIntegrationTests(String composeResource, DockerImageName dockerImageName) { + protected AbstractDockerComposeIT(String composeResource, DockerImageName dockerImageName) { this.composeResource = new ClassPathResource(composeResource, getClass()); this.dockerImageName = dockerImageName; } diff --git a/spring-ai-spring-boot-testcontainers/pom.xml b/spring-ai-spring-boot-testcontainers/pom.xml index cc5c233e2a6..ed7bef8c268 100644 --- a/spring-ai-spring-boot-testcontainers/pom.xml +++ b/spring-ai-spring-boot-testcontainers/pom.xml @@ -295,25 +295,4 @@ - - - - org.apache.maven.plugins - maven-failsafe-plugin - ${maven-failsafe-plugin.version} - - ${skip.testcontainers} - - - - - integration-test - verify - - - - - - - diff --git a/spring-ai-spring-boot-testcontainers/src/test/java/org/springframework/ai/testcontainers/service/connection/chroma/ChromaContainerConnectionDetailsFactoryTest.java b/spring-ai-spring-boot-testcontainers/src/test/java/org/springframework/ai/testcontainers/service/connection/chroma/ChromaContainerConnectionDetailsFactoryIT.java similarity index 98% rename from spring-ai-spring-boot-testcontainers/src/test/java/org/springframework/ai/testcontainers/service/connection/chroma/ChromaContainerConnectionDetailsFactoryTest.java rename to spring-ai-spring-boot-testcontainers/src/test/java/org/springframework/ai/testcontainers/service/connection/chroma/ChromaContainerConnectionDetailsFactoryIT.java index f8509a97aff..f3e41fa48d3 100644 --- a/spring-ai-spring-boot-testcontainers/src/test/java/org/springframework/ai/testcontainers/service/connection/chroma/ChromaContainerConnectionDetailsFactoryTest.java +++ b/spring-ai-spring-boot-testcontainers/src/test/java/org/springframework/ai/testcontainers/service/connection/chroma/ChromaContainerConnectionDetailsFactoryIT.java @@ -45,7 +45,7 @@ @Testcontainers @TestPropertySource(properties = { "spring.ai.vectorstore.chroma.collectionName=TestCollection", "spring.ai.vectorstore.chroma.initialize-schema=true" }) -class ChromaContainerConnectionDetailsFactoryTest { +class ChromaContainerConnectionDetailsFactoryIT { @Container @ServiceConnection diff --git a/spring-ai-spring-boot-testcontainers/src/test/java/org/springframework/ai/testcontainers/service/connection/chroma/ChromaWithToken2ContainerConnectionDetailsFactoryTest.java b/spring-ai-spring-boot-testcontainers/src/test/java/org/springframework/ai/testcontainers/service/connection/chroma/ChromaWithToken2ContainerConnectionDetailsFactoryIT.java similarity index 98% rename from spring-ai-spring-boot-testcontainers/src/test/java/org/springframework/ai/testcontainers/service/connection/chroma/ChromaWithToken2ContainerConnectionDetailsFactoryTest.java rename to spring-ai-spring-boot-testcontainers/src/test/java/org/springframework/ai/testcontainers/service/connection/chroma/ChromaWithToken2ContainerConnectionDetailsFactoryIT.java index a9c64aa4cfc..6f2033fd3ce 100644 --- a/spring-ai-spring-boot-testcontainers/src/test/java/org/springframework/ai/testcontainers/service/connection/chroma/ChromaWithToken2ContainerConnectionDetailsFactoryTest.java +++ b/spring-ai-spring-boot-testcontainers/src/test/java/org/springframework/ai/testcontainers/service/connection/chroma/ChromaWithToken2ContainerConnectionDetailsFactoryIT.java @@ -45,7 +45,7 @@ @Testcontainers @TestPropertySource(properties = { "spring.ai.vectorstore.chroma.collectionName=TestCollection", "spring.ai.vectorstore.chroma.initialize-schema=true" }) -class ChromaWithToken2ContainerConnectionDetailsFactoryTest { +class ChromaWithToken2ContainerConnectionDetailsFactoryIT { @Container @ServiceConnection diff --git a/spring-ai-spring-boot-testcontainers/src/test/java/org/springframework/ai/testcontainers/service/connection/chroma/ChromaWithTokenContainerConnectionDetailsFactoryTest.java b/spring-ai-spring-boot-testcontainers/src/test/java/org/springframework/ai/testcontainers/service/connection/chroma/ChromaWithTokenContainerConnectionDetailsFactoryIT.java similarity index 98% rename from spring-ai-spring-boot-testcontainers/src/test/java/org/springframework/ai/testcontainers/service/connection/chroma/ChromaWithTokenContainerConnectionDetailsFactoryTest.java rename to spring-ai-spring-boot-testcontainers/src/test/java/org/springframework/ai/testcontainers/service/connection/chroma/ChromaWithTokenContainerConnectionDetailsFactoryIT.java index 614024b7714..ba253ad95ae 100644 --- a/spring-ai-spring-boot-testcontainers/src/test/java/org/springframework/ai/testcontainers/service/connection/chroma/ChromaWithTokenContainerConnectionDetailsFactoryTest.java +++ b/spring-ai-spring-boot-testcontainers/src/test/java/org/springframework/ai/testcontainers/service/connection/chroma/ChromaWithTokenContainerConnectionDetailsFactoryIT.java @@ -45,7 +45,7 @@ @Testcontainers @TestPropertySource(properties = { "spring.ai.vectorstore.chroma.collectionName=TestCollection", "spring.ai.vectorstore.chroma.initialize-schema=true" }) -class ChromaWithTokenContainerConnectionDetailsFactoryTest { +class ChromaWithTokenContainerConnectionDetailsFactoryIT { @Container @ServiceConnection diff --git a/spring-ai-spring-boot-testcontainers/src/test/java/org/springframework/ai/testcontainers/service/connection/milvus/MilvusContainerConnectionDetailsFactoryTest.java b/spring-ai-spring-boot-testcontainers/src/test/java/org/springframework/ai/testcontainers/service/connection/milvus/MilvusContainerConnectionDetailsFactoryIT.java similarity index 98% rename from spring-ai-spring-boot-testcontainers/src/test/java/org/springframework/ai/testcontainers/service/connection/milvus/MilvusContainerConnectionDetailsFactoryTest.java rename to spring-ai-spring-boot-testcontainers/src/test/java/org/springframework/ai/testcontainers/service/connection/milvus/MilvusContainerConnectionDetailsFactoryIT.java index 2f3f51910a8..f4f14678f39 100644 --- a/spring-ai-spring-boot-testcontainers/src/test/java/org/springframework/ai/testcontainers/service/connection/milvus/MilvusContainerConnectionDetailsFactoryTest.java +++ b/spring-ai-spring-boot-testcontainers/src/test/java/org/springframework/ai/testcontainers/service/connection/milvus/MilvusContainerConnectionDetailsFactoryIT.java @@ -47,7 +47,7 @@ "spring.ai.vectorstore.milvus.indexType=IVF_FLAT", "spring.ai.vectorstore.milvus.embeddingDimension=384", "spring.ai.vectorstore.milvus.collectionName=myTestCollection", "spring.ai.vectorstore.milvus.initialize-schema=true" }) -class MilvusContainerConnectionDetailsFactoryTest { +class MilvusContainerConnectionDetailsFactoryIT { @Container @ServiceConnection diff --git a/spring-ai-spring-boot-testcontainers/src/test/java/org/springframework/ai/testcontainers/service/connection/ollama/OllamaContainerConnectionDetailsFactoryTest.java b/spring-ai-spring-boot-testcontainers/src/test/java/org/springframework/ai/testcontainers/service/connection/ollama/OllamaContainerConnectionDetailsFactoryIT.java similarity index 92% rename from spring-ai-spring-boot-testcontainers/src/test/java/org/springframework/ai/testcontainers/service/connection/ollama/OllamaContainerConnectionDetailsFactoryTest.java rename to spring-ai-spring-boot-testcontainers/src/test/java/org/springframework/ai/testcontainers/service/connection/ollama/OllamaContainerConnectionDetailsFactoryIT.java index 8cb9f4a124a..4a9b6824d91 100644 --- a/spring-ai-spring-boot-testcontainers/src/test/java/org/springframework/ai/testcontainers/service/connection/ollama/OllamaContainerConnectionDetailsFactoryTest.java +++ b/spring-ai-spring-boot-testcontainers/src/test/java/org/springframework/ai/testcontainers/service/connection/ollama/OllamaContainerConnectionDetailsFactoryIT.java @@ -48,13 +48,13 @@ @SpringJUnitConfig @Disabled("Slow on CPU. Only run manually.") @Testcontainers -@TestPropertySource(properties = "spring.ai.ollama.embedding.options.model=" - + OllamaContainerConnectionDetailsFactoryTest.MODEL_NAME) -class OllamaContainerConnectionDetailsFactoryTest { +@TestPropertySource( + properties = "spring.ai.ollama.embedding.options.model=" + OllamaContainerConnectionDetailsFactoryIT.MODEL_NAME) +class OllamaContainerConnectionDetailsFactoryIT { static final String MODEL_NAME = "nomic-embed-text"; - private static final Logger logger = LoggerFactory.getLogger(OllamaContainerConnectionDetailsFactoryTest.class); + private static final Logger logger = LoggerFactory.getLogger(OllamaContainerConnectionDetailsFactoryIT.class); @Container @ServiceConnection diff --git a/spring-ai-spring-boot-testcontainers/src/test/java/org/springframework/ai/testcontainers/service/connection/opensearch/AwsOpenSearchContainerConnectionDetailsFactoryTest.java b/spring-ai-spring-boot-testcontainers/src/test/java/org/springframework/ai/testcontainers/service/connection/opensearch/AwsOpenSearchContainerConnectionDetailsFactoryIT.java similarity index 97% rename from spring-ai-spring-boot-testcontainers/src/test/java/org/springframework/ai/testcontainers/service/connection/opensearch/AwsOpenSearchContainerConnectionDetailsFactoryTest.java rename to spring-ai-spring-boot-testcontainers/src/test/java/org/springframework/ai/testcontainers/service/connection/opensearch/AwsOpenSearchContainerConnectionDetailsFactoryIT.java index ffa34bbcc2c..99682055087 100644 --- a/spring-ai-spring-boot-testcontainers/src/test/java/org/springframework/ai/testcontainers/service/connection/opensearch/AwsOpenSearchContainerConnectionDetailsFactoryTest.java +++ b/spring-ai-spring-boot-testcontainers/src/test/java/org/springframework/ai/testcontainers/service/connection/opensearch/AwsOpenSearchContainerConnectionDetailsFactoryIT.java @@ -55,11 +55,11 @@ @TestPropertySource(properties = { "spring.ai.vectorstore.opensearch.index-name=auto-spring-ai-document-index", "spring.ai.vectorstore.opensearch.initialize-schema=true", "spring.ai.vectorstore.opensearch.mapping-json=" - + AwsOpenSearchContainerConnectionDetailsFactoryTest.MAPPING_JSON, + + AwsOpenSearchContainerConnectionDetailsFactoryIT.MAPPING_JSON, "spring.ai.vectorstore.opensearch.aws.domain-name=testcontainers-domain", "spring.ai.vectorstore.opensearch.aws.service-name=es" }) @Testcontainers -class AwsOpenSearchContainerConnectionDetailsFactoryTest { +class AwsOpenSearchContainerConnectionDetailsFactoryIT { static final String MAPPING_JSON = "{\"properties\":{\"embedding\":{\"type\":\"knn_vector\",\"dimension\":384}}}"; diff --git a/spring-ai-spring-boot-testcontainers/src/test/java/org/springframework/ai/testcontainers/service/connection/opensearch/OpenSearchContainerConnectionDetailsFactoryTest.java b/spring-ai-spring-boot-testcontainers/src/test/java/org/springframework/ai/testcontainers/service/connection/opensearch/OpenSearchContainerConnectionDetailsFactoryIT.java similarity index 98% rename from spring-ai-spring-boot-testcontainers/src/test/java/org/springframework/ai/testcontainers/service/connection/opensearch/OpenSearchContainerConnectionDetailsFactoryTest.java rename to spring-ai-spring-boot-testcontainers/src/test/java/org/springframework/ai/testcontainers/service/connection/opensearch/OpenSearchContainerConnectionDetailsFactoryIT.java index e54ea388a6e..c47a921170a 100644 --- a/spring-ai-spring-boot-testcontainers/src/test/java/org/springframework/ai/testcontainers/service/connection/opensearch/OpenSearchContainerConnectionDetailsFactoryTest.java +++ b/spring-ai-spring-boot-testcontainers/src/test/java/org/springframework/ai/testcontainers/service/connection/opensearch/OpenSearchContainerConnectionDetailsFactoryIT.java @@ -47,7 +47,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.Matchers.hasSize; -class OpenSearchContainerConnectionDetailsFactoryTest { +class OpenSearchContainerConnectionDetailsFactoryIT { private final ApplicationContextRunner contextRunner = new ApplicationContextRunner() .withInitializer(new TestcontainersLifecycleApplicationContextInitializer()) diff --git a/spring-ai-spring-boot-testcontainers/src/test/java/org/springframework/ai/testcontainers/service/connection/qdrant/QdrantContainerConnectionDetailsFactoryTest.java b/spring-ai-spring-boot-testcontainers/src/test/java/org/springframework/ai/testcontainers/service/connection/qdrant/QdrantContainerConnectionDetailsFactoryIT.java similarity index 98% rename from spring-ai-spring-boot-testcontainers/src/test/java/org/springframework/ai/testcontainers/service/connection/qdrant/QdrantContainerConnectionDetailsFactoryTest.java rename to spring-ai-spring-boot-testcontainers/src/test/java/org/springframework/ai/testcontainers/service/connection/qdrant/QdrantContainerConnectionDetailsFactoryIT.java index c25773c79d6..b7079154504 100644 --- a/spring-ai-spring-boot-testcontainers/src/test/java/org/springframework/ai/testcontainers/service/connection/qdrant/QdrantContainerConnectionDetailsFactoryTest.java +++ b/spring-ai-spring-boot-testcontainers/src/test/java/org/springframework/ai/testcontainers/service/connection/qdrant/QdrantContainerConnectionDetailsFactoryIT.java @@ -47,7 +47,7 @@ @Testcontainers @TestPropertySource(properties = { "spring.ai.vectorstore.qdrant.collectionName=test_collection", "spring.ai.vectorstore.qdrant.initialize-schema=true" }) -public class QdrantContainerConnectionDetailsFactoryTest { +public class QdrantContainerConnectionDetailsFactoryIT { @Container @ServiceConnection diff --git a/spring-ai-spring-boot-testcontainers/src/test/java/org/springframework/ai/testcontainers/service/connection/qdrant/QdrantContainerWithApiKeyConnectionDetailsFactoryTest.java b/spring-ai-spring-boot-testcontainers/src/test/java/org/springframework/ai/testcontainers/service/connection/qdrant/QdrantContainerWithApiKeyConnectionDetailsFactoryIT.java similarity index 98% rename from spring-ai-spring-boot-testcontainers/src/test/java/org/springframework/ai/testcontainers/service/connection/qdrant/QdrantContainerWithApiKeyConnectionDetailsFactoryTest.java rename to spring-ai-spring-boot-testcontainers/src/test/java/org/springframework/ai/testcontainers/service/connection/qdrant/QdrantContainerWithApiKeyConnectionDetailsFactoryIT.java index 998e220df9b..6eecad9024e 100644 --- a/spring-ai-spring-boot-testcontainers/src/test/java/org/springframework/ai/testcontainers/service/connection/qdrant/QdrantContainerWithApiKeyConnectionDetailsFactoryTest.java +++ b/spring-ai-spring-boot-testcontainers/src/test/java/org/springframework/ai/testcontainers/service/connection/qdrant/QdrantContainerWithApiKeyConnectionDetailsFactoryIT.java @@ -47,7 +47,7 @@ @Testcontainers @TestPropertySource(properties = { "spring.ai.vectorstore.qdrant.collectionName=test_collection", "spring.ai.vectorstore.qdrant.initialize-schema=true" }) -public class QdrantContainerWithApiKeyConnectionDetailsFactoryTest { +public class QdrantContainerWithApiKeyConnectionDetailsFactoryIT { @Container @ServiceConnection diff --git a/spring-ai-spring-boot-testcontainers/src/test/java/org/springframework/ai/testcontainers/service/connection/typesense/TypesenseContainerConnectionDetailsFactoryTest.java b/spring-ai-spring-boot-testcontainers/src/test/java/org/springframework/ai/testcontainers/service/connection/typesense/TypesenseContainerConnectionDetailsFactoryIT.java similarity index 98% rename from spring-ai-spring-boot-testcontainers/src/test/java/org/springframework/ai/testcontainers/service/connection/typesense/TypesenseContainerConnectionDetailsFactoryTest.java rename to spring-ai-spring-boot-testcontainers/src/test/java/org/springframework/ai/testcontainers/service/connection/typesense/TypesenseContainerConnectionDetailsFactoryIT.java index 1aae0793ad8..9d34642991a 100644 --- a/spring-ai-spring-boot-testcontainers/src/test/java/org/springframework/ai/testcontainers/service/connection/typesense/TypesenseContainerConnectionDetailsFactoryTest.java +++ b/spring-ai-spring-boot-testcontainers/src/test/java/org/springframework/ai/testcontainers/service/connection/typesense/TypesenseContainerConnectionDetailsFactoryIT.java @@ -47,7 +47,7 @@ "spring.ai.vectorstore.typesense.initialize-schema=true", "spring.ai.vectorstore.typesense.collectionName=myTestCollection" }) @Testcontainers -class TypesenseContainerConnectionDetailsFactoryTest { +class TypesenseContainerConnectionDetailsFactoryIT { @Container @ServiceConnection diff --git a/spring-ai-spring-boot-testcontainers/src/test/java/org/springframework/ai/testcontainers/service/connection/weaviate/WeaviateContainerConnectionDetailsFactoryTest.java b/spring-ai-spring-boot-testcontainers/src/test/java/org/springframework/ai/testcontainers/service/connection/weaviate/WeaviateContainerConnectionDetailsFactoryIT.java similarity index 99% rename from spring-ai-spring-boot-testcontainers/src/test/java/org/springframework/ai/testcontainers/service/connection/weaviate/WeaviateContainerConnectionDetailsFactoryTest.java rename to spring-ai-spring-boot-testcontainers/src/test/java/org/springframework/ai/testcontainers/service/connection/weaviate/WeaviateContainerConnectionDetailsFactoryIT.java index b30588e4eff..bb81ace4f9a 100644 --- a/spring-ai-spring-boot-testcontainers/src/test/java/org/springframework/ai/testcontainers/service/connection/weaviate/WeaviateContainerConnectionDetailsFactoryTest.java +++ b/spring-ai-spring-boot-testcontainers/src/test/java/org/springframework/ai/testcontainers/service/connection/weaviate/WeaviateContainerConnectionDetailsFactoryIT.java @@ -50,7 +50,7 @@ "spring.ai.vectorstore.weaviate.filter-field.active=BOOLEAN", "spring.ai.vectorstore.weaviate.filter-field.price=NUMBER", "spring.ai.vectorstore.weaviate.initialize-schema=true" }) -class WeaviateContainerConnectionDetailsFactoryTest { +class WeaviateContainerConnectionDetailsFactoryIT { @Container @ServiceConnection diff --git a/vector-stores/spring-ai-azure-cosmos-db-store/pom.xml b/vector-stores/spring-ai-azure-cosmos-db-store/pom.xml index 4e9617591ec..ca93a9ece8b 100644 --- a/vector-stores/spring-ai-azure-cosmos-db-store/pom.xml +++ b/vector-stores/spring-ai-azure-cosmos-db-store/pom.xml @@ -94,24 +94,4 @@ - - - - org.apache.maven.plugins - maven-failsafe-plugin - ${maven-failsafe-plugin.version} - - ${skip.vectorstore.azure-cosmos-db} - - - - - integration-test - verify - - - - - - diff --git a/vector-stores/spring-ai-azure-store/pom.xml b/vector-stores/spring-ai-azure-store/pom.xml index 53307a4a12d..483692889f8 100644 --- a/vector-stores/spring-ai-azure-store/pom.xml +++ b/vector-stores/spring-ai-azure-store/pom.xml @@ -121,24 +121,4 @@ - - - - org.apache.maven.plugins - maven-failsafe-plugin - ${maven-failsafe-plugin.version} - - ${skip.vectorstore.azure} - - - - - integration-test - verify - - - - - - diff --git a/vector-stores/spring-ai-cassandra-store/pom.xml b/vector-stores/spring-ai-cassandra-store/pom.xml index 9f457aa30df..fd149b3a6d7 100644 --- a/vector-stores/spring-ai-cassandra-store/pom.xml +++ b/vector-stores/spring-ai-cassandra-store/pom.xml @@ -93,24 +93,4 @@ test - - - - org.apache.maven.plugins - maven-failsafe-plugin - ${maven-failsafe-plugin.version} - - ${skip.vectorstore.cassandra} - - - - - integration-test - verify - - - - - - diff --git a/vector-stores/spring-ai-chroma-store/pom.xml b/vector-stores/spring-ai-chroma-store/pom.xml index 6834082f057..7764b5d8e14 100644 --- a/vector-stores/spring-ai-chroma-store/pom.xml +++ b/vector-stores/spring-ai-chroma-store/pom.xml @@ -96,24 +96,4 @@ - - - - org.apache.maven.plugins - maven-failsafe-plugin - ${maven-failsafe-plugin.version} - - ${skip.vectorstore.chroma} - - - - - integration-test - verify - - - - - - diff --git a/vector-stores/spring-ai-coherence-store/pom.xml b/vector-stores/spring-ai-coherence-store/pom.xml index a4c9d3e78de..2289609f143 100644 --- a/vector-stores/spring-ai-coherence-store/pom.xml +++ b/vector-stores/spring-ai-coherence-store/pom.xml @@ -80,24 +80,4 @@ - - - - org.apache.maven.plugins - maven-failsafe-plugin - ${maven-failsafe-plugin.version} - - ${skip.vectorstore.coherence} - - - - - integration-test - verify - - - - - - diff --git a/vector-stores/spring-ai-elasticsearch-store/pom.xml b/vector-stores/spring-ai-elasticsearch-store/pom.xml index a7eb6a14fad..9ae49b69188 100644 --- a/vector-stores/spring-ai-elasticsearch-store/pom.xml +++ b/vector-stores/spring-ai-elasticsearch-store/pom.xml @@ -95,25 +95,4 @@ test - - - - - org.apache.maven.plugins - maven-failsafe-plugin - ${maven-failsafe-plugin.version} - - ${skip.vectorstore.elasticsearch} - - - - - integration-test - verify - - - - - - diff --git a/vector-stores/spring-ai-gemfire-store/pom.xml b/vector-stores/spring-ai-gemfire-store/pom.xml index 6ac2b727454..719b3ffdfa7 100644 --- a/vector-stores/spring-ai-gemfire-store/pom.xml +++ b/vector-stores/spring-ai-gemfire-store/pom.xml @@ -101,24 +101,4 @@ - - - - org.apache.maven.plugins - maven-failsafe-plugin - ${maven-failsafe-plugin.version} - - ${skip.vectorstore.gemfire} - - - - - integration-test - verify - - - - - - diff --git a/vector-stores/spring-ai-hanadb-store/pom.xml b/vector-stores/spring-ai-hanadb-store/pom.xml index 1daa59ce869..7bde3251a99 100644 --- a/vector-stores/spring-ai-hanadb-store/pom.xml +++ b/vector-stores/spring-ai-hanadb-store/pom.xml @@ -100,24 +100,4 @@ - - - - org.apache.maven.plugins - maven-failsafe-plugin - ${maven-failsafe-plugin.version} - - ${skip.vectorstore.hanadb} - - - - - integration-test - verify - - - - - - diff --git a/vector-stores/spring-ai-milvus-store/pom.xml b/vector-stores/spring-ai-milvus-store/pom.xml index 071aca334bb..9369a14c59a 100644 --- a/vector-stores/spring-ai-milvus-store/pom.xml +++ b/vector-stores/spring-ai-milvus-store/pom.xml @@ -95,25 +95,4 @@ test - - - - - org.apache.maven.plugins - maven-failsafe-plugin - ${maven-failsafe-plugin.version} - - ${skip.vectorstore.milvus} - - - - - integration-test - verify - - - - - - diff --git a/vector-stores/spring-ai-mongodb-atlas-store/pom.xml b/vector-stores/spring-ai-mongodb-atlas-store/pom.xml index 19fca08aaef..c8bc4b65622 100644 --- a/vector-stores/spring-ai-mongodb-atlas-store/pom.xml +++ b/vector-stores/spring-ai-mongodb-atlas-store/pom.xml @@ -93,25 +93,4 @@ test - - - - - org.apache.maven.plugins - maven-failsafe-plugin - ${maven-failsafe-plugin.version} - - ${skip.vectorstore.mongodb-atlas} - - - - - integration-test - verify - - - - - - diff --git a/vector-stores/spring-ai-neo4j-store/pom.xml b/vector-stores/spring-ai-neo4j-store/pom.xml index 63fdbbde1d2..f032de11656 100644 --- a/vector-stores/spring-ai-neo4j-store/pom.xml +++ b/vector-stores/spring-ai-neo4j-store/pom.xml @@ -109,26 +109,4 @@ test - - - - - org.apache.maven.plugins - maven-failsafe-plugin - ${maven-failsafe-plugin.version} - - ${skip.vectorstore.neo4j} - - - - - integration-test - verify - - - - - - - diff --git a/vector-stores/spring-ai-opensearch-store/pom.xml b/vector-stores/spring-ai-opensearch-store/pom.xml index 7d497b4e20f..4c48a3cb5d7 100644 --- a/vector-stores/spring-ai-opensearch-store/pom.xml +++ b/vector-stores/spring-ai-opensearch-store/pom.xml @@ -71,7 +71,7 @@ org.springframework.ai spring-ai-ollama - ${parent.version} + ${project.parent.version} test @@ -111,25 +111,4 @@ - - - - org.apache.maven.plugins - maven-failsafe-plugin - ${maven-failsafe-plugin.version} - - ${skip.vectorstore.opensearch} - - - - - integration-test - verify - - - - - - - diff --git a/vector-stores/spring-ai-oracle-store/pom.xml b/vector-stores/spring-ai-oracle-store/pom.xml index 98059302807..b7763604ae6 100644 --- a/vector-stores/spring-ai-oracle-store/pom.xml +++ b/vector-stores/spring-ai-oracle-store/pom.xml @@ -123,25 +123,5 @@ - - - - org.apache.maven.plugins - maven-failsafe-plugin - ${maven-failsafe-plugin.version} - - ${skip.vectorstore.oracle} - - - - - integration-test - verify - - - - - - diff --git a/vector-stores/spring-ai-pgvector-store/pom.xml b/vector-stores/spring-ai-pgvector-store/pom.xml index b411285b5de..4d1247f5497 100644 --- a/vector-stores/spring-ai-pgvector-store/pom.xml +++ b/vector-stores/spring-ai-pgvector-store/pom.xml @@ -116,26 +116,5 @@ - - - - - org.apache.maven.plugins - maven-failsafe-plugin - ${maven-failsafe-plugin.version} - - ${skip.vectorstore.pgvector} - - - - - integration-test - verify - - - - - - - + diff --git a/vector-stores/spring-ai-pinecone-store/pom.xml b/vector-stores/spring-ai-pinecone-store/pom.xml index 3832c2ee66c..c56d36ce428 100644 --- a/vector-stores/spring-ai-pinecone-store/pom.xml +++ b/vector-stores/spring-ai-pinecone-store/pom.xml @@ -124,25 +124,4 @@ - - - - org.apache.maven.plugins - maven-failsafe-plugin - ${maven-failsafe-plugin.version} - - ${skip.vectorstore.pinecone} - - - - - integration-test - verify - - - - - - - diff --git a/vector-stores/spring-ai-qdrant-store/pom.xml b/vector-stores/spring-ai-qdrant-store/pom.xml index c677d9cd9c3..149d81b8048 100644 --- a/vector-stores/spring-ai-qdrant-store/pom.xml +++ b/vector-stores/spring-ai-qdrant-store/pom.xml @@ -105,24 +105,4 @@ - - - - org.apache.maven.plugins - maven-failsafe-plugin - ${maven-failsafe-plugin.version} - - ${skip.vectorstore.qdrant} - - - - - integration-test - verify - - - - - - diff --git a/vector-stores/spring-ai-redis-store/pom.xml b/vector-stores/spring-ai-redis-store/pom.xml index 5155d90ab5d..34b078cd95f 100644 --- a/vector-stores/spring-ai-redis-store/pom.xml +++ b/vector-stores/spring-ai-redis-store/pom.xml @@ -103,25 +103,4 @@ - - - - org.apache.maven.plugins - maven-failsafe-plugin - ${maven-failsafe-plugin.version} - - ${skip.vectorstore.redis} - - - - - integration-test - verify - - - - - - - diff --git a/vector-stores/spring-ai-typesense-store/pom.xml b/vector-stores/spring-ai-typesense-store/pom.xml index 3ef60c6f650..83d13e75f2d 100644 --- a/vector-stores/spring-ai-typesense-store/pom.xml +++ b/vector-stores/spring-ai-typesense-store/pom.xml @@ -91,25 +91,4 @@ - - - - org.apache.maven.plugins - maven-failsafe-plugin - ${maven-failsafe-plugin.version} - - ${skip.vectorstore.typesense} - - - - - integration-test - verify - - - - - - - diff --git a/vector-stores/spring-ai-weaviate-store/pom.xml b/vector-stores/spring-ai-weaviate-store/pom.xml index 2a38cec0a81..2ba8d3fa2ef 100644 --- a/vector-stores/spring-ai-weaviate-store/pom.xml +++ b/vector-stores/spring-ai-weaviate-store/pom.xml @@ -104,25 +104,4 @@ - - - - org.apache.maven.plugins - maven-failsafe-plugin - ${maven-failsafe-plugin.version} - - ${skip.vectorstore.weaviate} - - - - - integration-test - verify - - - - - - -