Skip to content

Commit f11fa4d

Browse files
PratyayPratyay
authored
Merge branch 'main' into feat/mcp-resilience4j
2 parents d04a6ef + b1a7d5f commit f11fa4d

8 files changed

Lines changed: 160 additions & 318 deletions

File tree

‎.github/workflows/conformance.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ jobs:
9595
run: mvn clean install -DskipTests
9696

9797
- name: Run conformance test
98-
uses: modelcontextprotocol/conformance@v0.1.15
98+
uses: modelcontextprotocol/conformance@v0.1.16
9999
with:
100100
node-version: '22' # see https://github.com/modelcontextprotocol/conformance/pull/162
101101
mode: client

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,15 +64,15 @@ npx @modelcontextprotocol/conformance server --url http://localhost:8080/mcp --s
6464
./mvnw clean package -DskipTests -pl conformance-tests/client-jdk-http-client -am
6565
for scenario in initialize tools_call elicitation-sep1034-client-defaults sse-retry; do
6666
npx @modelcontextprotocol/conformance client \
67-
--command "java -jar conformance-tests/client-jdk-http-client/target/client-jdk-http-client-2.0.0-SNAPSHOT.jar" \
67+
--command "java -jar conformance-tests/client-jdk-http-client/target/client-jdk-http-client-2.0.1-SNAPSHOT.jar" \
6868
--scenario $scenario
6969
done
7070

7171
# Auth conformance (Spring HTTP Client)
7272
./mvnw clean package -DskipTests -pl conformance-tests/client-spring-http-client -am
7373
npx @modelcontextprotocol/conformance@0.1.15 client \
7474
--spec-version 2025-11-25 \
75-
--command "java -jar conformance-tests/client-spring-http-client/target/client-spring-http-client-2.0.0-SNAPSHOT.jar" \
75+
--command "java -jar conformance-tests/client-spring-http-client/target/client-spring-http-client-2.0.1-SNAPSHOT.jar" \
7676
--suite auth
7777
```
7878

‎conformance-tests/client-jdk-http-client/README.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ cd conformance-tests/client-jdk-http-client
5454

5555
This creates an executable JAR at:
5656
```
57-
target/client-jdk-http-client-1.1.0-SNAPSHOT.jar
57+
target/client-jdk-http-client-2.0.1-SNAPSHOT.jar
5858
```
5959

6060
## Running Tests
@@ -65,27 +65,27 @@ Run a single scenario:
6565

6666
```bash
6767
npx @modelcontextprotocol/conformance client \
68-
--command "java -jar conformance-tests/client-jdk-http-client/target/client-jdk-http-client-1.1.0-SNAPSHOT.jar" \
68+
--command "java -jar conformance-tests/client-jdk-http-client/target/client-jdk-http-client-2.0.1-SNAPSHOT.jar" \
6969
--scenario initialize
7070

7171
npx @modelcontextprotocol/conformance client \
72-
--command "java -jar conformance-tests/client-jdk-http-client/target/client-jdk-http-client-1.1.0-SNAPSHOT.jar" \
72+
--command "java -jar conformance-tests/client-jdk-http-client/target/client-jdk-http-client-2.0.1-SNAPSHOT.jar" \
7373
--scenario tools_call
7474

7575
npx @modelcontextprotocol/conformance client \
76-
--command "java -jar conformance-tests/client-jdk-http-client/target/client-jdk-http-client-1.1.0-SNAPSHOT.jar" \
76+
--command "java -jar conformance-tests/client-jdk-http-client/target/client-jdk-http-client-2.0.1-SNAPSHOT.jar" \
7777
--scenario elicitation-sep1034-client-defaults
7878

