GitHub-Spring
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Upgrade to Tomcat 9.0.62, Jetty 9.4.46, Jetty Reactive HttpClient 1.1.11, Undertow 2.2.17, R2DBC Arabba-SR13, RSocket 1.1.2, OpenPDF 1.3.27, HtmlUnit 2.60, Checkstyle 10.1

pull/27953/head
Juergen Hoeller 4 years ago
parent
4e9af3e277
commit
0cf15c0fdd
1 changed files with 11 additions and 11 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 22
      build.gradle

22
build.gradle
Unescape View File

@ -30,9 +30,9 @@ configure(allprojects) { project ->
mavenBom "com.fasterxml.jackson:jackson-bom:2.12.6" mavenBom "com.fasterxml.jackson:jackson-bom:2.12.6"
mavenBom "io.netty:netty-bom:4.1.75.Final" mavenBom "io.netty:netty-bom:4.1.75.Final"
mavenBom "io.projectreactor:reactor-bom:2020.0.17" mavenBom "io.projectreactor:reactor-bom:2020.0.17"
mavenBom "io.r2dbc:r2dbc-bom:Arabba-SR12" mavenBom "io.r2dbc:r2dbc-bom:Arabba-SR13"
mavenBom "io.rsocket:rsocket-bom:1.1.1" mavenBom "io.rsocket:rsocket-bom:1.1.2"
mavenBom "org.eclipse.jetty:jetty-bom:9.4.45.v20220203" mavenBom "org.eclipse.jetty:jetty-bom:9.4.46.v20220331"
mavenBom "org.jetbrains.kotlin:kotlin-bom:1.5.32" mavenBom "org.jetbrains.kotlin:kotlin-bom:1.5.32"
mavenBom "org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.5.2" mavenBom "org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.5.2"
mavenBom "org.jetbrains.kotlinx:kotlinx-serialization-bom:1.2.2" mavenBom "org.jetbrains.kotlinx:kotlinx-serialization-bom:1.2.2"
@ -96,7 +96,7 @@ configure(allprojects) { project ->
dependency "com.h2database:h2:2.1.210" dependency "com.h2database:h2:2.1.210"
dependency "com.github.ben-manes.caffeine:caffeine:2.9.3" dependency "com.github.ben-manes.caffeine:caffeine:2.9.3"
dependency "com.github.librepdf:openpdf:1.3.26" dependency "com.github.librepdf:openpdf:1.3.27"
dependency "com.rometools:rome:1.18.0" dependency "com.rometools:rome:1.18.0"
dependency "commons-io:commons-io:2.5" dependency "commons-io:commons-io:2.5"
dependency "io.vavr:vavr:0.10.4" dependency "io.vavr:vavr:0.10.4"
@ -128,18 +128,18 @@ configure(allprojects) { project ->
dependency "org.webjars:webjars-locator-core:0.48" dependency "org.webjars:webjars-locator-core:0.48"
dependency "org.webjars:underscorejs:1.8.3" dependency "org.webjars:underscorejs:1.8.3"
dependencySet(group: 'org.apache.tomcat', version: '9.0.60') { dependencySet(group: 'org.apache.tomcat', version: '9.0.62') {
entry 'tomcat-util' entry 'tomcat-util'
entry('tomcat-websocket') { entry('tomcat-websocket') {
exclude group: "org.apache.tomcat", name: "tomcat-servlet-api" exclude group: "org.apache.tomcat", name: "tomcat-servlet-api"
exclude group: "org.apache.tomcat", name: "tomcat-websocket-api" exclude group: "org.apache.tomcat", name: "tomcat-websocket-api"
} }
} }
dependencySet(group: 'org.apache.tomcat.embed', version: '9.0.60') { dependencySet(group: 'org.apache.tomcat.embed', version: '9.0.62') {
entry 'tomcat-embed-core' entry 'tomcat-embed-core'
entry 'tomcat-embed-websocket' entry 'tomcat-embed-websocket'
} }
dependencySet(group: 'io.undertow', version: '2.2.16.Final') { dependencySet(group: 'io.undertow', version: '2.2.17.Final') {
entry 'undertow-core' entry 'undertow-core'
entry('undertow-servlet') { entry('undertow-servlet') {
exclude group: "org.jboss.spec.javax.servlet", name: "jboss-servlet-api_4.0_spec" exclude group: "org.jboss.spec.javax.servlet", name: "jboss-servlet-api_4.0_spec"
@ -150,7 +150,7 @@ configure(allprojects) { project ->
} }
} }
dependency "org.eclipse.jetty:jetty-reactive-httpclient:1.1.10" dependency "org.eclipse.jetty:jetty-reactive-httpclient:1.1.11"
dependency 'org.apache.httpcomponents.client5:httpclient5:5.1.3' dependency 'org.apache.httpcomponents.client5:httpclient5:5.1.3'
dependency 'org.apache.httpcomponents.core5:httpcore5-reactive:5.1.3' dependency 'org.apache.httpcomponents.core5:httpcore5-reactive:5.1.3'
dependency("org.apache.httpcomponents:httpclient:4.5.13") { dependency("org.apache.httpcomponents:httpclient:4.5.13") {
@ -206,10 +206,10 @@ configure(allprojects) { project ->
} }
dependency "io.mockk:mockk:1.12.1" dependency "io.mockk:mockk:1.12.1"
dependency("net.sourceforge.htmlunit:htmlunit:2.59.0") { dependency("net.sourceforge.htmlunit:htmlunit:2.60.0") {
exclude group: "commons-logging", name: "commons-logging" exclude group: "commons-logging", name: "commons-logging"
} }
dependency("org.seleniumhq.selenium:htmlunit-driver:2.59.0") { dependency("org.seleniumhq.selenium:htmlunit-driver:2.60.0") {
exclude group: "commons-logging", name: "commons-logging" exclude group: "commons-logging", name: "commons-logging"
} }
dependency("org.seleniumhq.selenium:selenium-java:3.141.59") { dependency("org.seleniumhq.selenium:selenium-java:3.141.59") {
@ -340,7 +340,7 @@ configure([rootProject] + javaProjects) { project ->
} }
checkstyle { checkstyle {
toolVersion = "9.3" toolVersion = "10.1"
configDirectory.set(rootProject.file("src/checkstyle")) configDirectory.set(rootProject.file("src/checkstyle"))
} }

Write Preview
Loading…
Cancel
Save