From 9700523e6ad01470408fc656d261143edc40834a Mon Sep 17 00:00:00 2001 From: Google Team Member Date: Thu, 30 Apr 2026 06:28:51 -0700 Subject: [PATCH] chore: Update the MCP SDK version to 1.1.1 PiperOrigin-RevId: 908135932 --- .../main/java/com/google/adk/tools/mcp/ConversionUtils.java | 3 ++- .../com/google/adk/tools/mcp/DefaultMcpTransportBuilder.java | 3 ++- .../src/test/java/com/google/adk/tools/mcp/McpToolsetTest.java | 3 ++- .../com/google/adk/tools/mcp/StdioServerParametersTest.java | 3 ++- pom.xml | 2 +- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/core/src/main/java/com/google/adk/tools/mcp/ConversionUtils.java b/core/src/main/java/com/google/adk/tools/mcp/ConversionUtils.java index 8ad7d1b46..c115cfca0 100644 --- a/core/src/main/java/com/google/adk/tools/mcp/ConversionUtils.java +++ b/core/src/main/java/com/google/adk/tools/mcp/ConversionUtils.java @@ -19,6 +19,7 @@ import com.google.adk.tools.BaseTool; import com.google.genai.types.FunctionDeclaration; import com.google.genai.types.Schema; +import io.modelcontextprotocol.json.McpJsonDefaults; import io.modelcontextprotocol.json.McpJsonMapper; import io.modelcontextprotocol.spec.McpSchema; import java.util.Optional; @@ -26,7 +27,7 @@ /** Utility class for converting between different representations of MCP tools. */ public final class ConversionUtils { - private static final McpJsonMapper jsonMapper = McpJsonMapper.getDefault(); + private static final McpJsonMapper jsonMapper = McpJsonDefaults.getMapper(); public McpSchema.Tool adkToMcpToolType(BaseTool tool) { Optional toolDeclaration = tool.declaration(); diff --git a/core/src/main/java/com/google/adk/tools/mcp/DefaultMcpTransportBuilder.java b/core/src/main/java/com/google/adk/tools/mcp/DefaultMcpTransportBuilder.java index b82ebae84..84c882c4e 100644 --- a/core/src/main/java/com/google/adk/tools/mcp/DefaultMcpTransportBuilder.java +++ b/core/src/main/java/com/google/adk/tools/mcp/DefaultMcpTransportBuilder.java @@ -5,6 +5,7 @@ import io.modelcontextprotocol.client.transport.HttpClientStreamableHttpTransport; import io.modelcontextprotocol.client.transport.ServerParameters; import io.modelcontextprotocol.client.transport.StdioClientTransport; +import io.modelcontextprotocol.json.McpJsonDefaults; import io.modelcontextprotocol.json.McpJsonMapper; import io.modelcontextprotocol.spec.McpClientTransport; import java.util.Collection; @@ -18,7 +19,7 @@ */ public class DefaultMcpTransportBuilder implements McpTransportBuilder { - private static final McpJsonMapper jsonMapper = McpJsonMapper.getDefault(); + private static final McpJsonMapper jsonMapper = McpJsonDefaults.getMapper(); @Override public McpClientTransport build(Object connectionParams) { diff --git a/core/src/test/java/com/google/adk/tools/mcp/McpToolsetTest.java b/core/src/test/java/com/google/adk/tools/mcp/McpToolsetTest.java index 0db218347..f00091d2d 100644 --- a/core/src/test/java/com/google/adk/tools/mcp/McpToolsetTest.java +++ b/core/src/test/java/com/google/adk/tools/mcp/McpToolsetTest.java @@ -31,6 +31,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import io.modelcontextprotocol.client.McpSyncClient; +import io.modelcontextprotocol.json.McpJsonDefaults; import io.modelcontextprotocol.json.McpJsonMapper; import io.modelcontextprotocol.spec.McpSchema; import java.util.List; @@ -50,7 +51,7 @@ public class McpToolsetTest { @Mock private McpSyncClient mockMcpSyncClient; @Mock private ReadonlyContext mockReadonlyContext; - private static final McpJsonMapper jsonMapper = McpJsonMapper.getDefault(); + private static final McpJsonMapper jsonMapper = McpJsonDefaults.getMapper(); private static final ImmutableMap STDIO_SERVER_PARAMS = ImmutableMap.of( diff --git a/core/src/test/java/com/google/adk/tools/mcp/StdioServerParametersTest.java b/core/src/test/java/com/google/adk/tools/mcp/StdioServerParametersTest.java index 166665309..7c970117d 100644 --- a/core/src/test/java/com/google/adk/tools/mcp/StdioServerParametersTest.java +++ b/core/src/test/java/com/google/adk/tools/mcp/StdioServerParametersTest.java @@ -22,6 +22,7 @@ import com.google.common.collect.ImmutableMap; import io.modelcontextprotocol.client.transport.ServerParameters; import io.modelcontextprotocol.client.transport.StdioClientTransport; +import io.modelcontextprotocol.json.McpJsonDefaults; import io.modelcontextprotocol.json.McpJsonMapper; import java.lang.reflect.Field; import java.util.List; @@ -34,7 +35,7 @@ @RunWith(JUnit4.class) public final class StdioServerParametersTest { - private static final McpJsonMapper jsonMapper = McpJsonMapper.getDefault(); + private static final McpJsonMapper jsonMapper = McpJsonDefaults.getMapper(); @Test public void toServerParameters_withNullArgs_createsValidServerParameters() { diff --git a/pom.xml b/pom.xml index 6f6837df5..257375f68 100644 --- a/pom.xml +++ b/pom.xml @@ -50,7 +50,7 @@ cloud libraries. Once they update their otel dependencies we can consider updating ours here as well --> 1.51.0 - 0.17.2 + 1.1.1 2.47.0 1.44.0 4.33.5