bump main (dont merge)

.github/ISSUE_TEMPLATE/bug_report.md

@@ -2,7 +2,7 @@
 name: Bug report
 about: Create a bug report to help us improve the project
 title: ''
-labels: 'type: bug, status: waiting-for-triage'
+labels: status/waiting for triage
 assignees: ''
 
 ---

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +1,5 @@
 blank_issues_enabled: false
 contact_links:
   - name: Questions and Community Support
-    url: https://stackoverflow.com/questions/tagged/spring-ai-mcp
-    about: Please ask and answer questions on StackOverflow with the spring-ai tag
+    url: https://stackoverflow.com/questions/tagged/mcp-java-sdk
+    about: Please ask and answer questions on StackOverflow with the mcp-java-sdk tag

.github/ISSUE_TEMPLATE/feature_request.md

@@ -2,7 +2,7 @@
 name: Feature request
 about: Suggest an idea for this project
 title: ''
-labels: 'status: waiting-for-triage, type: feature'
+labels: status/waiting for triage
 assignees: ''
 
 ---

.github/ISSUE_TEMPLATE/miscellaneous.md

@@ -2,7 +2,7 @@
 name: Miscellaneous
 about: Suggest an improvement for this project
 title: ''
-labels: 'status: waiting-for-triage'
+labels: status/waiting for triage
 assignees: ''
 
 ---

.github/dependabot.yml

@@ -0,0 +1,22 @@
+version: 2
+updates:
+    - package-ecosystem: 'github-actions'
+      directory: '/'
+      schedule:
+          interval: monthly
+    - package-ecosystem: 'maven'
+      directory: '/'
+      schedule:
+          interval: monthly
+      open-pull-requests-limit: 10
+      ignore:
+          # Freeze production dependencies of mcp-core
+          - dependency-name: 'org.slf4j:slf4j-api'
+          - dependency-name: 'com.fasterxml.jackson.core:jackson-annotations'
+          - dependency-name: 'tools.jackson.core:jackson-databind'
+          - dependency-name: 'io.projectreactor:reactor-bom'
+          - dependency-name: 'io.projectreactor:reactor-core'
+          - dependency-name: 'jakarta.servlet:jakarta.servlet-api'
+          # mcp-json-jackson2 and mcp-json-jackson3 dependencies
+          - dependency-name: 'com.fasterxml.jackson.core:jackson-databind'
+          - dependency-name: 'com.networknt:json-schema-validator'

.github/workflows/ci.yml

@@ -1,11 +1,12 @@
 name: CI
 
 on:
+  push:
   pull_request: {}
 
 jobs:
   build:
-    name: Build branch
+    name: Build and Test
     runs-on: ubuntu-latest
     steps:
       - name: Checkout source code
@@ -18,5 +19,25 @@ jobs:
           distribution: 'temurin'
           cache: 'maven'
 
+      - name: Verify Docker
+        run: docker info
+
       - name: Build
         run: mvn verify
+
+  jackson2-tests:
+    name: Jackson 2 Integration Tests
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout source code
+        uses: actions/checkout@v4
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+          cache: 'maven'
+
+      - name: Jackson 2 Integration Tests
+        run: mvn -pl mcp-test -am -Pjackson2 test

.github/workflows/conformance.yml

