diff --git a/contrib/spring-ai/pom.xml b/contrib/spring-ai/pom.xml index 68c22f380..e07deec9e 100644 --- a/contrib/spring-ai/pom.xml +++ b/contrib/spring-ai/pom.xml @@ -29,7 +29,7 @@ Spring AI integration for the Agent Development Kit. - 1.1.1 + 2.0.0-M2 1.21.3 diff --git a/dev/pom.xml b/dev/pom.xml index 8595995ed..6a0a03467 100644 --- a/dev/pom.xml +++ b/dev/pom.xml @@ -63,6 +63,11 @@ spring-boot-starter-test test + + org.springframework.boot + spring-boot-starter-webmvc-test + test + com.google.truth truth diff --git a/dev/src/test/java/com/google/adk/web/AdkWebServerTest.java b/dev/src/test/java/com/google/adk/web/AdkWebServerTest.java index 71aaca180..275001200 100644 --- a/dev/src/test/java/com/google/adk/web/AdkWebServerTest.java +++ b/dev/src/test/java/com/google/adk/web/AdkWebServerTest.java @@ -26,8 +26,8 @@ import org.hamcrest.Matchers; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc; import org.springframework.http.MediaType; import org.springframework.test.web.servlet.MockMvc; diff --git a/dev/src/test/java/com/google/adk/web/AdkWebServerUITest.java b/dev/src/test/java/com/google/adk/web/AdkWebServerUITest.java index f4287f786..cfb162db2 100644 --- a/dev/src/test/java/com/google/adk/web/AdkWebServerUITest.java +++ b/dev/src/test/java/com/google/adk/web/AdkWebServerUITest.java @@ -24,8 +24,8 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc; import org.springframework.test.web.servlet.MockMvc; /** diff --git a/pom.xml b/pom.xml index af8a1f2b1..98ef03fff 100644 --- a/pom.xml +++ b/pom.xml @@ -44,7 +44,7 @@ 3.6.0 1.11.1 - 3.4.1 + 4.0.2 @@ -56,9 +56,9 @@ 5.11.4 5.20.0 1.6.0 - 2.19.0 - 5.3.2 - 3.7.0 + 2.20.2 + 4.12.0 + 3.3.6 0.18.1 3.41.0 3.9.0 @@ -78,6 +78,13 @@ + + com.fasterxml.jackson + jackson-bom + ${jackson.version} + pom + import + com.google.cloud libraries-bom @@ -162,36 +169,6 @@ error_prone_annotations ${errorprone.version} - - com.fasterxml.jackson.core - jackson-core - ${jackson.version} - - - com.fasterxml.jackson.core - jackson-annotations - ${jackson.version} - - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - - - com.fasterxml.jackson.datatype - jackson-datatype-jdk8 - ${jackson.version} - - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - ${jackson.version} - - - com.fasterxml.jackson.dataformat - jackson-dataformat-yaml - ${jackson.version} - com.google.protobuf protobuf-java