Skip to content

Commit d43eaf9

Browse files
committed
Merge branch '2.1.x'
2 parents f8a9541 + c7bd7ec commit d43eaf9

15 files changed

Lines changed: 146 additions & 70 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Checkout source code
13-
uses: actions/checkout@v4
13+
uses: actions/checkout@v7
1414

1515
- name: Set up JDK 17
16-
uses: actions/setup-java@v4
16+
uses: actions/setup-java@v6
1717
with:
1818
java-version: '17'
1919
distribution: 'temurin'
@@ -27,10 +27,10 @@ jobs:
2727
runs-on: ubuntu-latest
2828
steps:
2929
- name: Checkout source code
30-
uses: actions/checkout@v4
30+
uses: actions/checkout@v7
3131

3232
- name: Set up JDK 17
33-
uses: actions/setup-java@v4
33+
uses: actions/setup-java@v6
3434
with:
3535
java-version: '17'
3636
distribution: 'temurin'

‎.github/workflows/conformance.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ jobs:
1414
name: Server Conformance
1515
runs-on: ubuntu-latest
1616
steps:
17-
- uses: actions/checkout@v4
17+
- uses: actions/checkout@v7
1818

1919
- name: Set up JDK 17
20-
uses: actions/setup-java@v4
20+
uses: actions/setup-java@v6
2121
with:
2222
java-version: '17'
2323
distribution: 'temurin'
@@ -79,10 +79,10 @@ jobs:
7979
matrix:
8080
scenario: [initialize, tools_call, elicitation-sep1034-client-defaults, sse-retry]
8181
steps:
82-
- uses: actions/checkout@v4
82+
- uses: actions/checkout@v7
8383

8484
- name: Set up JDK 17
85-
uses: actions/setup-java@v4
85+
uses: actions/setup-java@v6
8686
with:
8787
java-version: '17'
8888
distribution: 'temurin'
@@ -125,10 +125,10 @@ jobs:
125125
- auth/token-endpoint-auth-none
126126
- auth/pre-registration
127127
steps:
128-
- uses: actions/checkout@v4
128+
- uses: actions/checkout@v7
129129

130130
- name: Set up JDK 17
131-
uses: actions/setup-java@v4
131+
uses: actions/setup-java@v6
132132
with:
133133
java-version: '17'
134134
distribution: 'temurin'

‎.github/workflows/docs.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ jobs:
1919
deploy:
2020
runs-on: ubuntu-latest
2121
steps:
22-
- uses: actions/checkout@v4
22+
- uses: actions/checkout@v7
2323
with:
2424
fetch-depth: 0
2525

26-
- uses: actions/setup-python@v5
26+
- uses: actions/setup-python@v7
2727
with:
2828
python-version: 3.x
2929

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ jobs:
77
publish:
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: actions/checkout@v4
10+
- uses: actions/checkout@v7
1111

1212
- name: Set up Java
13-
uses: actions/setup-java@v4
13+
uses: actions/setup-java@v6
1414
with:
1515
java-version: '17'
1616
distribution: 'temurin'
@@ -22,7 +22,7 @@ jobs:
2222
gpg-passphrase: MAVEN_GPG_PASSPHRASE
2323

2424
- name: Setup Node.js
25-
uses: actions/setup-node@v4
25+
uses: actions/setup-node@v7
2626
with:
2727
node-version: '20'
2828

‎.github/workflows/publish-snapshot.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- name: Checkout source code
17-
uses: actions/checkout@v4
17+
uses: actions/checkout@v7
1818

1919
- name: Set up JDK 17
20-
uses: actions/setup-java@v4
20+
uses: actions/setup-java@v6
2121
with:
2222
java-version: '17'
2323
distribution: 'temurin'
@@ -29,7 +29,7 @@ jobs:
2929
gpg-passphrase: MAVEN_GPG_PASSPHRASE
3030

3131
- name: Setup Node.js
32-
uses: actions/setup-node@v4
32+
uses: actions/setup-node@v7
3333
with:
3434
node-version: '20'
3535

‎.mvn/wrapper/maven-wrapper.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@
1414
# KIND, either express or implied. See the License for the
1515
# specific language governing permissions and limitations
1616
# under the License.
17-
wrapperVersion=3.3.2
17+
wrapperVersion=3.3.4
1818
distributionType=only-script
19-
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
19+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.16/apache-maven-3.9.16-bin.zip

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
<plugin>
4848
<groupId>org.apache.maven.plugins</groupId>
4949
<artifactId>maven-shade-plugin</artifactId>
50-
<version>3.5.1</version>
50+
<version>3.6.2</version>
5151
<executions>
5252
<execution>
5353
<phase>package</phase>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
<properties>
2424
<module.name>io.modelcontextprotocol.sdk.conformance.client.spring</module.name>
2525
<java.version>17</java.version>
26-
<spring-boot.version>4.1.0</spring-boot.version>
27-
<spring-ai.version>2.0.0</spring-ai.version>
28-
<spring-ai-mcp-security.version>0.1.13</spring-ai-mcp-security.version>
26+
<spring-boot.version>4.1.1</spring-boot.version>
27+
<spring-ai.version>2.0.1</spring-ai.version>
28+
<spring-ai-mcp-security.version>0.1.14</spring-ai-mcp-security.version>
2929
<maven.deploy.skip>true</maven.deploy.skip>
3030
</properties>
3131

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
<plugin>
6464
<groupId>org.codehaus.mojo</groupId>
6565
<artifactId>exec-maven-plugin</artifactId>
66-
<version>3.1.0</version>
66+
<version>3.6.4</version>
6767
<configuration>
6868
<mainClass>io.modelcontextprotocol.conformance.server.ConformanceServlet</mainClass>
6969
<skip>false</skip>

‎mcp-core/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@
172172
<dependency>
173173
<groupId>com.google.code.gson</groupId>
174174
<artifactId>gson</artifactId>
175-
<version>2.10.1</version>
175+
<version>2.14.0</version>
176176
<scope>test</scope>
177177
</dependency>
178178
</dependencies>

0 commit comments

Comments
 (0)