diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f055b61a3..b808f7bd8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,7 @@ jobs: cache: 'maven' - name: Build - run: mvn verify + run: ./mvnw verify jackson2-tests: name: Jackson 2 Integration Tests @@ -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 diff --git a/.github/workflows/conformance.yml b/.github/workflows/conformance.yml index b7c7fae0d..9bffacdbb 100644 --- a/.github/workflows/conformance.yml +++ b/.github/workflows/conformance.yml @@ -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 @@ -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 @@ -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 diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 56b5a1207..710bc2668 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -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 diff --git a/.github/workflows/maven-central-release.yml b/.github/workflows/maven-central-release.yml index 9bee5b0d2..a0a8e59c7 100644 --- a/.github/workflows/maven-central-release.yml +++ b/.github/workflows/maven-central-release.yml @@ -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 }} diff --git a/.github/workflows/publish-snapshot.yml b/.github/workflows/publish-snapshot.yml index 9e7cca60a..03dd0af0f 100644 --- a/.github/workflows/publish-snapshot.yml +++ b/.github/workflows/publish-snapshot.yml @@ -30,10 +30,10 @@ 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: @@ -41,7 +41,7 @@ jobs: MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} MAVEN_GPG_PASSPHRASE: ${{ secrets.SIGNING_PASSPHRASE }} run: | - mvn \ + ./mvnw \ -Pjavadoc \ -Prelease \ --batch-mode \ @@ -49,4 +49,4 @@ jobs: -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 diff --git a/conformance-tests/client-jdk-http-client/pom.xml b/conformance-tests/client-jdk-http-client/pom.xml index 1d111dde2..8ff7788e4 100644 --- a/conformance-tests/client-jdk-http-client/pom.xml +++ b/conformance-tests/client-jdk-http-client/pom.xml @@ -6,7 +6,7 @@ io.modelcontextprotocol.sdk conformance-tests - 2.1.0-SNAPSHOT + 2.2.0-SNAPSHOT client-jdk-http-client jar @@ -29,7 +29,7 @@ io.modelcontextprotocol.sdk mcp - 2.1.0-SNAPSHOT + 2.2.0-SNAPSHOT diff --git a/conformance-tests/client-spring-http-client/pom.xml b/conformance-tests/client-spring-http-client/pom.xml index ccc721c1f..144fd1a6a 100644 --- a/conformance-tests/client-spring-http-client/pom.xml +++ b/conformance-tests/client-spring-http-client/pom.xml @@ -6,7 +6,7 @@ io.modelcontextprotocol.sdk conformance-tests - 2.1.0-SNAPSHOT + 2.2.0-SNAPSHOT client-spring-http-client jar diff --git a/conformance-tests/pom.xml b/conformance-tests/pom.xml index 7e411a21f..a050b8780 100644 --- a/conformance-tests/pom.xml +++ b/conformance-tests/pom.xml @@ -6,7 +6,7 @@ io.modelcontextprotocol.sdk mcp-parent - 2.1.0-SNAPSHOT + 2.2.0-SNAPSHOT conformance-tests pom diff --git a/conformance-tests/server-servlet/pom.xml b/conformance-tests/server-servlet/pom.xml index ce8f558e6..4b9c4e89e 100644 --- a/conformance-tests/server-servlet/pom.xml +++ b/conformance-tests/server-servlet/pom.xml @@ -6,7 +6,7 @@ io.modelcontextprotocol.sdk conformance-tests - 2.1.0-SNAPSHOT + 2.2.0-SNAPSHOT server-servlet jar @@ -29,7 +29,7 @@ io.modelcontextprotocol.sdk mcp - 2.1.0-SNAPSHOT + 2.2.0-SNAPSHOT diff --git a/docs/quickstart.md b/docs/quickstart.md index 02165029e..050563507 100644 --- a/docs/quickstart.md +++ b/docs/quickstart.md @@ -123,7 +123,7 @@ Add the BOM to your project: io.modelcontextprotocol.sdk mcp-bom - 2.0.0 + 2.1.0 pom import @@ -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") //... } ``` diff --git a/mcp-bom/pom.xml b/mcp-bom/pom.xml index 4ee9f55c9..55a4dcdb0 100644 --- a/mcp-bom/pom.xml +++ b/mcp-bom/pom.xml @@ -7,7 +7,7 @@ io.modelcontextprotocol.sdk mcp-parent - 2.1.0-SNAPSHOT + 2.2.0-SNAPSHOT mcp-bom diff --git a/mcp-core/pom.xml b/mcp-core/pom.xml index 79a417b69..b01c16410 100644 --- a/mcp-core/pom.xml +++ b/mcp-core/pom.xml @@ -6,7 +6,7 @@ io.modelcontextprotocol.sdk mcp-parent - 2.1.0-SNAPSHOT + 2.2.0-SNAPSHOT mcp-core jar diff --git a/mcp-json-jackson2/pom.xml b/mcp-json-jackson2/pom.xml index 5ccb32e9d..4ad85fdd7 100644 --- a/mcp-json-jackson2/pom.xml +++ b/mcp-json-jackson2/pom.xml @@ -6,7 +6,7 @@ io.modelcontextprotocol.sdk mcp-parent - 2.1.0-SNAPSHOT + 2.2.0-SNAPSHOT mcp-json-jackson2 jar @@ -78,7 +78,7 @@ io.modelcontextprotocol.sdk mcp-core - 2.1.0-SNAPSHOT + 2.2.0-SNAPSHOT com.networknt diff --git a/mcp-json-jackson3/pom.xml b/mcp-json-jackson3/pom.xml index 98ba82bab..cf00f08d1 100644 --- a/mcp-json-jackson3/pom.xml +++ b/mcp-json-jackson3/pom.xml @@ -6,7 +6,7 @@ io.modelcontextprotocol.sdk mcp-parent - 2.1.0-SNAPSHOT + 2.2.0-SNAPSHOT mcp-json-jackson3 jar @@ -72,7 +72,7 @@ io.modelcontextprotocol.sdk mcp-core - 2.1.0-SNAPSHOT + 2.2.0-SNAPSHOT tools.jackson.core diff --git a/mcp-test/pom.xml b/mcp-test/pom.xml index 6002b84ae..331d4bb18 100644 --- a/mcp-test/pom.xml +++ b/mcp-test/pom.xml @@ -6,7 +6,7 @@ io.modelcontextprotocol.sdk mcp-parent - 2.1.0-SNAPSHOT + 2.2.0-SNAPSHOT mcp-test jar @@ -28,7 +28,7 @@ io.modelcontextprotocol.sdk mcp-core - 2.1.0-SNAPSHOT + 2.2.0-SNAPSHOT @@ -163,7 +163,7 @@ io.modelcontextprotocol.sdk mcp-json-jackson3 - 2.1.0-SNAPSHOT + 2.2.0-SNAPSHOT test @@ -174,7 +174,7 @@ io.modelcontextprotocol.sdk mcp-json-jackson2 - 2.1.0-SNAPSHOT + 2.2.0-SNAPSHOT test diff --git a/mcp/pom.xml b/mcp/pom.xml index 5ae1301ae..b3e3cd9d4 100644 --- a/mcp/pom.xml +++ b/mcp/pom.xml @@ -6,7 +6,7 @@ io.modelcontextprotocol.sdk mcp-parent - 2.1.0-SNAPSHOT + 2.2.0-SNAPSHOT mcp jar @@ -49,13 +49,13 @@ io.modelcontextprotocol.sdk mcp-json-jackson3 - 2.1.0-SNAPSHOT + 2.2.0-SNAPSHOT io.modelcontextprotocol.sdk mcp-core - 2.1.0-SNAPSHOT + 2.2.0-SNAPSHOT diff --git a/mkdocs.yml b/mkdocs.yml index de3487e14..d2e57340a 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -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 diff --git a/pom.xml b/pom.xml index bdf0db889..f912f0ae1 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ io.modelcontextprotocol.sdk mcp-parent - 2.1.0-SNAPSHOT + 2.2.0-SNAPSHOT pom https://github.com/modelcontextprotocol/java-sdk