Fix: Upgrade MCP SDK to 1.1.0 (#26489)

* Fix: Upgrade MCP SDK to 1.1.0 to resolve elicitation deserialization crash

* Fix Jackson 2/3 conflict and duplicate MCP servlet registration

---------

Co-authored-by: Pere Miquel Brull <peremiquelbrull@gmail.com>
(cherry picked from commit 6c001cb)

Author: 2 people

openmetadata-mcp/pom.xml

@@ -59,7 +59,7 @@
     <dependencies>
         <dependency>
             <groupId>io.modelcontextprotocol.sdk</groupId>
-            <artifactId>mcp</artifactId>
+            <artifactId>mcp-core</artifactId>
         </dependency>
         <dependency>
             <groupId>io.modelcontextprotocol.sdk</groupId>

openmetadata-mcp/src/main/java/org/openmetadata/mcp/McpServer.java

@@ -2,7 +2,7 @@
 
 import io.dropwizard.core.setup.Environment;
 import io.dropwizard.jetty.MutableServletContextHandler;
-import io.modelcontextprotocol.json.jackson.JacksonMcpJsonMapper;
+import io.modelcontextprotocol.json.jackson2.JacksonMcpJsonMapper;
 import io.modelcontextprotocol.server.McpStatelessServerFeatures;
 import io.modelcontextprotocol.server.McpStatelessSyncServer;
 import io.modelcontextprotocol.server.transport.HttpServletStatelessServerTransport;
@@ -95,7 +95,7 @@ private void addStatelessTransport(
 
     McpStatelessSyncServer server =
         io.modelcontextprotocol.server.McpServer.sync(statelessTransport)
-            .serverInfo("openmetadata-mcp-stateless", "0.17.1")
+            .serverInfo("openmetadata-mcp-stateless", "1.1.0")
             .capabilities(serverCapabilities)
             .build();
     addToolsToServer(server, tools);

openmetadata-mcp/src/main/java/org/openmetadata/mcp/McpUtils.java

@@ -2,7 +2,7 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import io.modelcontextprotocol.json.McpJsonMapper;
-import io.modelcontextprotocol.json.jackson.JacksonMcpJsonMapper;
+import io.modelcontextprotocol.json.jackson2.JacksonMcpJsonMapper;
 import io.modelcontextprotocol.spec.McpSchema;
 import jakarta.servlet.http.HttpServletRequest;
 import java.io.BufferedReader;

openmetadata-mcp/src/test/java/org/openmetadata/mcp/McpSdkUpgradeTest.java

@@ -5,7 +5,7 @@
 import static org.mockito.Mockito.when;
 
 import io.modelcontextprotocol.common.McpTransportContext;
-import io.modelcontextprotocol.json.jackson.JacksonMcpJsonMapper;
+import io.modelcontextprotocol.json.jackson2.JacksonMcpJsonMapper;
 import io.modelcontextprotocol.spec.McpSchema;
 import jakarta.servlet.http.HttpServletRequest;
 import java.util.List;
@@ -14,8 +14,8 @@
 import org.openmetadata.schema.utils.JsonUtils;
 
 /**
- * Tests to verify the MCP SDK 0.17.0 upgrade works correctly. These tests validate the API changes
- * made during the upgrade from 0.11.2 to 0.17.0.
+ * Tests to verify the MCP SDK 1.1.0 upgrade works correctly. These tests validate the API changes
+ * made during the upgrade from 0.17.1 to 1.1.0.
  */
 public class McpSdkUpgradeTest {
 
@@ -189,6 +189,41 @@ void testServerCapabilitiesDoNotAdvertiseLogging() {
     assertThat(capabilities.logging()).isNull();
   }
 
+  @Test
+  void testElicitationCapabilitiesDeserialization() throws Exception {
+    // Regression test for https://github.com/open-metadata/OpenMetadata/issues/26454
+    // MCP clients implementing the 2025-11-25 spec send elicitation with form/url fields.
+    // SDK <= 0.17.1 threw UnrecognizedPropertyException crashing the handshake.
+    JacksonMcpJsonMapper jsonMapper = new JacksonMcpJsonMapper(JsonUtils.getObjectMapper());
+
+    String initRequest =
+        """
+        {
+          "jsonrpc": "2.0",
+          "id": 0,
+          "method": "initialize",
+          "params": {
+            "protocolVersion": "2025-11-25",
+            "capabilities": {
+              "roots": {},
+              "elicitation": {
+                "form": {},
+                "url": {}
+              }
+            },
+            "clientInfo": {"name": "claude-code", "version": "2.1.74"}
+          }
+        }
+        """;
+
+    McpSchema.JSONRPCMessage message = McpSchema.deserializeJsonRpcMessage(jsonMapper, initRequest);
+
+    assertThat(message).isNotNull();
+    assertThat(message).isInstanceOf(McpSchema.JSONRPCRequest.class);
+    McpSchema.JSONRPCRequest request = (McpSchema.JSONRPCRequest) message;
+    assertThat(request.method()).isEqualTo("initialize");
+  }
+
   @Test
   void testMcpUtilsGetPromptsLoadsPrompts() {
     // Test that McpUtils.getPrompts loads prompts from JSON file

openmetadata-service/pom.xml

@@ -769,15 +769,6 @@
       <artifactId>engine.io-server</artifactId>
       <version>6.2.1</version>
     </dependency>
-    <dependency>
-      <groupId>io.modelcontextprotocol.sdk</groupId>
-      <artifactId>mcp-bom</artifactId>
-      <type>pom</type>
-    </dependency>
-    <dependency>
-      <groupId>io.modelcontextprotocol.sdk</groupId>
-      <artifactId>mcp</artifactId>
-    </dependency>
     <!-- Jetty EE10 WebSocket dependencies for Jetty 12 / Dropwizard 5.0 -->
     <dependency>
       <groupId>org.eclipse.jetty.ee10.websocket</groupId>

openmetadata-service/src/main/java/org/openmetadata/service/OpenMetadataApplication.java

@@ -203,6 +203,7 @@ public class OpenMetadataApplication extends Application<OpenMetadataApplication
   protected Authorizer authorizer;
   private AuthenticatorHandler authenticatorHandler;
   protected Limits limits;
+  private volatile boolean mcpServerRegistered = false;
 
   protected Jdbi jdbi;
   private Environment environment;
@@ -401,12 +402,17 @@ public void run(OpenMetadataApplicationConfig catalogConfig, Environment environ
 
   protected void registerMCPServer(
       OpenMetadataApplicationConfig catalogConfig, Environment environment) {
+    if (mcpServerRegistered) {
+      LOG.info("MCP Server already registered, skipping");
+      return;
+    }
     try {
       if (ApplicationContext.getInstance().getAppIfExists("McpApplication") != null) {
         Class<?> mcpServerClass = Class.forName("org.openmetadata.mcp.McpServer");
         McpServerProvider mcpServer =
             (McpServerProvider) mcpServerClass.getDeclaredConstructor().newInstance();
         mcpServer.initializeMcpServer(environment, authorizer, limits, catalogConfig);
+        mcpServerRegistered = true;
         LOG.info("MCP Server registered successfully");
       }
     } catch (ClassNotFoundException ex) {

pom.xml

@@ -151,7 +151,7 @@
     <json-patch.version>1.13</json-patch.version>
     <jetty.version>12.1.6</jetty.version>
     <jakarta-el.version>5.0.0-M1</jakarta-el.version>
-    <mcp-sdk.version>0.17.1</mcp-sdk.version>
+    <mcp-sdk.version>1.1.0</mcp-sdk.version>
     <lettuce.version>6.7.1.RELEASE</lettuce.version>
     <flyway.version>9.22.3</flyway.version>
     <angus-mail.version>2.0.4</angus-mail.version>
@@ -247,7 +247,12 @@
       </dependency>
       <dependency>
         <groupId>io.modelcontextprotocol.sdk</groupId>
-        <artifactId>mcp</artifactId>
+        <artifactId>mcp-core</artifactId>
+        <version>${mcp-sdk.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>io.modelcontextprotocol.sdk</groupId>
+        <artifactId>mcp-json-jackson2</artifactId>
         <version>${mcp-sdk.version}</version>
       </dependency>
       <dependency>