Skip to content

Commit 70974e0

Browse files
committed
Upgrade to Tomcat 9.0.55, Undertow 2.2.13, RxJava 3.1.3, SmallRye Mutiny 1.2, Joda-Time 2.10.13, JRuby 9.2.20.1, HtmlUnit 2.55, Checkstyle 9.2
1 parent 2f557d9 commit 70974e0

File tree

3 files changed

+13
-11
lines changed

3 files changed

+13
-11
lines changed

build.gradle

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ configure(allprojects) { project ->
6767
dependency "io.reactivex:rxjava:1.3.8"
6868
dependency "io.reactivex:rxjava-reactive-streams:1.2.1"
6969
dependency "io.reactivex.rxjava2:rxjava:2.2.21"
70-
dependency "io.reactivex.rxjava3:rxjava:3.1.1"
71-
dependency "io.smallrye.reactive:mutiny:1.1.1"
70+
dependency "io.reactivex.rxjava3:rxjava:3.1.3"
71+
dependency "io.smallrye.reactive:mutiny:1.2.0"
7272
dependency "io.projectreactor.tools:blockhound:1.0.6.RELEASE"
7373

7474
dependency "com.caucho:hessian:4.0.63"
@@ -128,18 +128,18 @@ configure(allprojects) { project ->
128128
dependency "org.webjars:webjars-locator-core:0.48"
129129
dependency "org.webjars:underscorejs:1.8.3"
130130

131-
dependencySet(group: 'org.apache.tomcat', version: '9.0.54') {
131+
dependencySet(group: 'org.apache.tomcat', version: '9.0.55') {
132132
entry 'tomcat-util'
133133
entry('tomcat-websocket') {
134134
exclude group: "org.apache.tomcat", name: "tomcat-websocket-api"
135135
exclude group: "org.apache.tomcat", name: "tomcat-servlet-api"
136136
}
137137
}
138-
dependencySet(group: 'org.apache.tomcat.embed', version: '9.0.54') {
138+
dependencySet(group: 'org.apache.tomcat.embed', version: '9.0.55') {
139139
entry 'tomcat-embed-core'
140140
entry 'tomcat-embed-websocket'
141141
}
142-
dependencySet(group: 'io.undertow', version: '2.2.12.Final') {
142+
dependencySet(group: 'io.undertow', version: '2.2.13.Final') {
143143
entry 'undertow-core'
144144
entry('undertow-websockets-jsr') {
145145
exclude group: "org.jboss.spec.javax.websocket", name: "jboss-websocket-api_1.1_spec"
@@ -164,7 +164,7 @@ configure(allprojects) { project ->
164164
dependency 'org.apache.httpcomponents.core5:httpcore5-reactive:5.1.1'
165165
dependency "org.eclipse.jetty:jetty-reactive-httpclient:1.1.9"
166166

167-
dependency "org.jruby:jruby:9.2.19.0"
167+
dependency "org.jruby:jruby:9.2.20.1"
168168
dependency "org.python:jython-standalone:2.7.1"
169169
dependency "org.mozilla:rhino:1.7.11"
170170

@@ -206,10 +206,10 @@ configure(allprojects) { project ->
206206
}
207207
dependency "io.mockk:mockk:1.12.0"
208208

209-
dependency("net.sourceforge.htmlunit:htmlunit:2.54.0") {
209+
dependency("net.sourceforge.htmlunit:htmlunit:2.55.0") {
210210
exclude group: "commons-logging", name: "commons-logging"
211211
}
212-
dependency("org.seleniumhq.selenium:htmlunit-driver:2.54.0") {
212+
dependency("org.seleniumhq.selenium:htmlunit-driver:2.55.0") {
213213
exclude group: "commons-logging", name: "commons-logging"
214214
}
215215
dependency("org.seleniumhq.selenium:selenium-java:3.141.59") {
@@ -237,7 +237,7 @@ configure(allprojects) { project ->
237237

238238
dependency "com.ibm.websphere:uow:6.0.2.17"
239239
dependency "com.jamonapi:jamon:2.82"
240-
dependency "joda-time:joda-time:2.10.10"
240+
dependency "joda-time:joda-time:2.10.13"
241241
dependency "org.eclipse.persistence:org.eclipse.persistence.jpa:2.7.9"
242242
dependency "org.javamoney:moneta:1.3"
243243

@@ -340,7 +340,7 @@ configure([rootProject] + javaProjects) { project ->
340340
}
341341

342342
checkstyle {
343-
toolVersion = "9.0"
343+
toolVersion = "9.2"
344344
configDirectory.set(rootProject.file("src/checkstyle"))
345345
}
346346

spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/TomcatRequestUpgradeStrategy.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ public Integer getMaxBinaryMessageBufferSize() {
123123
}
124124

125125

126+
@SuppressWarnings("deprecation") // for old doUpgrade variant in Tomcat 9.0.55
126127
@Override
127128
public Mono<Void> upgrade(ServerWebExchange exchange, WebSocketHandler handler,
128129
@Nullable String subProtocol, Supplier<HandshakeInfo> handshakeInfoFactory){

spring-websocket/src/main/java/org/springframework/web/socket/server/standard/TomcatRequestUpgradeStrategy.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2017 the original author or authors.
2+
* Copyright 2002-2021 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -53,6 +53,7 @@ public String[] getSupportedVersions() {
5353
return new String[] {"13"};
5454
}
5555

56+
@SuppressWarnings("deprecation") // for old doUpgrade variant in Tomcat 9.0.55
5657
@Override
5758
public void upgradeInternal(ServerHttpRequest request, ServerHttpResponse response,
5859
@Nullable String selectedProtocol, List<Extension> selectedExtensions, Endpoint endpoint)

0 commit comments

Comments
 (0)