Skip to content

feat: add MCP protocol version 2025-06-18 support for streamable-http and stateless transports #558

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
merged 1 commit into from
Sep 18, 2025
+16 −11
Merged

feat: add MCP protocol version 2025-06-18 support for streamable-http and stateless transports #558

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
5 changes: 3 additions & 2 deletions ...main/java/io/modelcontextprotocol/client/transport/HttpClientStreamableHttpTransport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public class HttpClientStreamableHttpTransport implements McpClientTransport {

private static final Logger logger = LoggerFactory.getLogger(HttpClientStreamableHttpTransport.class);

private static final String MCP_PROTOCOL_VERSION = ProtocolVersions.MCP_2025_03_26;
private static final String MCP_PROTOCOL_VERSION = ProtocolVersions.MCP_2025_06_18;

private static final String DEFAULT_ENDPOINT = "/mcp";

Expand Down Expand Up @@ -140,7 +140,8 @@ private HttpClientStreamableHttpTransport(McpJsonMapper jsonMapper, HttpClient h

@Override
public List<String> protocolVersions() {
return List.of(ProtocolVersions.MCP_2024_11_05, ProtocolVersions.MCP_2025_03_26);
return List.of(ProtocolVersions.MCP_2024_11_05, ProtocolVersions.MCP_2025_03_26,
ProtocolVersions.MCP_2025_06_18);
}

public static Builder builder(String baseUri) {
Expand Down
3 changes: 2 additions & 1 deletion ...o/modelcontextprotocol/server/transport/HttpServletStreamableServerTransportProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,8 @@ private HttpServletStreamableServerTransportProvider(McpJsonMapper jsonMapper, S

@Override
public List<String> protocolVersions() {
return List.of(ProtocolVersions.MCP_2024_11_05, ProtocolVersions.MCP_2025_03_26);
return List.of(ProtocolVersions.MCP_2024_11_05, ProtocolVersions.MCP_2025_03_26,
ProtocolVersions.MCP_2025_06_18);
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion mcp-core/src/main/java/io/modelcontextprotocol/spec/McpSchema.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ private McpSchema() {
}

@Deprecated
public static final String LATEST_PROTOCOL_VERSION = ProtocolVersions.MCP_2025_03_26;
public static final String LATEST_PROTOCOL_VERSION = ProtocolVersions.MCP_2025_06_18;

public static final String JSONRPC_VERSION = "2.0";

Expand Down
2 changes: 1 addition & 1 deletion mcp-core/src/main/java/io/modelcontextprotocol/spec/McpStatelessServerTransport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ default void close() {
Mono<Void> closeGracefully();

default List<String> protocolVersions() {
return List.of(ProtocolVersions.MCP_2025_03_26);
return List.of(ProtocolVersions.MCP_2025_03_26, ProtocolVersions.MCP_2025_06_18);
}

}
4 changes: 2 additions & 2 deletions .../java/io/modelcontextprotocol/client/transport/HttpClientStreamableHttpTransportTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ void testRequestCustomizer() throws URISyntaxException {

// Verify the customizer was called
verify(mockRequestCustomizer, atLeastOnce()).customize(any(), eq("POST"), eq(uri), eq(
"{\"jsonrpc\":\"2.0\",\"method\":\"initialize\",\"id\":\"test-id\",\"params\":{\"protocolVersion\":\"2025-03-26\",\"capabilities\":{\"roots\":{\"listChanged\":true}},\"clientInfo\":{\"name\":\"Spring AI MCP Client\",\"version\":\"0.3.1\"}}}"),
"{\"jsonrpc\":\"2.0\",\"method\":\"initialize\",\"id\":\"test-id\",\"params\":{\"protocolVersion\":\"2025-06-18\",\"capabilities\":{\"roots\":{\"listChanged\":true}},\"clientInfo\":{\"name\":\"Spring AI MCP Client\",\"version\":\"0.3.1\"}}}"),
eq(context));
});
}
Expand Down Expand Up @@ -120,7 +120,7 @@ void testAsyncRequestCustomizer() throws URISyntaxException {

// Verify the customizer was called
verify(mockRequestCustomizer, atLeastOnce()).customize(any(), eq("POST"), eq(uri), eq(
"{\"jsonrpc\":\"2.0\",\"method\":\"initialize\",\"id\":\"test-id\",\"params\":{\"protocolVersion\":\"2025-03-26\",\"capabilities\":{\"roots\":{\"listChanged\":true}},\"clientInfo\":{\"name\":\"Spring AI MCP Client\",\"version\":\"0.3.1\"}}}"),
"{\"jsonrpc\":\"2.0\",\"method\":\"initialize\",\"id\":\"test-id\",\"params\":{\"protocolVersion\":\"2025-06-18\",\"capabilities\":{\"roots\":{\"listChanged\":true}},\"clientInfo\":{\"name\":\"Spring AI MCP Client\",\"version\":\"0.3.1\"}}}"),
eq(context));
});
}
Expand Down
5 changes: 3 additions & 2 deletions .../main/java/io/modelcontextprotocol/client/transport/WebClientStreamableHttpTransport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public class WebClientStreamableHttpTransport implements McpClientTransport {

private static final Logger logger = LoggerFactory.getLogger(WebClientStreamableHttpTransport.class);

private static final String MCP_PROTOCOL_VERSION = ProtocolVersions.MCP_2025_03_26;
private static final String MCP_PROTOCOL_VERSION = ProtocolVersions.MCP_2025_06_18;

private static final String DEFAULT_ENDPOINT = "/mcp";

Expand Down Expand Up @@ -116,7 +116,8 @@ private WebClientStreamableHttpTransport(McpJsonMapper jsonMapper, WebClient.Bui

@Override
public List<String> protocolVersions() {
return List.of(ProtocolVersions.MCP_2024_11_05, ProtocolVersions.MCP_2025_03_26);
return List.of(ProtocolVersions.MCP_2024_11_05, ProtocolVersions.MCP_2025_03_26,
ProtocolVersions.MCP_2025_06_18);
}

/**
Expand Down
3 changes: 2 additions & 1 deletion ...va/io/modelcontextprotocol/server/transport/WebFluxStreamableServerTransportProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,8 @@ private WebFluxStreamableServerTransportProvider(McpJsonMapper jsonMapper, Strin

@Override
public List<String> protocolVersions() {
return List.of(ProtocolVersions.MCP_2024_11_05, ProtocolVersions.MCP_2025_03_26);
return List.of(ProtocolVersions.MCP_2024_11_05, ProtocolVersions.MCP_2025_03_26,
ProtocolVersions.MCP_2025_06_18);
}

@Override
Expand Down
3 changes: 2 additions & 1 deletion ...ava/io/modelcontextprotocol/server/transport/WebMvcStreamableServerTransportProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,8 @@ private WebMvcStreamableServerTransportProvider(McpJsonMapper jsonMapper, String

@Override
public List<String> protocolVersions() {
return List.of(ProtocolVersions.MCP_2024_11_05, ProtocolVersions.MCP_2025_03_26);
return List.of(ProtocolVersions.MCP_2024_11_05, ProtocolVersions.MCP_2025_03_26,
ProtocolVersions.MCP_2025_06_18);
}

@Override
Expand Down