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 @@ + + io.modelcontextprotocol.sdk + mcp-spec-schema + ${project.version} + io.modelcontextprotocol.sdk mcp-core 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 @@ mcp-json 0.17.0-SNAPSHOT - + + io.modelcontextprotocol.sdk + mcp-spec-schema + 0.17.0-SNAPSHOT + org.slf4j slf4j-api diff --git a/mcp-spec-schema/pom.xml b/mcp-spec-schema/pom.xml new file mode 100644 index 000000000..3c15f77ee --- /dev/null +++ b/mcp-spec-schema/pom.xml @@ -0,0 +1,39 @@ + + + 4.0.0 + + + io.modelcontextprotocol.sdk + mcp-parent + 0.17.0-SNAPSHOT + + + io.modelcontextprotocol.sdk + mcp-spec-schema + 0.17.0-SNAPSHOT + + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson.version} + + + io.modelcontextprotocol.sdk + mcp-json + 0.17.0-SNAPSHOT + + + org.slf4j + slf4j-api + ${slf4j-api.version} + + + org.jspecify + jspecify + 1.0.0 + + + 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..899a7c1e8 --- /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; 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 @@ mcp-bom mcp mcp-core + mcp-spec-schema mcp-json-jackson2 mcp-json mcp-spring/mcp-spring-webflux