From ddbbe67361846d58cdd42162dd940398f209ebef Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Thu, 10 Nov 2022 18:55:00 +0100 Subject: [PATCH] Upgrade to Reactor 2022.0.0 Includes Netty 4.1.85, Jetty Reactive HttpClient 3.0.7, SmallRye Mutiny 1.8, SLF4J 2.0.3, OpenPDF 1.3.30, Mockito 4.8.1, HtmlUnit 2.66 Closes gh-29465 --- framework-platform/framework-platform.gradle | 19 ++++++++++--------- spring-web/spring-web.gradle | 2 +- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/framework-platform/framework-platform.gradle b/framework-platform/framework-platform.gradle index dc62f5f348c5..e22eb7f6f931 100644 --- a/framework-platform/framework-platform.gradle +++ b/framework-platform/framework-platform.gradle @@ -9,9 +9,9 @@ javaPlatform { dependencies { api(platform("com.fasterxml.jackson:jackson-bom:2.14.0")) api(platform("io.micrometer:micrometer-bom:1.10.0")) - api(platform("io.netty:netty-bom:4.1.84.Final")) + api(platform("io.netty:netty-bom:4.1.85.Final")) api(platform("io.netty:netty5-bom:5.0.0.Alpha5")) - api(platform("io.projectreactor:reactor-bom:2022.0.0-RC1")) + api(platform("io.projectreactor:reactor-bom:2022.0.0")) 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")) @@ -19,13 +19,13 @@ dependencies { 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")) - api(platform("org.mockito:mockito-bom:4.8.0")) + api(platform("org.mockito:mockito-bom:4.8.1")) constraints { api("com.fasterxml.woodstox:woodstox-core:6.4.0") api("com.fasterxml:aalto-xml:1.3.1") api("com.github.ben-manes.caffeine:caffeine:3.1.1") - api("com.github.librepdf:openpdf:1.3.29") + api("com.github.librepdf:openpdf:1.3.30") api("com.google.code.findbugs:findbugs:3.0.1") api("com.google.code.findbugs:jsr305:3.0.2") api("com.google.code.gson:gson:2.9.1") @@ -48,12 +48,13 @@ dependencies { api("info.picocli:picocli:4.6.3") api("io.micrometer:context-propagation:1.0.0") api("io.mockk:mockk:1.12.1") + api("io.projectreactor.netty:reactor-netty5-http:2.0.0-M3") api("io.projectreactor.tools:blockhound:1.0.6.RELEASE") api("io.r2dbc:r2dbc-h2:1.0.0.RC1") api("io.r2dbc:r2dbc-spi-test:1.0.0.RELEASE") api("io.r2dbc:r2dbc-spi:1.0.0.RELEASE") api("io.reactivex.rxjava3:rxjava:3.1.5") - api("io.smallrye.reactive:mutiny:1.7.0") + api("io.smallrye.reactive:mutiny:1.8.0") api("io.undertow:undertow-core:2.3.0.Final") api("io.undertow:undertow-servlet:2.3.0.Final") api("io.undertow:undertow-websockets-jsr:2.3.0.Final") @@ -86,7 +87,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.65.1") + api("net.sourceforge.htmlunit:htmlunit:2.66.0") 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") @@ -110,7 +111,7 @@ dependencies { api("org.bouncycastle:bcpkix-jdk18on:1.71") api("org.codehaus.jettison:jettison:1.3.8") api("org.dom4j:dom4j:2.1.3") - api("org.eclipse.jetty:jetty-reactive-httpclient:3.0.6") + api("org.eclipse.jetty:jetty-reactive-httpclient:3.0.7") api("org.eclipse.persistence:org.eclipse.persistence.jpa:3.0.3") api("org.eclipse:yasson:2.0.4") api("org.ehcache:ehcache:3.4.0") @@ -133,10 +134,10 @@ 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.65.0") + api("org.seleniumhq.selenium:htmlunit-driver:2.66.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") + api("org.slf4j:slf4j-api:2.0.3") api("org.testng:testng:7.6.1") api("org.webjars:underscorejs:1.8.3") api("org.webjars:webjars-locator-core:0.48") diff --git a/spring-web/spring-web.gradle b/spring-web/spring-web.gradle index e0652e525339..053d9c6060b5 100644 --- a/spring-web/spring-web.gradle +++ b/spring-web/spring-web.gradle @@ -23,11 +23,11 @@ dependencies { optional("io.netty:netty-handler") optional("io.netty:netty-codec-http") optional("io.netty:netty-transport") - optional("io.projectreactor.netty:reactor-netty-http") optional("io.netty:netty5-buffer") optional("io.netty:netty5-handler") optional("io.netty:netty5-codec-http") optional("io.netty:netty5-transport") + optional("io.projectreactor.netty:reactor-netty-http") optional("io.projectreactor.netty:reactor-netty5-http") optional("io.undertow:undertow-core") optional("org.apache.tomcat.embed:tomcat-embed-core")