Upgrade MCP Java SDK to 0.18.0-SNAPSHOT

Author: sdeleuze

mcp-annotations/src/main/java/org/springaicommunity/mcp/provider/tool/AbstractMcpToolProvider.java

@@ -3,6 +3,7 @@
 import java.lang.reflect.Method;
 import java.util.List;
 
+import io.modelcontextprotocol.json.McpJsonDefaults;
 import io.modelcontextprotocol.json.McpJsonMapper;
 import io.modelcontextprotocol.util.Assert;
 import org.springaicommunity.mcp.annotation.McpTool;
@@ -11,7 +12,7 @@ public abstract class AbstractMcpToolProvider {
 
 	protected final List<Object> toolObjects;
 
-	protected McpJsonMapper jsonMapper = McpJsonMapper.createDefault();
+	protected McpJsonMapper jsonMapper = McpJsonDefaults.getMapper();
 
 	public AbstractMcpToolProvider(List<Object> toolObjects) {
 		Assert.notNull(toolObjects, "toolObjects cannot be null");

mcp-annotations/src/test/java/org/springaicommunity/mcp/method/changed/tool/AsyncMcpToolListChangedMethodCallbackTests.java

@@ -13,7 +13,7 @@
 
 import org.junit.jupiter.api.Test;
 import org.springaicommunity.mcp.annotation.McpToolListChanged;
-import io.modelcontextprotocol.json.McpJsonMapper;
+import io.modelcontextprotocol.json.McpJsonDefaults;
 import io.modelcontextprotocol.spec.McpSchema;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
@@ -29,12 +29,12 @@ public class AsyncMcpToolListChangedMethodCallbackTests {
 			McpSchema.Tool.builder()
 				.name("test-tool-1")
 				.description("Test Tool 1")
-				.inputSchema(McpJsonMapper.createDefault(), "{}")
+				.inputSchema(McpJsonDefaults.getMapper(), "{}")
 				.build(),
 			McpSchema.Tool.builder()
 				.name("test-tool-2")
 				.description("Test Tool 2")
-				.inputSchema(McpJsonMapper.createDefault(), "{}")
+				.inputSchema(McpJsonDefaults.getMapper(), "{}")
 				.build());
 
 	/**

mcp-annotations/src/test/java/org/springaicommunity/mcp/method/changed/tool/SyncMcpToolListChangedMethodCallbackTests.java

@@ -13,7 +13,7 @@
 
 import org.junit.jupiter.api.Test;
 import org.springaicommunity.mcp.annotation.McpToolListChanged;
-import io.modelcontextprotocol.json.McpJsonMapper;
+import io.modelcontextprotocol.json.McpJsonDefaults;
 import io.modelcontextprotocol.spec.McpSchema;
 
 /**
@@ -27,12 +27,12 @@ public class SyncMcpToolListChangedMethodCallbackTests {
 			McpSchema.Tool.builder()
 				.name("test-tool-1")
 				.description("Test Tool 1")
-				.inputSchema(McpJsonMapper.createDefault(), "{}")
+				.inputSchema(McpJsonDefaults.getMapper(), "{}")
 				.build(),
 			McpSchema.Tool.builder()
 				.name("test-tool-2")
 				.description("Test Tool 2")
-				.inputSchema(McpJsonMapper.createDefault(), "{}")
+				.inputSchema(McpJsonDefaults.getMapper(), "{}")
 				.build());
 
 	/**

mcp-annotations/src/test/java/org/springaicommunity/mcp/provider/changed/tool/AsyncMcpToolListChangedProviderTests.java

@@ -13,7 +13,7 @@
 import org.junit.jupiter.api.Test;
 import org.springaicommunity.mcp.annotation.McpToolListChanged;
 import org.springaicommunity.mcp.method.changed.tool.AsyncToolListChangedSpecification;
-import io.modelcontextprotocol.json.McpJsonMapper;
+import io.modelcontextprotocol.json.McpJsonDefaults;
 import io.modelcontextprotocol.spec.McpSchema;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
@@ -29,12 +29,12 @@ public class AsyncMcpToolListChangedProviderTests {
 			McpSchema.Tool.builder()
 				.name("test-tool-1")
 				.description("Test Tool 1")
-				.inputSchema(McpJsonMapper.createDefault(), "{}")
+				.inputSchema(McpJsonDefaults.getMapper(), "{}")
 				.build(),
 			McpSchema.Tool.builder()
 				.name("test-tool-2")
 				.description("Test Tool 2")
-				.inputSchema(McpJsonMapper.createDefault(), "{}")
+				.inputSchema(McpJsonDefaults.getMapper(), "{}")
 				.build());
 
 	/**

mcp-annotations/src/test/java/org/springaicommunity/mcp/provider/changed/tool/SyncMcpToolListChangedProviderTests.java

@@ -13,7 +13,7 @@
 import org.junit.jupiter.api.Test;
 import org.springaicommunity.mcp.annotation.McpToolListChanged;
 import org.springaicommunity.mcp.method.changed.tool.SyncToolListChangedSpecification;
-import io.modelcontextprotocol.json.McpJsonMapper;
+import io.modelcontextprotocol.json.McpJsonDefaults;
 import io.modelcontextprotocol.spec.McpSchema;
 
 /**
@@ -27,12 +27,12 @@ public class SyncMcpToolListChangedProviderTests {
 			McpSchema.Tool.builder()
 				.name("test-tool-1")
 				.description("Test Tool 1")
-				.inputSchema(McpJsonMapper.createDefault(), "{}")
+				.inputSchema(McpJsonDefaults.getMapper(), "{}")
 				.build(),
 			McpSchema.Tool.builder()
 				.name("test-tool-2")
 				.description("Test Tool 2")
-				.inputSchema(McpJsonMapper.createDefault(), "{}")
+				.inputSchema(McpJsonDefaults.getMapper(), "{}")
 				.build());
 
 	/**

pom.xml

@@ -56,7 +56,7 @@
 		<maven.compiler.source>17</maven.compiler.source>
 		<maven.compiler.target>17</maven.compiler.target>
 
-		<mcp.java.sdk.version>0.17.0</mcp.java.sdk.version>
+		<mcp.java.sdk.version>0.18.0-SNAPSHOT</mcp.java.sdk.version>
 
 		<jsonschema.version>4.38.0</jsonschema.version>
 		<swagger-annotations.version>2.2.36</swagger-annotations.version>
@@ -354,7 +354,7 @@
 				<enabled>true</enabled>
 			</releases>
 		</repository>
-		<!-- <repository>
+		<repository>
 			<id>spring-snapshots</id>
 			<name>Spring Snapshots</name>
 			<url>https://repo.spring.io/snapshot</url>
@@ -372,7 +372,7 @@
 			<snapshots>
 				<enabled>true</enabled>
 			</snapshots>
-		</repository> -->
+		</repository>
 	</repositories>
 
 </project>