Merge branch 'main' into feat/tasks

Author: LucaButBoring

mcp-spring/mcp-spring-webflux/pom.xml

@@ -22,15 +22,10 @@
 	</scm>
 
 	<dependencies>
-        <dependency>
-            <groupId>io.modelcontextprotocol.sdk</groupId>
-            <artifactId>mcp-json-jackson2</artifactId>
-            <version>0.18.0-SNAPSHOT</version>
-        </dependency>
 
         <dependency>
 			<groupId>io.modelcontextprotocol.sdk</groupId>
-			<artifactId>mcp</artifactId>
+			<artifactId>mcp-core</artifactId>
 			<version>0.18.0-SNAPSHOT</version>
 		</dependency>
 
@@ -47,6 +42,13 @@
 			<version>${springframework.version}</version>
 		</dependency>
 
+		<dependency>
+			<groupId>io.modelcontextprotocol.sdk</groupId>
+			<artifactId>mcp-json-jackson2</artifactId>
+			<version>0.18.0-SNAPSHOT</version>
+			<scope>test</scope>
+		</dependency>
+
 		<dependency>
 			<groupId>io.projectreactor.netty</groupId>
 			<artifactId>reactor-netty-http</artifactId>

mcp-spring/mcp-spring-webflux/src/test/java/io/modelcontextprotocol/client/transport/WebFluxSseClientTransportTests.java

@@ -10,8 +10,9 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Function;
 
+import com.fasterxml.jackson.databind.json.JsonMapper;
 import io.modelcontextprotocol.json.McpJsonMapper;
-import io.modelcontextprotocol.json.jackson3.JacksonMcpJsonMapper;
+import io.modelcontextprotocol.json.jackson2.JacksonMcpJsonMapper;
 import io.modelcontextprotocol.spec.McpSchema;
 import io.modelcontextprotocol.spec.McpSchema.JSONRPCRequest;
 import org.junit.jupiter.api.AfterAll;
@@ -26,7 +27,6 @@
 import reactor.core.publisher.Mono;
 import reactor.core.publisher.Sinks;
 import reactor.test.StepVerifier;
-import tools.jackson.databind.json.JsonMapper;
 
 import org.springframework.http.codec.ServerSentEvent;
 import org.springframework.web.reactive.function.client.WebClient;

mcp-spring/mcp-spring-webmvc/pom.xml

@@ -22,15 +22,10 @@
 	</scm>
 
 	<dependencies>
-        <dependency>
-            <groupId>io.modelcontextprotocol.sdk</groupId>
-            <artifactId>mcp-json-jackson2</artifactId>
-            <version>0.18.0-SNAPSHOT</version>
-        </dependency>
 
         <dependency>
 			<groupId>io.modelcontextprotocol.sdk</groupId>
-			<artifactId>mcp</artifactId>
+			<artifactId>mcp-core</artifactId>
 			<version>0.18.0-SNAPSHOT</version>
 		</dependency>
 
@@ -54,6 +49,13 @@
 			<scope>test</scope>
 		</dependency>
 
+		<dependency>
+			<groupId>io.modelcontextprotocol.sdk</groupId>
+			<artifactId>mcp-json-jackson2</artifactId>
+			<version>0.18.0-SNAPSHOT</version>
+			<scope>test</scope>
+		</dependency>
+
 
 		<!-- The Spring Context is required due to the reactor-netty connector being dependant on
 		the Spring Lifecycle, as discussed here:

mcp-test/pom.xml

@@ -23,7 +23,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>io.modelcontextprotocol.sdk</groupId>
-			<artifactId>mcp</artifactId>
+			<artifactId>mcp-core</artifactId>
 			<version>0.18.0-SNAPSHOT</version>
 		</dependency>