diff --git a/framework-platform/framework-platform.gradle b/framework-platform/framework-platform.gradle index 659d6d92ce..0d5816e404 100644 --- a/framework-platform/framework-platform.gradle +++ b/framework-platform/framework-platform.gradle @@ -15,7 +15,7 @@ dependencies { api(platform("io.rsocket:rsocket-bom:1.1.3")) api(platform("org.apache.groovy:groovy-bom:4.0.5")) api(platform("org.apache.logging.log4j:log4j-bom:2.19.0")) - api(platform("org.eclipse.jetty:jetty-bom:11.0.11")) + api(platform("org.eclipse.jetty:jetty-bom:11.0.12")) api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.4")) api(platform("org.jetbrains.kotlinx:kotlinx-serialization-bom:1.4.0")) api(platform("org.junit:junit-bom:5.9.1")) @@ -84,7 +84,7 @@ dependencies { api("jaxen:jaxen:1.2.0") api("junit:junit:4.13.2") api("net.sf.jopt-simple:jopt-simple:5.0.4") - api("net.sourceforge.htmlunit:htmlunit:2.64.0") + api("net.sourceforge.htmlunit:htmlunit:2.65.1") api("org.apache-extras.beanshell:bsh:2.0b6") api("org.apache.activemq:activemq-broker:5.16.2") api("org.apache.activemq:activemq-kahadb-store:5.16.2") @@ -95,8 +95,8 @@ dependencies { api("org.apache.httpcomponents.client5:httpclient5:5.1.3") api("org.apache.httpcomponents.core5:httpcore5-reactive:5.1.3") api("org.apache.poi:poi-ooxml:5.2.2") - api("org.apache.tomcat.embed:tomcat-embed-core:10.0.23") - api("org.apache.tomcat.embed:tomcat-embed-websocket:10.0.23") + api("org.apache.tomcat.embed:tomcat-embed-core:10.1.0") + api("org.apache.tomcat.embed:tomcat-embed-websocket:10.1.0") api("org.apache.tomcat:tomcat-util:10.0.22") api("org.apache.tomcat:tomcat-websocket:10.0.22") api("org.aspectj:aspectjrt:1.9.9.1") @@ -120,7 +120,7 @@ dependencies { api("org.glassfish:jakarta.el:4.0.2") api("org.graalvm.nativeimage:svm:22.1.0.1") api("org.hamcrest:hamcrest:2.2") - api("org.hibernate:hibernate-core-jakarta:5.6.11.Final") + api("org.hibernate:hibernate-core-jakarta:5.6.12.Final") api("org.hibernate:hibernate-validator:7.0.5.Final") api("org.hsqldb:hsqldb:2.7.0") api("org.javamoney:moneta:1.4.2") @@ -130,7 +130,7 @@ dependencies { api("org.ogce:xpp3:1.1.6") api("org.python:jython-standalone:2.7.1") api("org.quartz-scheduler:quartz:2.3.2") - api("org.seleniumhq.selenium:htmlunit-driver:2.63.0") + api("org.seleniumhq.selenium:htmlunit-driver:2.65.0") api("org.seleniumhq.selenium:selenium-java:3.141.59") api("org.skyscreamer:jsonassert:1.5.0") api("org.slf4j:slf4j-api:2.0.2") diff --git a/spring-test/src/main/java/org/springframework/test/web/client/match/ContentRequestMatchers.java b/spring-test/src/main/java/org/springframework/test/web/client/match/ContentRequestMatchers.java index fe9ab11367..79386749e9 100644 --- a/spring-test/src/main/java/org/springframework/test/web/client/match/ContentRequestMatchers.java +++ b/spring-test/src/main/java/org/springframework/test/web/client/match/ContentRequestMatchers.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -362,7 +362,8 @@ public class ContentRequestMatchers { public static MultiValueMap parse(MockClientHttpRequest request) { try { - FileUpload fileUpload = new FileUpload(new DiskFileItemFactory()); + FileUpload fileUpload = new FileUpload(); + fileUpload.setFileItemFactory(new DiskFileItemFactory()); List fileItems = fileUpload.parseRequest(new UploadContext() { private final byte[] body = request.getBodyAsBytes();