diff --git a/models/spring-ai-ollama/pom.xml b/models/spring-ai-ollama/pom.xml index 196fe348ff7..0e9fb5b942a 100644 --- a/models/spring-ai-ollama/pom.xml +++ b/models/spring-ai-ollama/pom.xml @@ -34,7 +34,7 @@ 17 17 UTF-8 - true + false diff --git a/spring-ai-spring-boot-autoconfigure/pom.xml b/spring-ai-spring-boot-autoconfigure/pom.xml index cef6c662250..03c029f5f53 100644 --- a/spring-ai-spring-boot-autoconfigure/pom.xml +++ b/spring-ai-spring-boot-autoconfigure/pom.xml @@ -1,20 +1,4 @@ - - @@ -37,7 +21,7 @@ - true + false diff --git a/spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/ollama/BaseOllamaIT.java b/spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/ollama/BaseOllamaIT.java index 6f2faf61ac5..f19849574d1 100644 --- a/spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/ollama/BaseOllamaIT.java +++ b/spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/ollama/BaseOllamaIT.java @@ -16,19 +16,17 @@ package org.springframework.ai.autoconfigure.ollama; +import java.time.Duration; + import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.testcontainers.ollama.OllamaContainer; -import java.time.Duration; - import org.springframework.ai.ollama.api.OllamaApi; import org.springframework.ai.ollama.management.ModelManagementOptions; import org.springframework.ai.ollama.management.OllamaModelManager; import org.springframework.ai.ollama.management.PullModelStrategy; -import static org.springframework.ai.autoconfigure.ollama.BaseOllamaIT.isDisabled; - public class BaseOllamaIT { private static OllamaContainer ollamaContainer; @@ -38,7 +36,7 @@ public class BaseOllamaIT { @BeforeAll public static void setUp() { - if (useTestcontainers && !BaseOllamaIT.isDisabled()) { + if (useTestcontainers && !isDisabled()) { ollamaContainer = new OllamaContainer(OllamaImage.IMAGE).withReuse(true); ollamaContainer.start(); } diff --git a/src/checkstyle/checkstyle-suppressions.xml b/src/checkstyle/checkstyle-suppressions.xml index 5f78aa52b5f..b162458b721 100644 --- a/src/checkstyle/checkstyle-suppressions.xml +++ b/src/checkstyle/checkstyle-suppressions.xml @@ -28,5 +28,6 @@ +