Merge branch '2.5.x'

Closes gh-28662
This commit is contained in:
Andy Wilkinson
2021-11-12 23:40:35 +00:00
43 changed files with 470 additions and 147 deletions

View File

@@ -11,7 +11,9 @@ dependencies {
api("com.fasterxml.jackson.module:jackson-module-parameter-names")
api("net.java.dev.jna:jna-platform")
api("org.apache.commons:commons-compress:1.19")
api("org.apache.httpcomponents:httpclient")
api("org.apache.httpcomponents:httpclient") {
exclude(group: "commons-logging", module: "commons-logging")
}
api("org.springframework:spring-core")
api("org.tomlj:tomlj:1.0.0")