@@ -0,0 +1,104 @@
+name: Conformance Tests
+
+on:
+  pull_request: {}
+  push:
+    branches: [main]
+  workflow_dispatch:
+
+jobs:
+  server:
+    name: Server Conformance
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+          cache: 'maven'
+
+      - 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" &
+          timeout 30 bash -c 'until curl -s http://localhost:8080/mcp > /dev/null 2>&1; do sleep 0.5; done'
+
+      - name: Run conformance tests
+        uses: modelcontextprotocol/conformance@v0.1.11
+        with:
+          mode: server
+          url: http://localhost:8080/mcp
+          suite: active
+          expected-failures: ./conformance-tests/conformance-baseline.yml
+
+  client:
+    name: Client Conformance
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        scenario: [initialize, tools_call, elicitation-sep1034-client-defaults, sse-retry]
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+          cache: 'maven'
+
+      - name: Build client
+        run: mvn clean install -DskipTests
+
+      - name: Run conformance test
+        uses: modelcontextprotocol/conformance@v0.1.11
+        with:
+          mode: client
+          command: 'java -jar conformance-tests/client-jdk-http-client/target/client-jdk-http-client-*-SNAPSHOT.jar'
+          scenario: ${{ matrix.scenario }}
+          expected-failures: ./conformance-tests/conformance-baseline.yml
+
+  auth:
+    name: Auth Conformance
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        scenario:
+        - auth/metadata-default
+        - auth/metadata-var1
+        - auth/metadata-var2
+        - auth/metadata-var3
+        - auth/basic-cimd
+        - auth/scope-from-www-authenticate
+        - auth/scope-from-scopes-supported
+        - auth/scope-omitted-when-undefined
+        - auth/scope-step-up
+        - auth/scope-retry-limit
+        - auth/token-endpoint-auth-basic
+        - auth/token-endpoint-auth-post
+        - auth/token-endpoint-auth-none
+        - auth/pre-registration
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+          cache: 'maven'
+
+      - name: Build client
+        run: mvn clean install -DskipTests
+
+      - name: Run conformance test
+        uses: modelcontextprotocol/conformance@v0.1.15
+        with:
+          node-version: '22' # see https://github.com/modelcontextprotocol/conformance/pull/162
+          mode: client
+          command: 'java -jar conformance-tests/client-spring-http-client/target/client-spring-http-client-*-SNAPSHOT.jar'
+          scenario: ${{ matrix.scenario }}
+          expected-failures: ./conformance-tests/conformance-baseline.yml

.github/workflows/docs.yml

@@ -0,0 +1,54 @@
+name: Deploy Documentation
+
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - 'docs/**'
+      - 'mkdocs.yml'
+  release:
+    types:
+      - published
+  workflow_dispatch:
+
+permissions:
+  contents: write
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - uses: actions/setup-python@v5
+        with:
+          python-version: 3.x
+
+      - run: pip install mkdocs-material mike
+
+      - name: Configure git user
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+
+      - 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)
+          if [[ "${PROJECT_VERSION}" == *-SNAPSHOT ]]; then
+            ALIAS="latest-snapshot"
+          else
+            ALIAS="latest"
+          fi
+          mike deploy --push --update-aliases "${PROJECT_VERSION}" "${ALIAS}"
+          mike set-default latest --push
+
+      - name: Deploy versioned docs (release)
+        if: github.event_name == 'release'
+        run: |
+          VERSION=${GITHUB_REF_NAME}
+          mike deploy --push --update-aliases "${VERSION}" latest
+          mike set-default latest --push

.github/workflows/maven-central-release.yml

@@ -1,41 +1,41 @@
-name: Release to Maven Central
+name: Publish package to GitHub Packages
 
 on:
   workflow_dispatch:
+    inputs:
+      version:
+        description: 'Version'
+        required: true
+        type: string
+  workflow_call:
+    inputs:
+      version:
+        description: 'Version'
+        required: true
+        type: string
+env:
+  RELEASE_VERSION: ${{ inputs.version }}
 
 jobs:
   publish:
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
     steps:
       - uses: actions/checkout@v4
-
-      - name: Set up Java
+      - name: Set up Java for publishing to GitHub Packages
         uses: actions/setup-java@v4
         with:
           java-version: '17'
           distribution: 'temurin'
-          cache: 'maven'
-          server-id: central
-          server-username: MAVEN_USERNAME
-          server-password: MAVEN_PASSWORD
-          gpg-private-key: ${{ secrets.GPG_SECRET_KEY }}
-          gpg-passphrase: MAVEN_GPG_PASSPHRASE
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: '20'
-
-      - name: Build and Test
-        run: mvn clean verify
-
-      - name: Publish to Maven Central
-        run: |
-          mvn --batch-mode \
-            -Prelease \
-            -Pjavadoc \
-            deploy
+#      - name: Setup Node.js
+#        uses: actions/setup-node@v4
+#        with:
+#          node-version: '20'
+#      - name: Build and Test
+#        run: mvn clean verify
+      - name: Publish to GitHub Packages
+        run: mvn -X -Drevision=${RELEASE_VERSION} -DskipTests --batch-mode deploy
         env:
-          MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
-          MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
-          MAVEN_GPG_PASSPHRASE: ${{ secrets.SIGNING_PASSPHRASE }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -10,6 +10,7 @@ build/
 out
 /.gradletasknamecache
 **/*.flattened-pom.xml
+**/dependency-reduced-pom.xml
 
 ### IDE - Eclipse/STS ###
 .apt_generated
@@ -56,6 +57,9 @@ node_modules/
 package-lock.json
 package.json
 
+### MkDocs ###
+site/
+
 ### Other ###
 .antlr/
 .profiler/