Skip to content

Bump test and build dependencies #1216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Kehrlann merged 5 commits into from
Oct 21, 2026
Merged

Bump test and build dependencies #1216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8a17137
Bump Maven wrapper to Maven 3.9.16
Kehrlann Oct 21, 2026
aea228a
Bump build plugins
Kehrlann Oct 21, 2026
70bcc69
Bump release plugins
Kehrlann Oct 21, 2026
f95b0f8
Bump test dependencies
Kehrlann Oct 21, 2026
a6a2182
Bump Spring conformance client dependencies
Kehrlann Oct 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .mvn/wrapper/maven-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
wrapperVersion=3.3.2
wrapperVersion=3.3.4
distributionType=only-script
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.16/apache-maven-3.9.16-bin.zip
2 changes: 1 addition & 1 deletion conformance-tests/client-jdk-http-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.5.1</version>
<version>3.6.2</version>
<executions>
<execution>
<phase>package</phase>
Expand Down
6 changes: 3 additions & 3 deletions conformance-tests/client-spring-http-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
<properties>
<module.name>io.modelcontextprotocol.sdk.conformance.client.spring</module.name>
<java.version>17</java.version>
<spring-boot.version>4.1.0</spring-boot.version>
<spring-ai.version>2.0.0</spring-ai.version>
<spring-ai-mcp-security.version>0.1.13</spring-ai-mcp-security.version>
<spring-boot.version>4.1.1</spring-boot.version>
<spring-ai.version>2.0.1</spring-ai.version>
<spring-ai-mcp-security.version>0.1.14</spring-ai-mcp-security.version>
<maven.deploy.skip>true</maven.deploy.skip>
</properties>

Expand Down
2 changes: 1 addition & 1 deletion conformance-tests/server-servlet/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>3.1.0</version>
<version>3.6.4</version>
<configuration>
<mainClass>io.modelcontextprotocol.conformance.server.ConformanceServlet</mainClass>
<skip>false</skip>
Expand Down
2 changes: 1 addition & 1 deletion mcp-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.10.1</version>
<version>2.14.0</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
14 changes: 7 additions & 7 deletions ...t/java/io/modelcontextprotocol/server/transport/McpTestRequestRecordingServletFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.function.Function;
import java.util.stream.Collectors;
import java.util.TreeMap;

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

