From d846f3af073f99f8ea350a7b1ac10bf5ebd533cc Mon Sep 17 00:00:00 2001
From: Daniel Garnier-Moiroux <git@garnier.wf>
Date: Wed, 16 Sep 2026 17:35:36 +0200
Subject: [PATCH] Fix Automatic-Module-Name without hypens

Signed-off-by: Daniel Garnier-Moiroux <git@garnier.wf>
---
 .../client-jdk-http-client/pom.xml            |  1 +
 .../client-spring-http-client/pom.xml         |  1 +
 conformance-tests/server-servlet/pom.xml      |  1 +
 mcp-core/pom.xml                              |  6 ++++-
 mcp-json-jackson2/pom.xml                     |  6 ++++-
 mcp-json-jackson3/pom.xml                     |  6 ++++-
 mcp-test/pom.xml                              |  4 +++
 mcp/pom.xml                                   | 24 ++++++++++++++++++
 mcp/src/main/java/module-info.java            | 25 +++++++++++++++++++
 pom.xml                                       |  5 ++++
 10 files changed, 76 insertions(+), 3 deletions(-)
 create mode 100644 mcp/src/main/java/module-info.java

diff --git a/conformance-tests/client-jdk-http-client/pom.xml b/conformance-tests/client-jdk-http-client/pom.xml
index de2075ace..1d111dde2 100644
--- a/conformance-tests/client-jdk-http-client/pom.xml
+++ b/conformance-tests/client-jdk-http-client/pom.xml
@@ -21,6 +21,7 @@
 	</scm>
 
 	<properties>
+		<module.name>io.modelcontextprotocol.sdk.conformance.client.jdk</module.name>
 		<maven.deploy.skip>true</maven.deploy.skip>
 	</properties>
 
diff --git a/conformance-tests/client-spring-http-client/pom.xml b/conformance-tests/client-spring-http-client/pom.xml
index 8bc74cc41..ccc721c1f 100644
--- a/conformance-tests/client-spring-http-client/pom.xml
+++ b/conformance-tests/client-spring-http-client/pom.xml
@@ -21,6 +21,7 @@
 	</scm>
 
 	<properties>
+		<module.name>io.modelcontextprotocol.sdk.conformance.client.spring</module.name>
 		<java.version>17</java.version>
 		<spring-boot.version>4.1.0</spring-boot.version>
 		<spring-ai.version>2.0.0</spring-ai.version>
diff --git a/conformance-tests/server-servlet/pom.xml b/conformance-tests/server-servlet/pom.xml
index cc8ebc364..ce8f558e6 100644
--- a/conformance-tests/server-servlet/pom.xml
+++ b/conformance-tests/server-servlet/pom.xml
@@ -21,6 +21,7 @@
 	</scm>
 
 	<properties>
+		<module.name>io.modelcontextprotocol.sdk.conformance.server.servlet</module.name>
 		<maven.deploy.skip>true</maven.deploy.skip>
 	</properties>
 
diff --git a/mcp-core/pom.xml b/mcp-core/pom.xml
index 20ebc75bf..79a417b69 100644
--- a/mcp-core/pom.xml
+++ b/mcp-core/pom.xml
@@ -20,6 +20,10 @@
 		<developerConnection>scm:git:ssh://git@github.com/modelcontextprotocol/java-sdk.git</developerConnection>
 	</scm>
 
+	<properties>
+		<module.name>io.modelcontextprotocol.sdk.mcp.core</module.name>
+	</properties>
+
 	<build>
 		<plugins>
 			<plugin>
@@ -37,7 +41,7 @@
 								Bundle-Name:            Bundle ${project.groupId} : ${project.artifactId}
 								Bundle-SymbolicName:    ${project.groupId}.${project.artifactId}
 								Bundle-Version:         ${project.version}
-								Automatic-Module-Name:  ${project.groupId}.${project.artifactId}
+								Automatic-Module-Name:  ${module.name}
 								Import-Package:         jakarta.*;resolution:=optional, \
 								                        *;
 								Service-Component: 		OSGI-INF/io.modelcontextprotocol.json.McpJsonDefaults.xml
diff --git a/mcp-json-jackson2/pom.xml b/mcp-json-jackson2/pom.xml
index ba10adeb4..5ccb32e9d 100644
--- a/mcp-json-jackson2/pom.xml
+++ b/mcp-json-jackson2/pom.xml
@@ -20,6 +20,10 @@
 		<developerConnection>scm:git:ssh://git@github.com/modelcontextprotocol/java-sdk.git</developerConnection>
 	</scm>
 
+	<properties>
+		<module.name>io.modelcontextprotocol.sdk.mcp.json.jackson2</module.name>
+	</properties>
+
 	<build>
 		<plugins>
 			<plugin>
@@ -37,7 +41,7 @@
 								Bundle-Name:            Bundle ${project.groupId} : ${project.artifactId}
 								Bundle-SymbolicName:    ${project.groupId}.${project.artifactId}
 								Bundle-Version:         ${project.version}
