Skip to content

Commit 0180bb5

Browse files
bilaloumehdibilaloumehdi
authored
Merge branch 'main' into fix/json-schema-spec-support
2 parents fc76143 + cbb235f commit 0180bb5

16 files changed

Lines changed: 886 additions & 234 deletions

File tree

‎conformance-tests/client-jdk-http-client/pom.xml‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>io.modelcontextprotocol.sdk</groupId>
88
<artifactId>conformance-tests</artifactId>
9-
<version>1.1.0-SNAPSHOT</version>
9+
<version>2.0.0-SNAPSHOT</version>
1010
</parent>
1111
<artifactId>client-jdk-http-client</artifactId>
1212
<packaging>jar</packaging>
@@ -16,19 +16,19 @@
1616

1717
<scm>
1818
<url>https://github.com/modelcontextprotocol/java-sdk</url>
19-
<connection>git://github.com/modelcontextprotocol/java-sdk.git</connection>
20-
<developerConnection>git@github.com/modelcontextprotocol/java-sdk.git</developerConnection>
19+
<connection>scm:git:git://github.com/modelcontextprotocol/java-sdk.git</connection>
20+
<developerConnection>scm:git:ssh://git@github.com/modelcontextprotocol/java-sdk.git</developerConnection>
2121
</scm>
2222

2323
<properties>
2424
<maven.deploy.skip>true</maven.deploy.skip>
2525
</properties>
26-
26+
2727
<dependencies>
2828
<dependency>
2929
<groupId>io.modelcontextprotocol.sdk</groupId>
3030
<artifactId>mcp</artifactId>
31-
<version>1.1.0-SNAPSHOT</version>
31+
<version>2.0.0-SNAPSHOT</version>
3232
</dependency>
3333

3434
<!-- Logging -->
@@ -57,7 +57,8 @@
5757
<transformers>
5858
<transformer
5959
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
60-
<mainClass>io.modelcontextprotocol.conformance.client.ConformanceJdkClientMcpClient</mainClass>
60+
<mainClass>
61+
io.modelcontextprotocol.conformance.client.ConformanceJdkClientMcpClient</mainClass>
6162
</transformer>
6263
<transformer
6364
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
@@ -79,4 +80,4 @@
7980
</plugins>
8081
</build>
8182

82-
</project>
83+
</project>

‎conformance-tests/client-spring-http-client/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>io.modelcontextprotocol.sdk</groupId>
88
<artifactId>conformance-tests</artifactId>
9-
<version>1.1.0-SNAPSHOT</version>
9+
<version>2.0.0-SNAPSHOT</version>
1010
</parent>
1111
<artifactId>client-spring-http-client</artifactId>
1212
<packaging>jar</packaging>
@@ -16,8 +16,8 @@
1616

1717
<scm>
1818
<url>https://github.com/modelcontextprotocol/java-sdk</url>
19-
<connection>git://github.com/modelcontextprotocol/java-sdk.git</connection>
20-
<developerConnection>git@github.com/modelcontextprotocol/java-sdk.git</developerConnection>
19+
<connection>scm:git:git://github.com/modelcontextprotocol/java-sdk.git</connection>
20+
<developerConnection>scm:git:ssh://git@github.com/modelcontextprotocol/java-sdk.git</developerConnection>
2121
</scm>
2222

2323
<properties>
@@ -106,4 +106,4 @@
106106
</repository>
107107
</repositories>
108108

109-
</project>
109+
</project>

‎conformance-tests/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>io.modelcontextprotocol.sdk</groupId>
88
<artifactId>mcp-parent</artifactId>
9-
<version>1.1.0-SNAPSHOT</version>
9+
<version>2.0.0-SNAPSHOT</version>
1010
</parent>
1111
<artifactId>conformance-tests</artifactId>
1212
<packaging>pom</packaging>
@@ -16,18 +16,18 @@
1616

1717
<scm>
1818
<url>https://github.com/modelcontextprotocol/java-sdk</url>
19-
<connection>git://github.com/modelcontextprotocol/java-sdk.git</connection>
20-
<developerConnection>git@github.com/modelcontextprotocol/java-sdk.git</developerConnection>
19+
<connection>scm:git:git://github.com/modelcontextprotocol/java-sdk.git</connection>
20+
<developerConnection>scm:git:ssh://git@github.com/modelcontextprotocol/java-sdk.git</developerConnection>
2121
</scm>
2222

2323
<properties>
2424
<maven.deploy.skip>true</maven.deploy.skip>
2525
</properties>
26-
26+
2727
<modules>
2828
<module>client-jdk-http-client</module>
2929
<module>client-spring-http-client</module>
3030
<module>server-servlet</module>
3131
</modules>
3232

33-
</project>
33+
</project>

