Skip to content

Forward port 2.1.x main #1188

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Kehrlann merged 4 commits into from
Oct 15, 2026
+42 −36
Merged

Forward port 2.1.x main #1188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
47da1ad
Release version 2.1.0
Kehrlann Oct 15, 2026
1078d36
Exclude conformance tests from the Maven Central release build
Kehrlann Oct 15, 2026
53574e2
Use the Maven wrapper in all GitHub workflows
Kehrlann Oct 15, 2026
05d6ebf
Next development version
Kehrlann Oct 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
cache: 'maven'

- name: Build
run: mvn verify
run: ./mvnw verify

jackson2-tests:
name: Jackson 2 Integration Tests
Expand All @@ -37,4 +37,4 @@ jobs:
cache: 'maven'

- name: Jackson 2 Integration Tests
run: mvn -pl mcp-test -am -Pjackson2 test
run: ./mvnw -pl mcp-test -am -Pjackson2 test
8 changes: 4 additions & 4 deletions .github/workflows/conformance.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ jobs:

- name: Build and start server
run: |
mvn clean install -DskipTests
mvn exec:java -pl conformance-tests/server-servlet -Dexec.mainClass="io.modelcontextprotocol.conformance.server.ConformanceServlet" &
./mvnw clean install -DskipTests
./mvnw exec:java -pl conformance-tests/server-servlet -Dexec.mainClass="io.modelcontextprotocol.conformance.server.ConformanceServlet" &
timeout 30 bash -c 'until curl -s http://localhost:8080/mcp > /dev/null 2>&1; do sleep 0.5; done'

- name: Run conformance tests
Expand Down Expand Up @@ -51,7 +51,7 @@ jobs:
cache: 'maven'

- name: Build client
run: mvn clean install -DskipTests
run: ./mvnw clean install -DskipTests

- name: Run conformance test
uses: modelcontextprotocol/conformance@v0.1.16
Expand Down Expand Up @@ -92,7 +92,7 @@ jobs:
cache: 'maven'

- name: Build client
run: mvn clean install -DskipTests
run: ./mvnw clean install -DskipTests

- name: Run conformance test
uses: modelcontextprotocol/conformance@v0.1.16
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
- name: Deploy docs (push to main)
if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
run: |
PROJECT_VERSION=$(mvn help:evaluate -Dexpression=project.version --quiet -DforceStdout)
PROJECT_VERSION=$(./mvnw help:evaluate -Dexpression=project.version --quiet -DforceStdout)
if [[ "${PROJECT_VERSION}" == *-SNAPSHOT ]]; then
ALIAS="latest-snapshot"
else
Expand Down
10 changes: 8 additions & 2 deletions .github/workflows/maven-central-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,20 @@ jobs:
# Deploy runs the integration tests, but only with Jackson 3
# We run Jackson 2 IT manually
- name: Jackson 2 Integration Tests
run: mvn -pl mcp-test -am -Pjackson2 test
run: ./mvnw -pl mcp-test -am -Pjackson2 test

# Deploy runs all previous maven goals, including test and verify
# Conformance tests are not published, and they break javadoc:aggregate: its forked
# compile lifecycle never produces mcp classes (compiled at prepare-package), so their
# dependency on mcp falls back to Maven Central, where the release does not exist yet.
# Use the wrapper (Maven 3.9.x): with Maven 3.10, central-publishing 0.7.0 leaves
# maven-metadata-local.xml files in the bundle, and Central rejects it.
- name: Publish to Maven Central
run: |
mvn --batch-mode \
./mvnw --batch-mode \
-Prelease \
-Pjavadoc \
-pl '!conformance-tests,!conformance-tests/client-jdk-http-client,!conformance-tests/client-spring-http-client,!conformance-tests/server-servlet' \
clean deploy
env:
MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/publish-snapshot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,23 +30,23 @@ jobs:
node-version: '20'

- name: Generate Java docs
run: mvn -Pjavadoc -B javadoc:aggregate
run: ./mvnw -Pjavadoc -B javadoc:aggregate

- name: Jackson 2 Integration Tests
run: mvn -pl mcp-test -am -Pjackson2 test
run: ./mvnw -pl mcp-test -am -Pjackson2 test

