Skip to content

chore: Update the MCP SDK version to 1.1.1 #1172

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
copybara-service merged 1 commit into from
Apr 30, 2026
Merged

chore: Update the MCP SDK version to 1.1.1 #1172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion core/src/main/java/com/google/adk/tools/mcp/ConversionUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,15 @@
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;

/** 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<FunctionDeclaration> toolDeclaration = tool.declaration();
Expand Down
3 changes: 2 additions & 1 deletion core/src/main/java/com/google/adk/tools/mcp/DefaultMcpTransportBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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) {
Expand Down
3 changes: 2 additions & 1 deletion core/src/test/java/com/google/adk/tools/mcp/McpToolsetTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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<String, Object> STDIO_SERVER_PARAMS =
ImmutableMap.of(
Expand Down
3 changes: 2 additions & 1 deletion core/src/test/java/com/google/adk/tools/mcp/StdioServerParametersTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
cloud libraries. Once they update their otel dependencies we
can consider updating ours here as well -->
<otel.version>1.51.0</otel.version>
<mcp.version>0.17.2</mcp.version>
<mcp.version>1.1.1</mcp.version>
<errorprone.version>2.47.0</errorprone.version>
<google.genai.version>1.44.0</google.genai.version>
<protobuf.version>4.33.5</protobuf.version>
Expand Down
Loading