‎conformance-tests/server-servlet/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>io.modelcontextprotocol.sdk</groupId>
88
<artifactId>conformance-tests</artifactId>
9-
<version>1.1.0-SNAPSHOT</version>
9+
<version>2.0.0-SNAPSHOT</version>
1010
</parent>
1111
<artifactId>server-servlet</artifactId>
1212
<packaging>jar</packaging>
@@ -16,8 +16,8 @@
1616

1717
<scm>
1818
<url>https://github.com/modelcontextprotocol/java-sdk</url>
19-
<connection>git://github.com/modelcontextprotocol/java-sdk.git</connection>
20-
<developerConnection>git@github.com/modelcontextprotocol/java-sdk.git</developerConnection>
19+
<connection>scm:git:git://github.com/modelcontextprotocol/java-sdk.git</connection>
20+
<developerConnection>scm:git:ssh://git@github.com/modelcontextprotocol/java-sdk.git</developerConnection>
2121
</scm>
2222

2323
<properties>
@@ -28,7 +28,7 @@
2828
<dependency>
2929
<groupId>io.modelcontextprotocol.sdk</groupId>
3030
<artifactId>mcp</artifactId>
31-
<version>1.1.0-SNAPSHOT</version>
31+
<version>2.0.0-SNAPSHOT</version>
3232
</dependency>
3333

3434
<dependency>

‎mcp-bom/pom.xml‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>io.modelcontextprotocol.sdk</groupId>
99
<artifactId>mcp-parent</artifactId>
10-
<version>1.1.0-SNAPSHOT</version>
10+
<version>2.0.0-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>mcp-bom</artifactId>
@@ -16,13 +16,13 @@
1616
<name>Java SDK MCP BOM</name>
1717
<description>Java SDK MCP Bill of Materials</description>
1818

19-
<url>https://github.com/modelcontextprotocol/java-sdk</url>
19+
<url>https://github.com/modelcontextprotocol/java-sdk</url>
2020

21-
<scm>
22-
<url>https://github.com/modelcontextprotocol/java-sdk</url>
23-
<connection>git://github.com/modelcontextprotocol/java-sdk.git</connection>
24-
<developerConnection>git@github.com/modelcontextprotocol/java-sdk.git</developerConnection>
25-
</scm>
21+
<scm>
22+
<url>https://github.com/modelcontextprotocol/java-sdk</url>
23+
<connection>scm:git:git://github.com/modelcontextprotocol/java-sdk.git</connection>
24+
<developerConnection>scm:git:ssh://git@github.com/modelcontextprotocol/java-sdk.git</developerConnection>
25+
</scm>
2626

2727
<dependencyManagement>
2828
<dependencies>
@@ -47,6 +47,13 @@
4747
<version>${project.version}</version>
4848
</dependency>
4949

50+
<!-- MCP JSON Jackson -->
51+
<dependency>
52+
<groupId>io.modelcontextprotocol.sdk</groupId>
53+
<artifactId>mcp-json-jackson3</artifactId>
54+
<version>${project.version}</version>
55+
</dependency>
56+
5057
<!-- MCP Test -->
5158
<dependency>
5259
<groupId>io.modelcontextprotocol.sdk</groupId>

‎mcp-core/pom.xml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>io.modelcontextprotocol.sdk</groupId>
88
<artifactId>mcp-parent</artifactId>
9-
<version>1.1.0-SNAPSHOT</version>
9+
<version>2.0.0-SNAPSHOT</version>
1010
</parent>
1111
<artifactId>mcp-core</artifactId>
1212
<packaging>jar</packaging>
@@ -16,8 +16,8 @@
1616

1717
<scm>
1818
<url>https://github.com/modelcontextprotocol/java-sdk</url>
19-
<connection>git://github.com/modelcontextprotocol/java-sdk.git</connection>
20-
<developerConnection>git@github.com/modelcontextprotocol/java-sdk.git</developerConnection>
19+
<connection>scm:git:git://github.com/modelcontextprotocol/java-sdk.git</connection>
20+
<developerConnection>scm:git:ssh://git@github.com/modelcontextprotocol/java-sdk.git</developerConnection>
2121
</scm>
2222

2323
<build>
@@ -164,14 +164,14 @@
164164
<scope>test</scope>
165165
</dependency>
166166

167-
<!-- Test-only JSON library for the Gson-based McpJsonMapper example -->
168-
<dependency>
169-
<groupId>com.google.code.gson</groupId>
170-
<artifactId>gson</artifactId>
171-
<version>2.10.1</version>
172-
<scope>test</scope>
173-
</dependency>
167+
<!-- Test-only JSON library for the Gson-based McpJsonMapper example -->
168+
<dependency>
169+
<groupId>com.google.code.gson</groupId>
170+
<artifactId>gson</artifactId>
171+
<version>2.10.1</version>
172+
<scope>test</scope>
173+
</dependency>
174174
</dependencies>
175175

176176

177-
</project>
177+
</project>

0 commit comments

Comments
 (0)