Skip to content

Commit aac908c

Browse files
committed
Bump test dependencies
- assertj 3.27.7 - junit 6.1.3 - mockito 5.24.0 - byte-buddy 1.18.15 - testcontainers toxiproxy 1.21.4 - logback 1.6.5 - tomcat 11.0.27 - awaitility 4.3.0 - json-unit-assertj 4.1.1 - gson 2.14.0 - spring-framework 6.2.19 Recent Tomcat versions no longer lower-case request header names, so record headers in a case-insensitive map in McpTestRequestRecordingServletFilter. Signed-off-by: Daniel Garnier-Moiroux <git@garnier.wf>
1 parent 928472c commit aac908c

3 files changed

Lines changed: 18 additions & 18 deletions

File tree

‎mcp-core/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@
168168
<dependency>
169169
<groupId>com.google.code.gson</groupId>
170170
<artifactId>gson</artifactId>
171-
<version>2.10.1</version>
171+
<version>2.14.0</version>
172172
<scope>test</scope>
173173
</dependency>
174174
</dependencies>

‎mcp-test/src/test/java/io/modelcontextprotocol/server/transport/McpTestRequestRecordingServletFilter.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414
import java.util.Collections;
1515
import java.util.List;
1616
import java.util.Map;
17-
import java.util.function.Function;
18-
import java.util.stream.Collectors;
17+
import java.util.TreeMap;
1918

2019
import jakarta.servlet.Filter;
2120
import jakarta.servlet.FilterChain;
@@ -41,12 +40,13 @@ public void doFilter(ServletRequest servletRequest, ServletResponse servletRespo
4140
throws IOException, ServletException {
4241

4342
if (servletRequest instanceof HttpServletRequest req) {
44-
var headers = Collections.list(req.getHeaderNames())
45-
.stream()
46-
.collect(Collectors.toUnmodifiableMap(Function.identity(),
47-
name -> String.join(",", Collections.list(req.getHeaders(name)))));
43+
// Header names are case-insensitive; servlet containers may or may not
44+
// normalize them
45+
var headers = new TreeMap<String, String>(String.CASE_INSENSITIVE_ORDER);
46+
Collections.list(req.getHeaderNames())
47+
.forEach(name -> headers.put(name, String.join(",", Collections.list(req.getHeaders(name)))));
4848
var request = new CachedBodyHttpServletRequest(req);
49-
calls.add(new Call(req.getMethod(), headers, request.getBodyAsString()));
49+
calls.add(new Call(req.getMethod(), Collections.unmodifiableMap(headers), request.getBodyAsString()));
5050
filterChain.doFilter(request, servletResponse);
5151
}
5252
else {

‎pom.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -59,19 +59,19 @@
5959
<maven.compiler.target>17</maven.compiler.target>
6060
<surefireArgLine />
6161

62-
<assert4j.version>3.27.6</assert4j.version>
63-
<junit.version>6.0.2</junit.version>
64-
<mockito.version>5.20.0</mockito.version>
62+
<assert4j.version>3.27.7</assert4j.version>
63+
<junit.version>6.1.3</junit.version>
64+
<mockito.version>5.24.0</mockito.version>
6565
<testcontainers.version>1.21.4</testcontainers.version>
66-
<byte-buddy.version>1.17.8</byte-buddy.version>
67-
<toxiproxy.version>1.21.0</toxiproxy.version>
66+
<byte-buddy.version>1.18.15</byte-buddy.version>
67+
<toxiproxy.version>1.21.4</toxiproxy.version>
6868

6969
<slf4j-api.version>2.0.16</slf4j-api.version>
70-
<logback.version>1.5.15</logback.version>
70+
<logback.version>1.6.5</logback.version>
7171
<jackson-annotations.version>2.20</jackson-annotations.version>
7272
<jackson2.version>2.20.1</jackson2.version>
7373
<jackson3.version>3.0.3</jackson3.version>
74-
<springframework.version>6.2.1</springframework.version>
74+
<springframework.version>6.2.19</springframework.version>
7575

7676
<!-- plugin versions -->
7777
<maven-compiler-plugin.version>3.16.0</maven-compiler-plugin.version>
@@ -92,11 +92,11 @@
9292
<org.maven.antora-version>1.0.0-alpha.4</org.maven.antora-version>
9393
<io.spring.maven.antora-version>0.0.4</io.spring.maven.antora-version>
9494
<asciidoctorj-pdf.version>1.6.2</asciidoctorj-pdf.version>
95-
<tomcat.version>11.0.2</tomcat.version>
95+
<tomcat.version>11.0.27</tomcat.version>
9696
<jakarta.servlet.version>6.1.0</jakarta.servlet.version>
97-
<awaitility.version>4.2.0</awaitility.version>
97+
<awaitility.version>4.3.0</awaitility.version>
9898
<bnd-maven-plugin.version>7.4.0</bnd-maven-plugin.version>
99-
<json-unit-assertj.version>4.1.0</json-unit-assertj.version>
99+
<json-unit-assertj.version>4.1.1</json-unit-assertj.version>
100100
<json-schema-validator-jackson2.version>2.0.0</json-schema-validator-jackson2.version>
101101
<json-schema-validator-jackson3.version>3.0.0</json-schema-validator-jackson3.version>
102102

0 commit comments

Comments
 (0)