Skip to content

Commit 2426fcd

Browse files
copybara-githubcopybara-github
committed
Merge pull request google#962 from ddobrin:spring-pr
PiperOrigin-RevId: 879081384
2 parents 88153c8 + 401c25d commit 2426fcd

5 files changed

Lines changed: 47 additions & 35 deletions

File tree

‎contrib/spring-ai/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<description>Spring AI integration for the Agent Development Kit.</description>
3030

3131
<properties>
32-
<spring-ai.version>1.1.0</spring-ai.version>
32+
<spring-ai.version>2.0.0-M2</spring-ai.version>
3333
<testcontainers.version>1.21.3</testcontainers.version>
3434
</properties>
3535

‎dev/pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,11 @@
6363
<artifactId>spring-boot-starter-test</artifactId>
6464
<scope>test</scope>
6565
</dependency>
66+
<dependency>
67+
<groupId>org.springframework.boot</groupId>
68+
<artifactId>spring-boot-starter-webmvc-test</artifactId>
69+
<scope>test</scope>
70+
</dependency>
6671
<dependency>
6772
<groupId>com.google.truth</groupId>
6873
<artifactId>truth</artifactId>

‎dev/src/test/java/com/google/adk/web/AdkWebServerTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
import org.hamcrest.Matchers;
2727
import org.junit.jupiter.api.Test;
2828
import org.springframework.beans.factory.annotation.Autowired;
29-
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
3029
import org.springframework.boot.test.context.SpringBootTest;
30+
import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc;
3131
import org.springframework.http.MediaType;
3232
import org.springframework.test.web.servlet.MockMvc;
3333

‎dev/src/test/java/com/google/adk/web/AdkWebServerUITest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
import org.junit.jupiter.params.ParameterizedTest;
2525
import org.junit.jupiter.params.provider.ValueSource;
2626
import org.springframework.beans.factory.annotation.Autowired;
27-
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
2827
import org.springframework.boot.test.context.SpringBootTest;
28+
import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc;
2929
import org.springframework.test.web.servlet.MockMvc;
3030

3131
/**

‎pom.xml‎

Lines changed: 39 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<maven.checkstyle.plugin.version>3.6.0</maven.checkstyle.plugin.version>
4545

4646
<auto-value.version>1.11.1</auto-value.version>
47-
<spring-boot.version>3.4.1</spring-boot.version>
47+
<spring-boot.version>4.0.2</spring-boot.version>
4848
<!-- otel.version capped at 1.51.0 to avoid conflicts with google
4949
cloud libraries. Once they update their otel dependencies we
5050
can consider updating ours here as well -->
@@ -56,7 +56,7 @@
5656
<junit.version>5.11.4</junit.version>
5757
<mockito.version>5.20.0</mockito.version>
5858
<java-websocket.version>1.6.0</java-websocket.version>
59-
<jackson.version>2.19.0</jackson.version>
59+
<jackson.version>2.20.2</jackson.version>
6060
<okhttp.version>5.3.2</okhttp.version>
6161
<docker-java.version>3.7.0</docker-java.version>
6262
<graphviz.version>0.18.1</graphviz.version>
@@ -78,6 +78,13 @@
7878
<dependencyManagement>
7979
<dependencies>
8080
<!-- BOMs for dependency management -->
81+
<dependency>
82+
<groupId>com.fasterxml.jackson</groupId>
83+
<artifactId>jackson-bom</artifactId>
84+
<version>${jackson.version}</version>
85+
<type>pom</type>
86+
<scope>import</scope>
87+
</dependency>
8188
<dependency>
8289
<groupId>com.google.cloud</groupId>
8390
<artifactId>libraries-bom</artifactId>
@@ -162,36 +169,36 @@
162169
<artifactId>error_prone_annotations</artifactId>
163170
<version>${errorprone.version}</version>
164171
</dependency>
165-
<dependency>
166-
<groupId>com.fasterxml.jackson.core</groupId>
167-
<artifactId>jackson-core</artifactId>
168-
<version>${jackson.version}</version>
169-
</dependency>
170-
<dependency>
171-
<groupId>com.fasterxml.jackson.core</groupId>
172-
<artifactId>jackson-annotations</artifactId>
173-
<version>${jackson.version}</version>
174-
</dependency>
175-
<dependency>
176-
<groupId>com.fasterxml.jackson.core</groupId>
177-
<artifactId>jackson-databind</artifactId>
178-
<version>${jackson.version}</version>
179-
</dependency>
180-
<dependency>
181-
<groupId>com.fasterxml.jackson.datatype</groupId>
182-
<artifactId>jackson-datatype-jdk8</artifactId>
183-
<version>${jackson.version}</version>
184-
</dependency>
185-
<dependency>
186-
<groupId>com.fasterxml.jackson.datatype</groupId>
187-
<artifactId>jackson-datatype-jsr310</artifactId>
188-
<version>${jackson.version}</version>
189-
</dependency>
190-
<dependency>
191-
<groupId>com.fasterxml.jackson.dataformat</groupId>
192-
<artifactId>jackson-dataformat-yaml</artifactId>
193-
<version>${jackson.version}</version>
194-
</dependency>
172+
<!-- <dependency>-->
173+
<!-- <groupId>com.fasterxml.jackson.core</groupId>-->
174+
<!-- <artifactId>jackson-core</artifactId>-->
175+
<!-- <version>${jackson.version}</version>-->
176+
<!-- </dependency>-->
177+
<!-- <dependency>-->
178+
<!-- <groupId>com.fasterxml.jackson.core</groupId>-->
179+
<!-- <artifactId>jackson-annotations</artifactId>-->
180+
<!-- <version>${jackson.version}</version>-->
181+
<!-- </dependency>-->
182+
<!-- <dependency>-->
183+
<!-- <groupId>com.fasterxml.jackson.core</groupId>-->
184+
<!-- <artifactId>jackson-databind</artifactId>-->
185+
<!-- <version>${jackson.version}</version>-->
186+
<!-- </dependency>-->
187+
<!-- <dependency>-->
188+
<!-- <groupId>com.fasterxml.jackson.datatype</groupId>-->
189+
<!-- <artifactId>jackson-datatype-jdk8</artifactId>-->
190+
<!-- <version>${jackson.version}</version>-->
191+
<!-- </dependency>-->
192+
<!-- <dependency>-->
193+
<!-- <groupId>com.fasterxml.jackson.datatype</groupId>-->
194+
<!-- <artifactId>jackson-datatype-jsr310</artifactId>-->
195+
<!-- <version>${jackson.version}</version>-->
196+
<!-- </dependency>-->
197+
<!-- <dependency>-->
198+
<!-- <groupId>com.fasterxml.jackson.dataformat</groupId>-->
199+
<!-- <artifactId>jackson-dataformat-yaml</artifactId>-->
200+
<!-- <version>${jackson.version}</version>-->
201+
<!-- </dependency>-->
195202
<dependency>
196203
<groupId>com.google.protobuf</groupId>
197204
<artifactId>protobuf-java</artifactId>

0 commit comments

Comments
 (0)