Commit 4de7f55
committed
Merge branch 'main' into feat/findAvailablePort
# Conflicts:
# mcp-spring/mcp-spring-webflux/src/test/java/io/modelcontextprotocol/WebFluxSseIntegrationTests.java
# mcp/src/test/java/io/modelcontextprotocol/server/transport/HttpServletSseServerTransportProviderIntegrationTests.javaFile tree
18 files changed
+726
-607
lines changed- mcp-spring
- mcp-spring-webflux/src
- main/java/io/modelcontextprotocol/server/transport
- test/java/io/modelcontextprotocol
- mcp-spring-webmvc/src/test/java/io/modelcontextprotocol/server
- mcp-test/src/main/java/io/modelcontextprotocol
- client
- server
- mcp/src
- main/java/io/modelcontextprotocol
- client
- server
- spec
- test/java/io/modelcontextprotocol
- client
- server
- transport
18 files changed
+726
-607
lines changedLines changed: 5 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
306 | 306 | | |
307 | 307 | | |
308 | 308 | | |
| 309 | + | |
| 310 | + | |
| 311 | + | |
| 312 | + | |
| 313 | + | |
309 | 314 | | |
310 | 315 | | |
311 | 316 | | |
| |||
0 commit comments