From fa28d1cb89467f11ab0e55679f8c7181261a9239 Mon Sep 17 00:00:00 2001
From: He-Pin <hepin1989@gmail.com>
Date: Tue, 18 Nov 2025 19:34:11 +0800
Subject: [PATCH 1/2] chore: Extract McpSchema to a dedicated module

Signed-off-by: He-Pin <hepin1989@gmail.com>
---
 mcp-bom/pom.xml                               |  5 +++
 mcp-core/pom.xml                              |  6 ++-
 mcp-spec-schema/pom.xml                       | 39 +++++++++++++++++++
 .../modelcontextprotocol/spec/McpSchema.java  |  0
 .../spec/ProtocolVersions.java                |  0
 .../spec/package-info.java                    |  4 ++
 .../io/modelcontextprotocol/util/Assert.java  |  4 +-
 pom.xml                                       |  1 +
 8 files changed, 56 insertions(+), 3 deletions(-)
 create mode 100644 mcp-spec-schema/pom.xml
 rename {mcp-core => mcp-spec-schema}/src/main/java/io/modelcontextprotocol/spec/McpSchema.java (100%)
 rename {mcp-core => mcp-spec-schema}/src/main/java/io/modelcontextprotocol/spec/ProtocolVersions.java (100%)
 create mode 100644 mcp-spec-schema/src/main/java/io/modelcontextprotocol/spec/package-info.java
 rename {mcp-core => mcp-spec-schema}/src/main/java/io/modelcontextprotocol/util/Assert.java (98%)

diff --git a/mcp-bom/pom.xml b/mcp-bom/pom.xml
index b06baea81..680645a5d 100644
--- a/mcp-bom/pom.xml
+++ b/mcp-bom/pom.xml
@@ -27,6 +27,11 @@
     <dependencyManagement>
         <dependencies>
             <!-- Core MCP -->
+            <dependency>
+                <groupId>io.modelcontextprotocol.sdk</groupId>
+                <artifactId>mcp-spec-schema</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.modelcontextprotocol.sdk</groupId>
                 <artifactId>mcp-core</artifactId>
diff --git a/mcp-core/pom.xml b/mcp-core/pom.xml
index 39b4c9dc7..087ac7bdf 100644
--- a/mcp-core/pom.xml
+++ b/mcp-core/pom.xml
@@ -70,7 +70,11 @@
             <artifactId>mcp-json</artifactId>
             <version>0.17.0-SNAPSHOT</version>
         </dependency>
