Commit d18d478
committed
Merge branch 'refs/heads/main' into fix/non-blocking-context
# Conflicts:
# mcp-test/src/main/java/io/modelcontextprotocol/client/AbstractMcpAsyncClientTests.java
# mcp/src/main/java/io/modelcontextprotocol/client/McpAsyncClient.java
# mcp/src/test/java/io/modelcontextprotocol/client/AbstractMcpAsyncClientTests.javaFile tree
26 files changed
+752
-631
lines changed- mcp-spring
- mcp-spring-webflux/src
- main/java/io/modelcontextprotocol/server/transport
- test/java/io/modelcontextprotocol
- mcp-spring-webmvc/src
- main/java/io/modelcontextprotocol/server/transport
- test/java/io/modelcontextprotocol/server
- mcp-test/src/main/java/io/modelcontextprotocol
- client
- server
- mcp/src
- main/java/io/modelcontextprotocol
- client
- server
- transport
- spec
- test/java/io/modelcontextprotocol
- client
- server
- transport
26 files changed
+752
-631
lines changedLines changed: 6 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
188 | 188 | | |
189 | 189 | | |
190 | 190 | | |
191 | | - | |
| 191 | + | |
192 | 192 | | |
193 | 193 | | |
194 | 194 | | |
| |||
306 | 306 | | |
307 | 307 | | |
308 | 308 | | |
| 309 | + | |
| 310 | + | |
| 311 | + | |
| 312 | + | |
| 313 | + | |
309 | 314 | | |
310 | 315 | | |
311 | 316 | | |
| |||
0 commit comments