-								Automatic-Module-Name:  ${project.groupId}.${project.artifactId}
+								Automatic-Module-Name:  ${module.name}
 								Bundle-ActivationPolicy: lazy
 								Import-Package:         io.modelcontextprotocol.json,io.modelcontextprotocol.json.schema, \
 								                        *;
diff --git a/mcp-json-jackson3/pom.xml b/mcp-json-jackson3/pom.xml
index 50d4f230a..98ba82bab 100644
--- a/mcp-json-jackson3/pom.xml
+++ b/mcp-json-jackson3/pom.xml
@@ -20,6 +20,10 @@
 		<developerConnection>scm:git:ssh://git@github.com/modelcontextprotocol/java-sdk.git</developerConnection>
 	</scm>
 
+	<properties>
+		<module.name>io.modelcontextprotocol.sdk.mcp.json.jackson3</module.name>
+	</properties>
+
 	<build>
 		<plugins>
 			<plugin>
@@ -37,7 +41,7 @@
 								Bundle-Name:            Bundle ${project.groupId} : ${project.artifactId}
 								Bundle-SymbolicName:    ${project.groupId}.${project.artifactId}
 								Bundle-Version:         ${project.version}
-								Automatic-Module-Name:  ${project.groupId}.${project.artifactId}
+								Automatic-Module-Name:  ${module.name}
 								Bundle-ActivationPolicy: lazy
 								Import-Package:         io.modelcontextprotocol.json,io.modelcontextprotocol.json.schema, \
 								                        *;
diff --git a/mcp-test/pom.xml b/mcp-test/pom.xml
index 0322bf476..6002b84ae 100644
--- a/mcp-test/pom.xml
+++ b/mcp-test/pom.xml
@@ -20,6 +20,10 @@
 		<developerConnection>scm:git:ssh://git@github.com/modelcontextprotocol/java-sdk.git</developerConnection>
 	</scm>
 
+	<properties>
+		<module.name>io.modelcontextprotocol.sdk.mcp.test</module.name>
+	</properties>
+
 	<dependencies>
 		<dependency>
 			<groupId>io.modelcontextprotocol.sdk</groupId>
diff --git a/mcp/pom.xml b/mcp/pom.xml
index 790a100e4..5ae1301ae 100644
--- a/mcp/pom.xml
+++ b/mcp/pom.xml
@@ -20,6 +20,30 @@
 		<developerConnection>scm:git:ssh://git@github.com/modelcontextprotocol/java-sdk.git</developerConnection>
 	</scm>
 
+	<properties>
+		<module.name>io.modelcontextprotocol.sdk.mcp</module.name>
+	</properties>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<executions>
+					<!-- module-info.java refers to the sibling modules by their JPMS names, and
+					     those only exist once the siblings have been packaged as jars: before
+					     the package phase the reactor hands the compiler bare target/classes
+					     directories, which cannot be automatic modules. Compiling at
+					     prepare-package keeps `mvn test` working on the full reactor. -->
+					<execution>
+						<id>java-compile</id>
+						<phase>prepare-package</phase>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
 	<dependencies>
 
 		<dependency>
diff --git a/mcp/src/main/java/module-info.java b/mcp/src/main/java/module-info.java
new file mode 100644
index 000000000..51c6891b1
--- /dev/null
+++ b/mcp/src/main/java/module-info.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2026 - 2026 the original author or authors.
+ */
+
+/**
+ * Aggregator module for the Java MCP SDK. Carries no code of its own; it exists so that
+ * consumers can depend on the SDK with a single {@code requires} directive.
+ */
+module io.modelcontextprotocol.sdk.mcp {
+
+	requires transitive io.modelcontextprotocol.sdk.mcp.core;
+
+	requires transitive io.modelcontextprotocol.sdk.mcp.json.jackson3;
+
+	// mcp-core and mcp-json-jackson3 are automatic modules, so they cannot pull their
+	// own dependencies into the module graph. Requiring them here spares consumers from
+	// having to repeat these declarations. Drop this block once the SDK modules carry
+	// their own module descriptors.
+	requires org.slf4j;
+
+	requires tools.jackson.databind;
+
+	requires com.networknt.schema;
+
+}
diff --git a/pom.xml b/pom.xml
index f1ef7574e..bdf0db889 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,6 +59,10 @@
 		<maven.compiler.target>17</maven.compiler.target>
 		<surefireArgLine />
 
+		<!-- JPMS module name. Every module that produces a jar must override this;
+		     an empty value makes maven-jar-plugin fail, which is intentional. -->
+		<module.name />
+
 		<assert4j.version>3.27.6</assert4j.version>
 		<junit.version>6.0.2</junit.version>
 		<mockito.version>5.20.0</mockito.version>
@@ -207,6 +211,7 @@
 						<manifestEntries>
 							<Implementation-Title>${project.artifactId}</Implementation-Title>
 							<Implementation-Version>${project.version}</Implementation-Version>
+							<Automatic-Module-Name>${module.name}</Automatic-Module-Name>
 						</manifestEntries>
 					</archive>
 				</configuration>