7979
npx @modelcontextprotocol/conformance client \
80-
--command "java -jar conformance-tests/client-jdk-http-client/target/client-jdk-http-client-1.1.0-SNAPSHOT.jar" \
80+
--command "java -jar conformance-tests/client-jdk-http-client/target/client-jdk-http-client-2.0.1-SNAPSHOT.jar" \
8181
--scenario sse-retry
8282
```
8383

8484
Run with verbose output:
8585

8686
```bash
8787
npx @modelcontextprotocol/conformance client \
88-
--command "java -jar conformance-tests/client-jdk-http-client/target/client-jdk-http-client-1.1.0-SNAPSHOT.jar" \
88+
--command "java -jar conformance-tests/client-jdk-http-client/target/client-jdk-http-client-2.0.1-SNAPSHOT.jar" \
8989
--scenario initialize \
9090
--verbose
9191
```
@@ -96,7 +96,7 @@ You can also run the client manually if you have a test server:
9696

9797
```bash
9898
export MCP_CONFORMANCE_SCENARIO=initialize
99-
java -jar conformance-tests/client-jdk-http-client/target/client-jdk-http-client-1.1.0-SNAPSHOT.jar http://localhost:3000/mcp
99+
java -jar conformance-tests/client-jdk-http-client/target/client-jdk-http-client-2.0.1-SNAPSHOT.jar http://localhost:3000/mcp
100100
```
101101

102102
## Test Results

‎conformance-tests/client-spring-http-client/README.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ cd conformance-tests/client-spring-http-client
6868

6969
This creates an executable JAR at:
7070
```
71-
target/client-spring-http-client-2.0.0-SNAPSHOT.jar
71+
target/client-spring-http-client-2.0.1-SNAPSHOT.jar
7272
```
7373

7474
## Running Tests
@@ -80,7 +80,7 @@ Run the full auth suite:
8080
```bash
8181
npx @modelcontextprotocol/conformance@0.1.15 client \
8282
--spec-version 2025-11-25 \
83-
--command "java -jar conformance-tests/client-spring-http-client/target/client-spring-http-client-2.0.0-SNAPSHOT.jar" \
83+
--command "java -jar conformance-tests/client-spring-http-client/target/client-spring-http-client-2.0.1-SNAPSHOT.jar" \
8484
--suite auth
8585
```
8686

@@ -89,7 +89,7 @@ Run a single scenario:
8989
```bash
9090
npx @modelcontextprotocol/conformance@0.1.15 client \
9191
--spec-version 2025-11-25 \
92-
--command "java -jar conformance-tests/client-spring-http-client/target/client-spring-http-client-2.0.0-SNAPSHOT.jar" \
92+
--command "java -jar conformance-tests/client-spring-http-client/target/client-spring-http-client-2.0.1-SNAPSHOT.jar" \
9393
--scenario auth/metadata-default
9494
```
9595

@@ -98,7 +98,7 @@ Run with verbose output:
9898
```bash
9999
npx @modelcontextprotocol/conformance@0.1.15 client \
100100
--spec-version 2025-11-25 \
101-
--command "java -jar conformance-tests/client-spring-http-client/target/client-spring-http-client-2.0.0-SNAPSHOT.jar" \
101+
--command "java -jar conformance-tests/client-spring-http-client/target/client-spring-http-client-2.0.1-SNAPSHOT.jar" \
102102
--scenario auth/metadata-default \
103103
--verbose
104104
```
@@ -109,7 +109,7 @@ You can also run the client manually if you have a test server:
109109

110110
```bash
111111
export MCP_CONFORMANCE_SCENARIO=auth/metadata-default
112-
java -jar conformance-tests/client-spring-http-client/target/client-spring-http-client-2.0.0-SNAPSHOT.jar http://localhost:3000/mcp
112+
java -jar conformance-tests/client-spring-http-client/target/client-spring-http-client-2.0.1-SNAPSHOT.jar http://localhost:3000/mcp
113113
```
114114

115115
## Known Issues

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222

2323
<properties>
2424
<java.version>17</java.version>
25-
<spring-boot.version>4.0.5</spring-boot.version>
26-
<spring-ai.version>2.0.0-M6</spring-ai.version>
27-
<spring-ai-mcp-security.version>0.1.11</spring-ai-mcp-security.version>
25+
<spring-boot.version>4.1.0</spring-boot.version>
26+
<spring-ai.version>2.0.0</spring-ai.version>
27+
<spring-ai-mcp-security.version>0.1.13</spring-ai-mcp-security.version>
2828
<maven.deploy.skip>true</maven.deploy.skip>
2929
</properties>
3030

0 commit comments

Comments
 (0)