- name: Build with Maven and deploy to Sonatype snapshot repository
env:
MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
MAVEN_GPG_PASSPHRASE: ${{ secrets.SIGNING_PASSPHRASE }}
run: |
mvn \
./mvnw \
-Pjavadoc \
-Prelease \
--batch-mode \
--update-snapshots deploy \
-Dmaven.repository.credentialScope=id

- name: Capture project version
run: echo PROJECT_VERSION=$(mvn help:evaluate -Dexpression=project.version --quiet -DforceStdout) >> $GITHUB_ENV
run: echo PROJECT_VERSION=$(./mvnw help:evaluate -Dexpression=project.version --quiet -DforceStdout) >> $GITHUB_ENV
4 changes: 2 additions & 2 deletions conformance-tests/client-jdk-http-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.modelcontextprotocol.sdk</groupId>
<artifactId>conformance-tests</artifactId>
<version>2.1.0-SNAPSHOT</version>
<version>2.2.0-SNAPSHOT</version>
</parent>
<artifactId>client-jdk-http-client</artifactId>
<packaging>jar</packaging>
Expand All @@ -29,7 +29,7 @@
<dependency>
<groupId>io.modelcontextprotocol.sdk</groupId>
<artifactId>mcp</artifactId>
<version>2.1.0-SNAPSHOT</version>
<version>2.2.0-SNAPSHOT</version>
</dependency>

<!-- Logging -->
Expand Down
2 changes: 1 addition & 1 deletion conformance-tests/client-spring-http-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.modelcontextprotocol.sdk</groupId>
<artifactId>conformance-tests</artifactId>
<version>2.1.0-SNAPSHOT</version>
<version>2.2.0-SNAPSHOT</version>
</parent>
<artifactId>client-spring-http-client</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion conformance-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.modelcontextprotocol.sdk</groupId>
<artifactId>mcp-parent</artifactId>
<version>2.1.0-SNAPSHOT</version>
<version>2.2.0-SNAPSHOT</version>
</parent>
<artifactId>conformance-tests</artifactId>
<packaging>pom</packaging>
Expand Down
4 changes: 2 additions & 2 deletions conformance-tests/server-servlet/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.modelcontextprotocol.sdk</groupId>
<artifactId>conformance-tests</artifactId>
<version>2.1.0-SNAPSHOT</version>
<version>2.2.0-SNAPSHOT</version>
</parent>
<artifactId>server-servlet</artifactId>
<packaging>jar</packaging>
Expand All @@ -29,7 +29,7 @@
<dependency>
<groupId>io.modelcontextprotocol.sdk</groupId>
<artifactId>mcp</artifactId>
<version>2.1.0-SNAPSHOT</version>
<version>2.2.0-SNAPSHOT</version>
</dependency>

<dependency>
Expand Down
4 changes: 2 additions & 2 deletions docs/quickstart.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ Add the BOM to your project:
<dependency>
<groupId>io.modelcontextprotocol.sdk</groupId>
<artifactId>mcp-bom</artifactId>
<version>2.0.0</version>
<version>2.1.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand All @@ -135,7 +135,7 @@ Add the BOM to your project:

```groovy
dependencies {
implementation platform("io.modelcontextprotocol.sdk:mcp-bom:2.0.0")
implementation platform("io.modelcontextprotocol.sdk:mcp-bom:2.1.0")
//...
}
```
Expand Down
2 changes: 1 addition & 1 deletion mcp-bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>io.modelcontextprotocol.sdk</groupId>
<artifactId>mcp-parent</artifactId>
<version>2.1.0-SNAPSHOT</version>
<version>2.2.0-SNAPSHOT</version>
</parent>