-
+        <dependency>
+            <groupId>io.modelcontextprotocol.sdk</groupId>
+            <artifactId>mcp-spec-schema</artifactId>
+            <version>0.17.0-SNAPSHOT</version>
+        </dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
diff --git a/mcp-spec-schema/pom.xml b/mcp-spec-schema/pom.xml
new file mode 100644
index 000000000..7b3873746
--- /dev/null
+++ b/mcp-spec-schema/pom.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.modelcontextprotocol.sdk</groupId>
+        <artifactId>mcp-parent</artifactId>
+        <version>0.17.0-SNAPSHOT</version>
+    </parent>
+
+    <groupId>io.modelcontextprotocol.sdk</groupId>
+    <artifactId>mcp-spec-schema</artifactId>
+    <version>0.17.0-SNAPSHOT</version>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.modelcontextprotocol.sdk</groupId>
+            <artifactId>mcp-json</artifactId>
+            <version>0.17.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>${slf4j-api.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jspecify</groupId>
+            <artifactId>jspecify</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+    </dependencies>
+</project>
\ No newline at end of file
diff --git a/mcp-core/src/main/java/io/modelcontextprotocol/spec/McpSchema.java b/mcp-spec-schema/src/main/java/io/modelcontextprotocol/spec/McpSchema.java
similarity index 100%
rename from mcp-core/src/main/java/io/modelcontextprotocol/spec/McpSchema.java
rename to mcp-spec-schema/src/main/java/io/modelcontextprotocol/spec/McpSchema.java
diff --git a/mcp-core/src/main/java/io/modelcontextprotocol/spec/ProtocolVersions.java b/mcp-spec-schema/src/main/java/io/modelcontextprotocol/spec/ProtocolVersions.java
similarity index 100%
rename from mcp-core/src/main/java/io/modelcontextprotocol/spec/ProtocolVersions.java
rename to mcp-spec-schema/src/main/java/io/modelcontextprotocol/spec/ProtocolVersions.java
diff --git a/mcp-spec-schema/src/main/java/io/modelcontextprotocol/spec/package-info.java b/mcp-spec-schema/src/main/java/io/modelcontextprotocol/spec/package-info.java
new file mode 100644
index 000000000..ad06a0790
--- /dev/null
+++ b/mcp-spec-schema/src/main/java/io/modelcontextprotocol/spec/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * The Model Context Protocol (MCP) specification package.
+ */
+package io.modelcontextprotocol.spec;
\ No newline at end of file
diff --git a/mcp-core/src/main/java/io/modelcontextprotocol/util/Assert.java b/mcp-spec-schema/src/main/java/io/modelcontextprotocol/util/Assert.java
similarity index 98%
rename from mcp-core/src/main/java/io/modelcontextprotocol/util/Assert.java
rename to mcp-spec-schema/src/main/java/io/modelcontextprotocol/util/Assert.java
index 1fa6b3058..85232d5b3 100644
--- a/mcp-core/src/main/java/io/modelcontextprotocol/util/Assert.java
+++ b/mcp-spec-schema/src/main/java/io/modelcontextprotocol/util/Assert.java
@@ -4,9 +4,9 @@
 
 package io.modelcontextprotocol.util;
 
-import java.util.Collection;
+import org.jspecify.annotations.Nullable;
 
-import reactor.util.annotation.Nullable;
+import java.util.Collection;
 
 /**
  * Assertion utility class that assists in validating arguments.
diff --git a/pom.xml b/pom.xml
index ca9ce7be4..2de069290 100644
--- a/pom.xml
+++ b/pom.xml
@@ -104,6 +104,7 @@
 		<module>mcp-bom</module>
 		<module>mcp</module>
         <module>mcp-core</module>
+        <module>mcp-spec-schema</module>
         <module>mcp-json-jackson2</module>
         <module>mcp-json</module>
 		<module>mcp-spring/mcp-spring-webflux</module>

From 003b82039e368cff56eaeaef48fe15654414b4ee Mon Sep 17 00:00:00 2001
From: He-Pin <hepin1989@gmail.com>
Date: Tue, 18 Nov 2025 19:36:43 +0800
Subject: [PATCH 2/2] .

Signed-off-by: He-Pin <hepin1989@gmail.com>
---
 mcp-spec-schema/pom.xml                                         | 2 +-
 .../main/java/io/modelcontextprotocol/spec/package-info.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mcp-spec-schema/pom.xml b/mcp-spec-schema/pom.xml
index 7b3873746..3c15f77ee 100644
--- a/mcp-spec-schema/pom.xml
+++ b/mcp-spec-schema/pom.xml
@@ -36,4 +36,4 @@
             <version>1.0.0</version>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/mcp-spec-schema/src/main/java/io/modelcontextprotocol/spec/package-info.java b/mcp-spec-schema/src/main/java/io/modelcontextprotocol/spec/package-info.java
index ad06a0790..899a7c1e8 100644
--- a/mcp-spec-schema/src/main/java/io/modelcontextprotocol/spec/package-info.java
+++ b/mcp-spec-schema/src/main/java/io/modelcontextprotocol/spec/package-info.java
@@ -1,4 +1,4 @@
 /**
  * The Model Context Protocol (MCP) specification package.
  */
-package io.modelcontextprotocol.spec;
\ No newline at end of file
+package io.modelcontextprotocol.spec;