Skip to content

Commit 4d03f89

Browse files
snicollsnicoll
committed
Harmonize dependency upgrades with Spring Boot 2.7.0-M1
Closes gh-29476
1 parent d433f18 commit 4d03f89

File tree

9 files changed

+54
-55
lines changed

9 files changed

+54
-55
lines changed

‎spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ dependencies {
141141
testImplementation("com.squareup.okhttp3:mockwebserver")
142142
testImplementation("com.jayway.jsonpath:json-path")
143143
testImplementation("io.undertow:undertow-core")
144-
testImplementation("io.undertow:undertow-servlet-jakartaee9") {
144+
testImplementation("io.undertow:undertow-servlet-jakarta") {
145145
exclude group: "org.jboss.spec.javax.annotation", module: "jboss-annotations-api_1.3_spec"
146146
}
147147
testImplementation("jakarta.xml.bind:jakarta.xml.bind-api")

‎spring-boot-project/spring-boot-actuator/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ dependencies {
3030
optional("io.r2dbc:r2dbc-pool")
3131
optional("io.r2dbc:r2dbc-spi")
3232
optional("io.reactivex:rxjava-reactive-streams")
33-
optional("io.undertow:undertow-servlet-jakartaee9") {
33+
optional("io.undertow:undertow-servlet-jakarta") {
3434
exclude group: "org.jboss.spec.javax.annotation", module: "jboss-annotations-api_1.3_spec"
3535
}
3636
optional("javax.cache:cache-api")

‎spring-boot-project/spring-boot-autoconfigure/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ dependencies {
3333
optional("io.r2dbc:r2dbc-pool")
3434
optional("io.rsocket:rsocket-core")
3535
optional("io.rsocket:rsocket-transport-netty")
36-
optional("io.undertow:undertow-servlet-jakartaee9") {
36+
optional("io.undertow:undertow-servlet-jakarta") {
3737
exclude group: "org.jboss.spec.javax.annotation", module: "jboss-annotations-api_1.3_spec"
3838
}
39-
optional("io.undertow:undertow-websockets-jsr-jakartaee9") {
39+
optional("io.undertow:undertow-websockets-jsr-jakarta") {
4040
exclude group: "org.jboss.spec.javax.annotation", module: "jboss-annotations-api_1.3_spec"
4141
}
4242
optional("jakarta.jms:jakarta.jms-api")

‎spring-boot-project/spring-boot-dependencies/build.gradle

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ bom {
2424
]
2525
}
2626
}
27-
library("AppEngine SDK", "1.9.92") {
27+
library("AppEngine SDK", "1.9.93") {
2828
group("com.google.appengine") {
2929
modules = [
3030
"appengine-api-1.0-sdk"
@@ -55,7 +55,7 @@ bom {
5555
]
5656
}
5757
}
58-
library("AssertJ", "3.21.0") {
58+
library("AssertJ", "3.22.0") {
5959
group("org.assertj") {
6060
modules = [
6161
"assertj-core"
@@ -72,22 +72,22 @@ bom {
7272
]
7373
}
7474
}
75-
library("Build Helper Maven Plugin", "3.2.0") {
75+
library("Build Helper Maven Plugin", "3.3.0") {
7676
group("org.codehaus.mojo") {
7777
plugins = [
7878
"build-helper-maven-plugin"
7979
]
8080
}
8181
}
82-
library("Byte Buddy", "1.11.22") {
82+
library("Byte Buddy", "1.12.7") {
8383
group("net.bytebuddy") {
8484
modules = [
8585
"byte-buddy",
8686
"byte-buddy-agent"
8787
]
8888
}
8989
}
90-
library("Caffeine", "2.9.2") {
90+
library("Caffeine", "2.9.3") {
9191
prohibit("[3.0.0,)") {
9292
because "it requires Java 11"
9393
}
@@ -163,7 +163,7 @@ bom {
163163
]
164164
}
165165
}
166-
library("DB2 JDBC", "11.5.6.0") {
166+
library("DB2 JDBC", "11.5.7.0") {
167167
group("com.ibm.db2") {
168168
modules = [
169169
"jcc"
@@ -188,7 +188,7 @@ bom {
188188
]
189189
}
190190
}
191-
library("Dropwizard Metrics", "4.2.4") {
191+
library("Dropwizard Metrics", "4.2.7") {
192192
group("io.dropwizard.metrics") {
193193
imports = [
194194
"metrics-bom"
@@ -337,7 +337,7 @@ bom {
337337
]
338338
}
339339
}
340-
library("Hibernate", "5.6.1.Final") {
340+
library("Hibernate", "5.6.3.Final") {
341341
group("org.hibernate") {
342342
modules = [
343343
"hibernate-c3p0",
@@ -385,7 +385,7 @@ bom {
385385
]
386386
}
387387
}
388-
library("HtmlUnit", "2.54.0") {
388+
library("HtmlUnit", "2.56.0") {
389389
group("net.sourceforge.htmlunit") {
390390
modules = [
391391
"htmlunit" {
@@ -394,7 +394,7 @@ bom {
394394
]
395395
}
396396
}
397-
library("HttpAsyncClient", "4.1.4") {
397+
library("HttpAsyncClient", "4.1.5") {
398398
group("org.apache.httpcomponents") {
399399
modules = [
400400
"httpasyncclient" {
@@ -427,15 +427,15 @@ bom {
427427
]
428428
}
429429
}
430-
library("HttpCore", "4.4.14") {
430+
library("HttpCore", "4.4.15") {
431431
group("org.apache.httpcomponents") {
432432
modules = [
433433
"httpcore",
434434
"httpcore-nio"
435435
]
436436
}
437437
}
438-
library("HttpCore5", "5.1.2") {
438+
library("HttpCore5", "5.1.3") {
439439
group("org.apache.httpcomponents.core5") {
440440
modules = [
441441
"httpcore5",
@@ -451,7 +451,7 @@ bom {
451451
]
452452
}
453453
}
454-
library("Jackson Bom", "2.13.0") {
454+
library("Jackson Bom", "2.13.1") {
455455
group("com.fasterxml.jackson") {
456456
imports = [
457457
"jackson-bom"
@@ -612,29 +612,29 @@ bom {
612612
]
613613
}
614614
}
615-
library("Jaybird", "4.0.4.java8") {
615+
library("Jaybird", "4.0.5.java8") {
616616
group("org.firebirdsql.jdbc") {
617617
modules = [
618618
"jaybird",
619619
"jaybird-jdk18"
620620
]
621621
}
622622
}
623-
library("JBoss Logging", "3.4.2.Final") {
623+
library("JBoss Logging", "3.4.3.Final") {
624624
group("org.jboss.logging") {
625625
modules = [
626626
"jboss-logging"
627627
]
628628
}
629629
}
630-
library("JDOM2", "2.0.6") {
630+
library("JDOM2", "2.0.6.1") {
631631
group("org.jdom") {
632632
modules = [
633633
"jdom2"
634634
]
635635
}
636636
}
637-
library("Jedis", "3.7.1") {
637+
library("Jedis", "3.8.0") {
638638
group("redis.clients") {
639639
modules = [
640640
"jedis"
@@ -725,7 +725,7 @@ bom {
725725
]
726726
}
727727
}
728-
library("JUnit Jupiter", "5.8.1") {
728+
library("JUnit Jupiter", "5.8.2") {
729729
group("org.junit") {
730730
imports = [
731731
"junit-bom"
@@ -795,7 +795,7 @@ bom {
795795
]
796796
}
797797
}
798-
library("Logback", "1.2.9") {
798+
library("Logback", "1.2.10") {
799799
group("ch.qos.logback") {
800800
modules = [
801801
"logback-access",
@@ -839,7 +839,7 @@ bom {
839839
]
840840
}
841841
}
842-
library("Maven Compiler Plugin", "3.8.1") {
842+
library("Maven Compiler Plugin", "3.9.0") {
843843
group("org.apache.maven.plugins") {
844844
plugins = [
845845
"maven-compiler-plugin"
@@ -895,7 +895,7 @@ bom {
895895
]
896896
}
897897
}
898-
library("Maven Jar Plugin", "3.2.0") {
898+
library("Maven Jar Plugin", "3.2.2") {
899899
group("org.apache.maven.plugins") {
900900
plugins = [
901901
"maven-jar-plugin"
@@ -963,7 +963,7 @@ bom {
963963
]
964964
}
965965
}
966-
library("Mockito", "4.0.0") {
966+
library("Mockito", "4.2.0") {
967967
group("org.mockito") {
968968
modules = [
969969
"mockito-core",
@@ -983,7 +983,7 @@ bom {
983983
]
984984
}
985985
}
986-
library("MSSQL JDBC", "9.4.0.jre8") {
986+
library("MSSQL JDBC", "9.4.1.jre8") {
987987
group("com.microsoft.sqlserver") {
988988
modules = [
989989
"mssql-jdbc"
@@ -1006,21 +1006,21 @@ bom {
10061006
]
10071007
}
10081008
}
1009-
library("Neo4j Java Driver", "4.3.6") {
1009+
library("Neo4j Java Driver", "4.4.2") {
10101010
group("org.neo4j.driver") {
10111011
modules = [
10121012
"neo4j-java-driver"
10131013
]
10141014
}
10151015
}
1016-
library("Netty", "4.1.70.Final") {
1016+
library("Netty", "4.1.73.Final") {
10171017
group("io.netty") {
10181018
imports = [
10191019
"netty-bom"
10201020
]
10211021
}
10221022
}
1023-
library("Netty tcNative", "2.0.46.Final") {
1023+
library("Netty tcNative", "2.0.47.Final") {
10241024
group("io.netty") {
10251025
modules = [
10261026
"netty-tcnative",
@@ -1046,7 +1046,7 @@ bom {
10461046
]
10471047
}
10481048
}
1049-
library("Oracle Database", "21.3.0.0") {
1049+
library("Oracle Database", "21.4.0.0.1") {
10501050
group("com.oracle.database.jdbc") {
10511051
imports = [
10521052
"ojdbc-bom"
@@ -1092,7 +1092,7 @@ bom {
10921092
]
10931093
}
10941094
}
1095-
library("Rabbit AMQP Client", "5.13.1") {
1095+
library("Rabbit AMQP Client", "5.14.1") {
10961096
group("com.rabbitmq") {
10971097
modules = [
10981098
"amqp-client"
@@ -1230,7 +1230,7 @@ bom {
12301230
]
12311231
}
12321232
}
1233-
library("Selenium", "3.141.59") {
1233+
library("Selenium", "4.1.1") {
12341234
group("org.seleniumhq.selenium") {
12351235
modules = [
12361236
"selenium-api",
@@ -1246,14 +1246,14 @@ bom {
12461246
]
12471247
}
12481248
}
1249-
library("Selenium HtmlUnit", "2.54.0") {
1249+
library("Selenium HtmlUnit", "3.56.0") {
12501250
group("org.seleniumhq.selenium") {
12511251
modules = [
12521252
"htmlunit-driver"
12531253
]
12541254
}
12551255
}
1256-
library("SendGrid", "4.7.6") {
1256+
library("SendGrid", "4.8.2") {
12571257
group("com.sendgrid") {
12581258
modules = [
12591259
"sendgrid-java"
@@ -1267,7 +1267,7 @@ bom {
12671267
]
12681268
}
12691269
}
1270-
library("SLF4J", "1.7.32") {
1270+
library("SLF4J", "1.7.33") {
12711271
group("org.slf4j") {
12721272
modules = [
12731273
"jcl-over-slf4j",
@@ -1283,7 +1283,7 @@ bom {
12831283
]
12841284
}
12851285
}
1286-
library("SnakeYAML", "1.29") {
1286+
library("SnakeYAML", "1.30") {
12871287
group("org.yaml") {
12881288
modules = [
12891289
"snakeyaml"
@@ -1498,12 +1498,12 @@ bom {
14981498
]
14991499
}
15001500
}
1501-
library("Undertow", "2.2.12.Final") {
1501+
library("Undertow", "2.2.14.Final") {
15021502
group("io.undertow") {
15031503
modules = [
15041504
"undertow-core",
1505-
"undertow-servlet-jakartaee9",
1506-
"undertow-websockets-jsr-jakartaee9"
1505+
"undertow-servlet-jakarta",
1506+
"undertow-websockets-jsr-jakarta"
15071507
]
15081508
}
15091509
}
@@ -1535,7 +1535,7 @@ bom {
15351535
]
15361536
}
15371537
}
1538-
library("XmlUnit2", "2.8.3") {
1538+
library("XmlUnit2", "2.8.4") {
15391539
group("org.xmlunit") {
15401540
modules = [
15411541
"xmlunit-assertj",

‎spring-boot-project/spring-boot-starters/spring-boot-starter-undertow/build.gradle

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,8 @@ description = "Starter for using Undertow as the embedded servlet container. An
66

77
dependencies {
88
api("io.undertow:undertow-core")
9-
api("io.undertow:undertow-servlet-jakartaee9") {
10-
exclude group: "org.jboss.spec.javax.annotation", module: "jboss-annotations-api_1.3_spec"
11-
}
12-
api("io.undertow:undertow-websockets-jsr-jakartaee9") {
13-
exclude group: "org.jboss.spec.javax.annotation", module: "jboss-annotations-api_1.3_spec"
14-
exclude group: "jakarta.websocket", module: "jakarta.websocket-client-api"
15-
}
9+
api("io.undertow:undertow-servlet-jakarta")
10+
api("io.undertow:undertow-websockets-jsr-jakarta")
1611
api("jakarta.websocket:jakarta.websocket-api")
1712
api("org.apache.tomcat.embed:tomcat-embed-el")
1813
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import org.junit.jupiter.api.Test;
2121
import org.junit.jupiter.api.TestMethodOrder;
2222
import org.openqa.selenium.By;
23-
import org.openqa.selenium.NoSuchWindowException;
23+
import org.openqa.selenium.NoSuchSessionException;
2424
import org.openqa.selenium.WebDriver;
2525
import org.openqa.selenium.WebElement;
2626

@@ -59,7 +59,7 @@ void shouldBeADifferentWebClient() {
5959
this.webDriver.get("/html");
6060
WebElement element = this.webDriver.findElement(By.tagName("body"));
6161
assertThat(element.getText()).isEqualTo("Hello");
62-
assertThatExceptionOfType(NoSuchWindowException.class).isThrownBy(previousWebDriver::getWindowHandle);
62+
assertThatExceptionOfType(NoSuchSessionException.class).isThrownBy(previousWebDriver::getWindowHandle);
6363
assertThat(previousWebDriver).isNotNull().isNotSameAs(this.webDriver);
6464
}
6565

‎spring-boot-project/spring-boot-test/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ dependencies {
4444
testImplementation("io.mockk:mockk")
4545
testImplementation("jakarta.json:jakarta.json-api")
4646
testImplementation("ch.qos.logback:logback-classic")
47+
testImplementation("com.squareup.okhttp3:okhttp")
4748
testImplementation("org.apache.tomcat.embed:tomcat-embed-core")
4849
testImplementation("org.codehaus.groovy:groovy")
4950
testImplementation("org.codehaus.groovy:groovy-xml")

0 commit comments

Comments
 (0)