Skip to content

refactor: Fixes #947 Update Spring Boot version to 4.0.2, update Spri… #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ddobrin merged 2 commits into from
Mar 4, 2026
Merged

refactor: Fixes #947 Update Spring Boot version to 4.0.2, update Spri… #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7fc6df0
refactor: Fixes #947 Update Spring Boot version to 4.0.2, update Spri…
ddobrin Mar 4, 2026
a5de006
Merge branch 'planner' into spring-ai-update
ddobrin Mar 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion contrib/spring-ai/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<description>Spring AI integration for the Agent Development Kit.</description>

<properties>
<spring-ai.version>1.1.1</spring-ai.version>
<spring-ai.version>2.0.0-M2</spring-ai.version>
<testcontainers.version>1.21.3</testcontainers.version>
</properties>

Expand Down
5 changes: 5 additions & 0 deletions dev/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,11 @@
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-webmvc-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.truth</groupId>
<artifactId>truth</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion dev/src/test/java/com/google/adk/web/AdkWebServerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion dev/src/test/java/com/google/adk/web/AdkWebServerUITest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down
45 changes: 11 additions & 34 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<maven.checkstyle.plugin.version>3.6.0</maven.checkstyle.plugin.version>

<auto-value.version>1.11.1</auto-value.version>
<spring-boot.version>3.4.1</spring-boot.version>
<spring-boot.version>4.0.2</spring-boot.version>
<!-- otel.version capped at 1.51.0 to avoid conflicts with google
cloud libraries. Once they update their otel dependencies we
can consider updating ours here as well -->
Expand All @@ -56,9 +56,9 @@
<junit.version>5.11.4</junit.version>
<mockito.version>5.20.0</mockito.version>
<java-websocket.version>1.6.0</java-websocket.version>
<jackson.version>2.19.0</jackson.version>
<okhttp.version>5.3.2</okhttp.version>
<docker-java.version>3.7.0</docker-java.version>
<jackson.version>2.20.2</jackson.version>
<okhttp.version>4.12.0</okhttp.version>
<docker-java.version>3.3.6</docker-java.version>
<graphviz.version>0.18.1</graphviz.version>
<ecj.version>3.41.0</ecj.version>
<maven.version>3.9.0</maven.version>
Expand All @@ -78,6 +78,13 @@
<dependencyManagement>
<dependencies>
<!-- BOMs for dependency management -->
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>${jackson.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>libraries-bom</artifactId>
Expand Down Expand Up @@ -162,36 +169,6 @@
<artifactId>error_prone_annotations</artifactId>
<version>${errorprone.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jdk8</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
Expand Down
Loading