<artifactId>mcp-bom</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion mcp-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.modelcontextprotocol.sdk</groupId>
<artifactId>mcp-parent</artifactId>
<version>2.1.0-SNAPSHOT</version>
<version>2.2.0-SNAPSHOT</version>
</parent>
<artifactId>mcp-core</artifactId>
<packaging>jar</packaging>
Expand Down
4 changes: 2 additions & 2 deletions mcp-json-jackson2/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.modelcontextprotocol.sdk</groupId>
<artifactId>mcp-parent</artifactId>
<version>2.1.0-SNAPSHOT</version>
<version>2.2.0-SNAPSHOT</version>
</parent>
<artifactId>mcp-json-jackson2</artifactId>
<packaging>jar</packaging>
Expand Down Expand Up @@ -78,7 +78,7 @@
<dependency>
<groupId>io.modelcontextprotocol.sdk</groupId>
<artifactId>mcp-core</artifactId>
<version>2.1.0-SNAPSHOT</version>
<version>2.2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.networknt</groupId>
Expand Down
4 changes: 2 additions & 2 deletions mcp-json-jackson3/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.modelcontextprotocol.sdk</groupId>
<artifactId>mcp-parent</artifactId>
<version>2.1.0-SNAPSHOT</version>
<version>2.2.0-SNAPSHOT</version>
</parent>
<artifactId>mcp-json-jackson3</artifactId>
<packaging>jar</packaging>
Expand Down Expand Up @@ -72,7 +72,7 @@
<dependency>
<groupId>io.modelcontextprotocol.sdk</groupId>
<artifactId>mcp-core</artifactId>
<version>2.1.0-SNAPSHOT</version>
<version>2.2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>tools.jackson.core</groupId>
Expand Down
8 changes: 4 additions & 4 deletions mcp-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.modelcontextprotocol.sdk</groupId>
<artifactId>mcp-parent</artifactId>
<version>2.1.0-SNAPSHOT</version>
<version>2.2.0-SNAPSHOT</version>
</parent>
<artifactId>mcp-test</artifactId>
<packaging>jar</packaging>
Expand All @@ -28,7 +28,7 @@
<dependency>
<groupId>io.modelcontextprotocol.sdk</groupId>
<artifactId>mcp-core</artifactId>
<version>2.1.0-SNAPSHOT</version>
<version>2.2.0-SNAPSHOT</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -163,7 +163,7 @@
<dependency>
<groupId>io.modelcontextprotocol.sdk</groupId>
<artifactId>mcp-json-jackson3</artifactId>
<version>2.1.0-SNAPSHOT</version>
<version>2.2.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand All @@ -174,7 +174,7 @@
<dependency>
<groupId>io.modelcontextprotocol.sdk</groupId>
<artifactId>mcp-json-jackson2</artifactId>
<version>2.1.0-SNAPSHOT</version>
<version>2.2.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
6 changes: 3 additions & 3 deletions mcp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.modelcontextprotocol.sdk</groupId>
<artifactId>mcp-parent</artifactId>
<version>2.1.0-SNAPSHOT</version>
<version>2.2.0-SNAPSHOT</version>
</parent>
<artifactId>mcp</artifactId>
<packaging>jar</packaging>
Expand Down Expand Up @@ -49,13 +49,13 @@
<dependency>
<groupId>io.modelcontextprotocol.sdk</groupId>
<artifactId>mcp-json-jackson3</artifactId>
<version>2.1.0-SNAPSHOT</version>
<version>2.2.0-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>io.modelcontextprotocol.sdk</groupId>
<artifactId>mcp-core</artifactId>
<version>2.1.0-SNAPSHOT</version>
<version>2.2.0-SNAPSHOT</version>
</dependency>
</dependencies>

Expand Down
2 changes: 1 addition & 1 deletion mkdocs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ nav:
- Contributing:
- Contributing Guide: contribute.md
- Documentation: development.md
- API Reference: https://javadoc.io/doc/io.modelcontextprotocol.sdk/mcp-core/2.0.1
- API Reference: https://javadoc.io/doc/io.modelcontextprotocol.sdk/mcp-core/2.1.0

markdown_extensions:
- admonition
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>io.modelcontextprotocol.sdk</groupId>
<artifactId>mcp-parent</artifactId>
<version>2.1.0-SNAPSHOT</version>
<version>2.2.0-SNAPSHOT</version>

<packaging>pom</packaging>
<url>https://github.com/modelcontextprotocol/java-sdk</url>
Expand Down
Loading