if (servletRequest instanceof HttpServletRequest req) {
var headers = Collections.list(req.getHeaderNames())
.stream()
.collect(Collectors.toUnmodifiableMap(Function.identity(),
name -> String.join(",", Collections.list(req.getHeaders(name)))));
// Header names are case-insensitive; servlet containers may or may not
// normalize them
var headers = new TreeMap<String, String>(String.CASE_INSENSITIVE_ORDER);
Collections.list(req.getHeaderNames())
.forEach(name -> headers.put(name, String.join(",", Collections.list(req.getHeaders(name)))));
var request = new CachedBodyHttpServletRequest(req);
calls.add(new Call(req.getMethod(), headers, request.getBodyAsString()));
calls.add(new Call(req.getMethod(), Collections.unmodifiableMap(headers), request.getBodyAsString()));
filterChain.doFilter(request, servletResponse);
}
else {
Expand Down
50 changes: 43 additions & 7 deletions mvnw
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

56 changes: 48 additions & 8 deletions mvnw.cmd
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

42 changes: 21 additions & 21 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,44 +63,44 @@
an empty value makes maven-jar-plugin fail, which is intentional. -->
<module.name />

<assert4j.version>3.27.6</assert4j.version>
<junit.version>6.0.2</junit.version>
<mockito.version>5.20.0</mockito.version>
<assert4j.version>3.27.7</assert4j.version>
<junit.version>6.1.3</junit.version>
<mockito.version>5.24.0</mockito.version>
<testcontainers.version>1.21.4</testcontainers.version>
<byte-buddy.version>1.17.8</byte-buddy.version>
<toxiproxy.version>1.21.0</toxiproxy.version>
<byte-buddy.version>1.18.15</byte-buddy.version>
<toxiproxy.version>1.21.4</toxiproxy.version>

<slf4j-api.version>2.0.16</slf4j-api.version>
<logback.version>1.5.15</logback.version>
<logback.version>1.6.5</logback.version>
<jackson-annotations.version>2.21</jackson-annotations.version>
<jackson2.version>2.21.1</jackson2.version>
<jackson3.version>3.1.4</jackson3.version>
<springframework.version>6.2.1</springframework.version>
<springframework.version>6.2.19</springframework.version>

<!-- plugin versions -->
<maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
<maven-surefire-plugin.version>3.1.2</maven-surefire-plugin.version>
<maven-compiler-plugin.version>3.16.0</maven-compiler-plugin.version>
<maven-surefire-plugin.version>3.6.0</maven-surefire-plugin.version>
<maven-failsafe-plugin.version>3.5.2</maven-failsafe-plugin.version>
<maven-javadoc-plugin.version>3.11.2</maven-javadoc-plugin.version>
<maven-source-plugin.version>3.3.0</maven-source-plugin.version>
<maven-source-plugin.version>3.4.0</maven-source-plugin.version>
<jacoco-maven-plugin.version>0.8.10</jacoco-maven-plugin.version>
<flatten-maven-plugin.version>1.5.0</flatten-maven-plugin.version>
<maven-deploy-plugin.version>3.1.1</maven-deploy-plugin.version>
<flatten-maven-plugin.version>1.8.0</flatten-maven-plugin.version>
<maven-deploy-plugin.version>3.2.0</maven-deploy-plugin.version>
<asciidoctor-maven-plugin.version>2.2.3</asciidoctor-maven-plugin.version>
<maven-assembly-plugin.version>3.7.0</maven-assembly-plugin.version>
<maven-dependency-plugin.version>3.5.0</maven-dependency-plugin.version>
<maven-site-plugin.version>4.0.0-M13</maven-site-plugin.version>
<maven-project-info-reports-plugin.version>3.4.5</maven-project-info-reports-plugin.version>
<maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
<spring-javaformat-maven-plugin.version>0.0.47</spring-javaformat-maven-plugin.version>
<maven-jar-plugin.version>3.5.1</maven-jar-plugin.version>
<spring-javaformat-maven-plugin.version>0.0.48</spring-javaformat-maven-plugin.version>
<org.maven.antora-version>1.0.0-alpha.4</org.maven.antora-version>
<io.spring.maven.antora-version>0.0.4</io.spring.maven.antora-version>
<asciidoctorj-pdf.version>1.6.2</asciidoctorj-pdf.version>
<tomcat.version>11.0.2</tomcat.version>
<tomcat.version>11.0.27</tomcat.version>
<jakarta.servlet.version>6.1.0</jakarta.servlet.version>
<awaitility.version>4.2.0</awaitility.version>
<bnd-maven-plugin.version>7.1.0</bnd-maven-plugin.version>
<json-unit-assertj.version>4.1.0</json-unit-assertj.version>
<awaitility.version>4.3.0</awaitility.version>
<bnd-maven-plugin.version>7.4.0</bnd-maven-plugin.version>
<json-unit-assertj.version>4.1.1</json-unit-assertj.version>
<json-schema-validator-jackson2.version>2.0.4</json-schema-validator-jackson2.version>
<json-schema-validator-jackson3.version>3.0.6</json-schema-validator-jackson3.version>

Expand Down Expand Up @@ -271,7 +271,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>3.1.0</version>
<version>3.6.4</version>
<configuration>
<skip>true</skip>
<mainClass>ignored</mainClass>
Expand Down Expand Up @@ -323,7 +323,7 @@
<plugin>
<groupId>org.sonatype.central</groupId>
<artifactId>central-publishing-maven-plugin</artifactId>
<version>0.7.0</version>
<version>0.12.0</version>
<extensions>true</extensions>
<configuration>
<publishingServerId>central</publishingServerId>
Expand All @@ -336,7 +336,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>3.2.7</version>
<version>3.2.8</version>
<executions>
<execution>
<id>sign-artifacts</id>
Expand Down
Loading