Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -679,7 +679,7 @@ public static class Builder {
private Duration connectTimeout = Duration.ofSeconds(10);

private List<String> supportedProtocolVersions = List.of(ProtocolVersions.MCP_2025_03_26,
ProtocolVersions.MCP_2025_06_18, ProtocolVersions.MCP_2025_11_25);
ProtocolVersions.MCP_2025_06_18, ProtocolVersions.MCP_2025_11_25, ProtocolVersions.MCP_2026_07_28);

private McpHttpClientTransportAuthorizationErrorHandler authorizationErrorHandler = McpHttpClientTransportAuthorizationErrorHandler.NOOP;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -981,7 +981,7 @@ public void close() {
@Override
public List<String> protocolVersions() {
return List.of(ProtocolVersions.MCP_2025_03_26, ProtocolVersions.MCP_2025_06_18,
ProtocolVersions.MCP_2025_11_25);
ProtocolVersions.MCP_2025_11_25, ProtocolVersions.MCP_2026_07_28);
}

public static Builder builder() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ default void close() {
*/
default List<String> protocolVersions() {
return List.of(ProtocolVersions.MCP_2024_11_05, ProtocolVersions.MCP_2025_03_26,
ProtocolVersions.MCP_2025_06_18, ProtocolVersions.MCP_2025_11_25);
ProtocolVersions.MCP_2025_06_18, ProtocolVersions.MCP_2025_11_25, ProtocolVersions.MCP_2026_07_28);
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ default void close() {

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

}
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ static boolean isPeerClosed(Throwable t) {

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

}
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,10 @@ public interface ProtocolVersions {
*/
String MCP_2025_11_25 = "2025-11-25";

/**
* MCP protocol version for 2026-07-28.
* https://modelcontextprotocol.io/specification/2026-07-28
*/
String MCP_2026_07_28 = "2026-07-28";

}
Original file line number Diff line number Diff line change
Expand Up @@ -106,22 +106,22 @@ void usesLatestVersion() {
.hasSize(3)
.map(McpTestRequestRecordingServletFilter.Call::headers)
.allSatisfy(headers -> assertThat(headers).containsEntry("mcp-protocol-version",
ProtocolVersions.MCP_2025_11_25));
ProtocolVersions.MCP_2026_07_28));

assertThat(response).isNotNull();
assertThat(response.content()).hasSize(1)
.first()
.extracting(McpSchema.TextContent.class::cast)
.extracting(McpSchema.TextContent::text)
.isEqualTo(ProtocolVersions.MCP_2025_11_25);
.isEqualTo(ProtocolVersions.MCP_2026_07_28);
}

}

@Test
void usesServerSupportedVersion() {
var transport = HttpClientStreamableHttpTransport.builder("http://localhost:" + PORT)
.supportedProtocolVersions(List.of(ProtocolVersions.MCP_2025_11_25, "2263-03-18"))
.supportedProtocolVersions(List.of(ProtocolVersions.MCP_2026_07_28, "2263-03-18"))
.build();
try (var client = McpClient.sync(transport).build()) {
client.initialize();
Expand All @@ -137,14 +137,14 @@ void usesServerSupportedVersion() {
.hasSize(2)
.map(McpTestRequestRecordingServletFilter.Call::headers)
.allSatisfy(headers -> assertThat(headers).containsEntry("mcp-protocol-version",
ProtocolVersions.MCP_2025_11_25));
ProtocolVersions.MCP_2026_07_28));

assertThat(response).isNotNull();
assertThat(response.content()).hasSize(1)
.first()
.extracting(McpSchema.TextContent.class::cast)
.extracting(McpSchema.TextContent::text)
.isEqualTo(ProtocolVersions.MCP_2025_11_25);
.isEqualTo(ProtocolVersions.MCP_2026_07_28);
}
}

Expand All @@ -155,7 +155,7 @@ void clientDoesNotSupportProtocolVersion20241105ByDefault() {
// Testing it on the wire would require building a custom transport
// We trust the protocolVersions() accessor instead
assertThat(transport.protocolVersions()).containsExactly(ProtocolVersions.MCP_2025_03_26,
ProtocolVersions.MCP_2025_06_18, ProtocolVersions.MCP_2025_11_25);
ProtocolVersions.MCP_2025_06_18, ProtocolVersions.MCP_2025_11_25, ProtocolVersions.MCP_2026_07_28);
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ void shouldUseLatestVersionByDefault() {

String requestId = UUID.randomUUID().toString();

transportProvider.simulateIncomingMessage(jsonRpcInitializeRequest(requestId, ProtocolVersions.MCP_2025_11_25));
transportProvider.simulateIncomingMessage(jsonRpcInitializeRequest(requestId, ProtocolVersions.MCP_2026_07_28));

McpSchema.JSONRPCMessage response = serverTransport.getLastSentMessage();
assertThat(response).isInstanceOf(McpSchema.JSONRPCResponse.class);
Expand Down