root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Harmonize dependency upgrades with Spring Boot 2.7.0-M1 

Closes gh-29476
This commit is contained in:
Stephane Nicoll 2022-01-19 10:09:31 +01:00
parent d433f18922
commit 4d03f89a55
9 changed files with 54 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle
View File

@ -141,7 +141,7 @@ dependencies {
testImplementation("com.squareup.okhttp3:mockwebserver") testImplementation("com.squareup.okhttp3:mockwebserver")
testImplementation("com.jayway.jsonpath:json-path") testImplementation("com.jayway.jsonpath:json-path")
testImplementation("io.undertow:undertow-core") testImplementation("io.undertow:undertow-core")
testImplementation("io.undertow:undertow-servlet-jakartaee9") { testImplementation("io.undertow:undertow-servlet-jakarta") {
exclude group: "org.jboss.spec.javax.annotation", module: "jboss-annotations-api_1.3_spec" exclude group: "org.jboss.spec.javax.annotation", module: "jboss-annotations-api_1.3_spec"
} }
testImplementation("jakarta.xml.bind:jakarta.xml.bind-api") testImplementation("jakarta.xml.bind:jakarta.xml.bind-api")

2
spring-boot-project/spring-boot-actuator/build.gradle
View File

@ -30,7 +30,7 @@ dependencies {
optional("io.r2dbc:r2dbc-pool") optional("io.r2dbc:r2dbc-pool")
optional("io.r2dbc:r2dbc-spi") optional("io.r2dbc:r2dbc-spi")
optional("io.reactivex:rxjava-reactive-streams") optional("io.reactivex:rxjava-reactive-streams")
optional("io.undertow:undertow-servlet-jakartaee9") { optional("io.undertow:undertow-servlet-jakarta") {
exclude group: "org.jboss.spec.javax.annotation", module: "jboss-annotations-api_1.3_spec" exclude group: "org.jboss.spec.javax.annotation", module: "jboss-annotations-api_1.3_spec"
} }
optional("javax.cache:cache-api") optional("javax.cache:cache-api")

4
spring-boot-project/spring-boot-autoconfigure/build.gradle
View File

@ -33,10 +33,10 @@ dependencies {
optional("io.r2dbc:r2dbc-pool") optional("io.r2dbc:r2dbc-pool")
optional("io.rsocket:rsocket-core") optional("io.rsocket:rsocket-core")
optional("io.rsocket:rsocket-transport-netty") optional("io.rsocket:rsocket-transport-netty")
optional("io.undertow:undertow-servlet-jakartaee9") { optional("io.undertow:undertow-servlet-jakarta") {
exclude group: "org.jboss.spec.javax.annotation", module: "jboss-annotations-api_1.3_spec" exclude group: "org.jboss.spec.javax.annotation", module: "jboss-annotations-api_1.3_spec"
} }
optional("io.undertow:undertow-websockets-jsr-jakartaee9") { optional("io.undertow:undertow-websockets-jsr-jakarta") {
exclude group: "org.jboss.spec.javax.annotation", module: "jboss-annotations-api_1.3_spec" exclude group: "org.jboss.spec.javax.annotation", module: "jboss-annotations-api_1.3_spec"
} }
optional("jakarta.jms:jakarta.jms-api") optional("jakarta.jms:jakarta.jms-api")

74
spring-boot-project/spring-boot-dependencies/build.gradle
View File

@ -24,7 +24,7 @@ bom {
] ]
} }
} }
library("AppEngine SDK", "1.9.92") { library("AppEngine SDK", "1.9.93") {
group("com.google.appengine") { group("com.google.appengine") {
modules = [ modules = [
"appengine-api-1.0-sdk" "appengine-api-1.0-sdk"
@ -55,7 +55,7 @@ bom {
] ]
} }
} }
library("AssertJ", "3.21.0") { library("AssertJ", "3.22.0") {
group("org.assertj") { group("org.assertj") {
modules = [ modules = [
"assertj-core" "assertj-core"
@ -72,14 +72,14 @@ bom {
] ]
} }
} }
library("Build Helper Maven Plugin", "3.2.0") { library("Build Helper Maven Plugin", "3.3.0") {
group("org.codehaus.mojo") { group("org.codehaus.mojo") {
plugins = [ plugins = [
"build-helper-maven-plugin" "build-helper-maven-plugin"
] ]
} }
} }
library("Byte Buddy", "1.11.22") { library("Byte Buddy", "1.12.7") {
group("net.bytebuddy") { group("net.bytebuddy") {
modules = [ modules = [
"byte-buddy", "byte-buddy",
@ -87,7 +87,7 @@ bom {
] ]
} }
} }
library("Caffeine", "2.9.2") { library("Caffeine", "2.9.3") {
prohibit("[3.0.0,)") { prohibit("[3.0.0,)") {
because "it requires Java 11" because "it requires Java 11"
} }
@ -163,7 +163,7 @@ bom {
] ]
} }
} }
library("DB2 JDBC", "11.5.6.0") { library("DB2 JDBC", "11.5.7.0") {
group("com.ibm.db2") { group("com.ibm.db2") {
modules = [ modules = [
"jcc" "jcc"
@ -188,7 +188,7 @@ bom {
] ]
} }
} }
library("Dropwizard Metrics", "4.2.4") { library("Dropwizard Metrics", "4.2.7") {
group("io.dropwizard.metrics") { group("io.dropwizard.metrics") {
imports = [ imports = [
"metrics-bom" "metrics-bom"
@ -337,7 +337,7 @@ bom {
] ]
} }
} }
library("Hibernate", "5.6.1.Final") { library("Hibernate", "5.6.3.Final") {
group("org.hibernate") { group("org.hibernate") {
modules = [ modules = [
"hibernate-c3p0", "hibernate-c3p0",
@ -385,7 +385,7 @@ bom {
] ]
} }
} }
library("HtmlUnit", "2.54.0") { library("HtmlUnit", "2.56.0") {
group("net.sourceforge.htmlunit") { group("net.sourceforge.htmlunit") {
modules = [ modules = [
"htmlunit" { "htmlunit" {
@ -394,7 +394,7 @@ bom {
] ]
} }
} }
library("HttpAsyncClient", "4.1.4") { library("HttpAsyncClient", "4.1.5") {
group("org.apache.httpcomponents") { group("org.apache.httpcomponents") {
modules = [ modules = [
"httpasyncclient" { "httpasyncclient" {
@ -427,7 +427,7 @@ bom {
] ]
} }
} }
library("HttpCore", "4.4.14") { library("HttpCore", "4.4.15") {
group("org.apache.httpcomponents") { group("org.apache.httpcomponents") {
modules = [ modules = [
"httpcore", "httpcore",
@ -435,7 +435,7 @@ bom {
] ]
} }
} }
library("HttpCore5", "5.1.2") { library("HttpCore5", "5.1.3") {
group("org.apache.httpcomponents.core5") { group("org.apache.httpcomponents.core5") {
modules = [ modules = [
"httpcore5", "httpcore5",
@ -451,7 +451,7 @@ bom {
] ]
} }
} }
library("Jackson Bom", "2.13.0") { library("Jackson Bom", "2.13.1") {
group("com.fasterxml.jackson") { group("com.fasterxml.jackson") {
imports = [ imports = [
"jackson-bom" "jackson-bom"
@ -612,7 +612,7 @@ bom {
] ]
} }
} }
library("Jaybird", "4.0.4.java8") { library("Jaybird", "4.0.5.java8") {
group("org.firebirdsql.jdbc") { group("org.firebirdsql.jdbc") {
modules = [ modules = [
"jaybird", "jaybird",
@ -620,21 +620,21 @@ bom {
] ]
} }
} }
library("JBoss Logging", "3.4.2.Final") { library("JBoss Logging", "3.4.3.Final") {
group("org.jboss.logging") { group("org.jboss.logging") {
modules = [ modules = [
"jboss-logging" "jboss-logging"
] ]
} }
} }
library("JDOM2", "2.0.6") { library("JDOM2", "2.0.6.1") {
group("org.jdom") { group("org.jdom") {
modules = [ modules = [
"jdom2" "jdom2"
] ]
} }
} }
library("Jedis", "3.7.1") { library("Jedis", "3.8.0") {
group("redis.clients") { group("redis.clients") {
modules = [ modules = [
"jedis" "jedis"
@ -725,7 +725,7 @@ bom {
] ]
} }
} }
library("JUnit Jupiter", "5.8.1") { library("JUnit Jupiter", "5.8.2") {
group("org.junit") { group("org.junit") {
imports = [ imports = [
"junit-bom" "junit-bom"
@ -795,7 +795,7 @@ bom {
] ]
} }
} }
library("Logback", "1.2.9") { library("Logback", "1.2.10") {
group("ch.qos.logback") { group("ch.qos.logback") {
modules = [ modules = [
"logback-access", "logback-access",
@ -839,7 +839,7 @@ bom {
] ]
} }
} }
library("Maven Compiler Plugin", "3.8.1") { library("Maven Compiler Plugin", "3.9.0") {
group("org.apache.maven.plugins") { group("org.apache.maven.plugins") {
plugins = [ plugins = [
"maven-compiler-plugin" "maven-compiler-plugin"
@ -895,7 +895,7 @@ bom {
] ]
} }
} }
library("Maven Jar Plugin", "3.2.0") { library("Maven Jar Plugin", "3.2.2") {
group("org.apache.maven.plugins") { group("org.apache.maven.plugins") {
plugins = [ plugins = [
"maven-jar-plugin" "maven-jar-plugin"
@ -963,7 +963,7 @@ bom {
] ]
} }
} }
library("Mockito", "4.0.0") { library("Mockito", "4.2.0") {
group("org.mockito") { group("org.mockito") {
modules = [ modules = [
"mockito-core", "mockito-core",
@ -983,7 +983,7 @@ bom {
] ]
} }
} }
library("MSSQL JDBC", "9.4.0.jre8") { library("MSSQL JDBC", "9.4.1.jre8") {
group("com.microsoft.sqlserver") { group("com.microsoft.sqlserver") {
modules = [ modules = [
"mssql-jdbc" "mssql-jdbc"
@ -1006,21 +1006,21 @@ bom {
] ]
} }
} }
library("Neo4j Java Driver", "4.3.6") { library("Neo4j Java Driver", "4.4.2") {
group("org.neo4j.driver") { group("org.neo4j.driver") {
modules = [ modules = [
"neo4j-java-driver" "neo4j-java-driver"
] ]
} }
} }
library("Netty", "4.1.70.Final") { library("Netty", "4.1.73.Final") {
group("io.netty") { group("io.netty") {
imports = [ imports = [
"netty-bom" "netty-bom"
] ]
} }
} }
library("Netty tcNative", "2.0.46.Final") { library("Netty tcNative", "2.0.47.Final") {
group("io.netty") { group("io.netty") {
modules = [ modules = [
"netty-tcnative", "netty-tcnative",
@ -1046,7 +1046,7 @@ bom {
] ]
} }
} }
library("Oracle Database", "21.3.0.0") { library("Oracle Database", "21.4.0.0.1") {
group("com.oracle.database.jdbc") { group("com.oracle.database.jdbc") {
imports = [ imports = [
"ojdbc-bom" "ojdbc-bom"
@ -1092,7 +1092,7 @@ bom {
] ]
} }
} }
library("Rabbit AMQP Client", "5.13.1") { library("Rabbit AMQP Client", "5.14.1") {
group("com.rabbitmq") { group("com.rabbitmq") {
modules = [ modules = [
"amqp-client" "amqp-client"
@ -1230,7 +1230,7 @@ bom {
] ]
} }
} }
library("Selenium", "3.141.59") { library("Selenium", "4.1.1") {
group("org.seleniumhq.selenium") { group("org.seleniumhq.selenium") {
modules = [ modules = [
"selenium-api", "selenium-api",
@ -1246,14 +1246,14 @@ bom {
] ]
} }
} }
library("Selenium HtmlUnit", "2.54.0") { library("Selenium HtmlUnit", "3.56.0") {
group("org.seleniumhq.selenium") { group("org.seleniumhq.selenium") {
modules = [ modules = [
"htmlunit-driver" "htmlunit-driver"
] ]
} }
} }
library("SendGrid", "4.7.6") { library("SendGrid", "4.8.2") {
group("com.sendgrid") { group("com.sendgrid") {
modules = [ modules = [
"sendgrid-java" "sendgrid-java"
@ -1267,7 +1267,7 @@ bom {
] ]
} }
} }
library("SLF4J", "1.7.32") { library("SLF4J", "1.7.33") {
group("org.slf4j") { group("org.slf4j") {
modules = [ modules = [
"jcl-over-slf4j", "jcl-over-slf4j",
@ -1283,7 +1283,7 @@ bom {
] ]
} }
} }
library("SnakeYAML", "1.29") { library("SnakeYAML", "1.30") {
group("org.yaml") { group("org.yaml") {
modules = [ modules = [
"snakeyaml" "snakeyaml"
@ -1498,12 +1498,12 @@ bom {
] ]
} }
} }
library("Undertow", "2.2.12.Final") { library("Undertow", "2.2.14.Final") {
group("io.undertow") { group("io.undertow") {
modules = [ modules = [
"undertow-core", "undertow-core",
"undertow-servlet-jakartaee9", "undertow-servlet-jakarta",
"undertow-websockets-jsr-jakartaee9" "undertow-websockets-jsr-jakarta"
] ]
} }
} }
@ -1535,7 +1535,7 @@ bom {
] ]
} }
} }
library("XmlUnit2", "2.8.3") { library("XmlUnit2", "2.8.4") {
group("org.xmlunit") { group("org.xmlunit") {
modules = [ modules = [
"xmlunit-assertj", "xmlunit-assertj",

9
spring-boot-project/spring-boot-starters/spring-boot-starter-undertow/build.gradle
View File

@ -6,13 +6,8 @@ description = "Starter for using Undertow as the embedded servlet container. An
dependencies { dependencies {
api("io.undertow:undertow-core") api("io.undertow:undertow-core")
api("io.undertow:undertow-servlet-jakartaee9") { api("io.undertow:undertow-servlet-jakarta")
exclude group: "org.jboss.spec.javax.annotation", module: "jboss-annotations-api_1.3_spec" api("io.undertow:undertow-websockets-jsr-jakarta")
}
api("io.undertow:undertow-websockets-jsr-jakartaee9") {
exclude group: "org.jboss.spec.javax.annotation", module: "jboss-annotations-api_1.3_spec"
exclude group: "jakarta.websocket", module: "jakarta.websocket-client-api"
}
api("jakarta.websocket:jakarta.websocket-api") api("jakarta.websocket:jakarta.websocket-api")
api("org.apache.tomcat.embed:tomcat-embed-el") api("org.apache.tomcat.embed:tomcat-embed-el")
} }

4
spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/mockmvc/WebMvcTestWebDriverIntegrationTests.java
View File

@ -20,7 +20,7 @@ import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder; import org.junit.jupiter.api.TestMethodOrder;
import org.openqa.selenium.By; import org.openqa.selenium.By;
import org.openqa.selenium.NoSuchWindowException; import org.openqa.selenium.NoSuchSessionException;
import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebDriver;
import org.openqa.selenium.WebElement; import org.openqa.selenium.WebElement;
@ -59,7 +59,7 @@ class WebMvcTestWebDriverIntegrationTests {
this.webDriver.get("/html"); this.webDriver.get("/html");
WebElement element = this.webDriver.findElement(By.tagName("body")); WebElement element = this.webDriver.findElement(By.tagName("body"));
assertThat(element.getText()).isEqualTo("Hello"); assertThat(element.getText()).isEqualTo("Hello");
assertThatExceptionOfType(NoSuchWindowException.class).isThrownBy(previousWebDriver::getWindowHandle); assertThatExceptionOfType(NoSuchSessionException.class).isThrownBy(previousWebDriver::getWindowHandle);
assertThat(previousWebDriver).isNotNull().isNotSameAs(this.webDriver); assertThat(previousWebDriver).isNotNull().isNotSameAs(this.webDriver);
} }

1
spring-boot-project/spring-boot-test/build.gradle
View File

@ -44,6 +44,7 @@ dependencies {
testImplementation("io.mockk:mockk") testImplementation("io.mockk:mockk")
testImplementation("jakarta.json:jakarta.json-api") testImplementation("jakarta.json:jakarta.json-api")
testImplementation("ch.qos.logback:logback-classic") testImplementation("ch.qos.logback:logback-classic")
testImplementation("com.squareup.okhttp3:okhttp")
testImplementation("org.apache.tomcat.embed:tomcat-embed-core") testImplementation("org.apache.tomcat.embed:tomcat-embed-core")
testImplementation("org.codehaus.groovy:groovy") testImplementation("org.codehaus.groovy:groovy")
testImplementation("org.codehaus.groovy:groovy-xml") testImplementation("org.codehaus.groovy:groovy-xml")

11
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/htmlunit/webdriver/LocalHostWebConnectionHtmlUnitDriverTests.java
View File

@ -35,8 +35,8 @@ import org.springframework.core.env.Environment;
import org.springframework.mock.env.MockEnvironment; import org.springframework.mock.env.MockEnvironment;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.ArgumentMatchers.argThat;
import static org.mockito.ArgumentMatchers.isNull;
import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
@ -55,6 +55,9 @@ class LocalHostWebConnectionHtmlUnitDriverTests {
this.webClient = webClient; this.webClient = webClient;
given(this.webClient.getOptions()).willReturn(new WebClientOptions()); given(this.webClient.getOptions()).willReturn(new WebClientOptions());
given(this.webClient.getWebConsole()).willReturn(new WebConsole()); given(this.webClient.getWebConsole()).willReturn(new WebConsole());
WebWindow currentWindow = mock(WebWindow.class);
given(currentWindow.isClosed()).willReturn(false);
given(this.webClient.getCurrentWindow()).willReturn(currentWindow);
} }
@Test @Test
@ -80,7 +83,7 @@ class LocalHostWebConnectionHtmlUnitDriverTests {
void createWithCapabilitiesWhenEnvironmentIsNullWillThrowException() { void createWithCapabilitiesWhenEnvironmentIsNullWillThrowException() {
Capabilities capabilities = mock(Capabilities.class); Capabilities capabilities = mock(Capabilities.class);
given(capabilities.getBrowserName()).willReturn("htmlunit"); given(capabilities.getBrowserName()).willReturn("htmlunit");
given(capabilities.getVersion()).willReturn("chrome"); given(capabilities.getBrowserVersion()).willReturn("chrome");
assertThatIllegalArgumentException() assertThatIllegalArgumentException()
.isThrownBy(() -> new LocalHostWebConnectionHtmlUnitDriver(null, capabilities)) .isThrownBy(() -> new LocalHostWebConnectionHtmlUnitDriver(null, capabilities))
.withMessageContaining("Environment must not be null"); .withMessageContaining("Environment must not be null");
@ -91,7 +94,7 @@ class LocalHostWebConnectionHtmlUnitDriverTests {
MockEnvironment environment = new MockEnvironment(); MockEnvironment environment = new MockEnvironment();
LocalHostWebConnectionHtmlUnitDriver driver = new TestLocalHostWebConnectionHtmlUnitDriver(environment); LocalHostWebConnectionHtmlUnitDriver driver = new TestLocalHostWebConnectionHtmlUnitDriver(environment);
driver.get("/test"); driver.get("/test");
verify(this.webClient).getPage(any(WebWindow.class), requestToUrl(new URL("http://localhost:8080/test"))); verify(this.webClient).getPage(isNull(), requestToUrl(new URL("http://localhost:8080/test")));
} }
@Test @Test
@ -100,7 +103,7 @@ class LocalHostWebConnectionHtmlUnitDriverTests {
environment.setProperty("local.server.port", "8181"); environment.setProperty("local.server.port", "8181");
LocalHostWebConnectionHtmlUnitDriver driver = new TestLocalHostWebConnectionHtmlUnitDriver(environment); LocalHostWebConnectionHtmlUnitDriver driver = new TestLocalHostWebConnectionHtmlUnitDriver(environment);
driver.get("/test"); driver.get("/test");
verify(this.webClient).getPage(any(WebWindow.class), requestToUrl(new URL("http://localhost:8181/test"))); verify(this.webClient).getPage(isNull(), requestToUrl(new URL("http://localhost:8181/test")));
} }
private WebRequest requestToUrl(URL url) { private WebRequest requestToUrl(URL url) {

2
spring-boot-project/spring-boot/build.gradle
View File

@ -35,7 +35,7 @@ dependencies {
optional("io.r2dbc:r2dbc-pool") optional("io.r2dbc:r2dbc-pool")
optional("io.rsocket:rsocket-core") optional("io.rsocket:rsocket-core")
optional("io.rsocket:rsocket-transport-netty") optional("io.rsocket:rsocket-transport-netty")
optional("io.undertow:undertow-servlet-jakartaee9") { optional("io.undertow:undertow-servlet-jakarta") {
exclude group: "org.jboss.spec.javax.annotation", module: "jboss-annotations-api_1.3_spec" exclude group: "org.jboss.spec.javax.annotation", module: "jboss-annotations-api_1.3_spec"
} }
optional("jakarta.jms:jakarta.jms-api") optional("jakarta.jms:jakarta.jms-api")