From 54dbb9f52acb8ddfc665c62ebbc58b79170f4b3d Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Wed, 11 Sep 2024 17:15:37 +0200 Subject: [PATCH 1/2] Upgrade to Objenesis 3.4 Closes gh-33526 --- framework-docs/src/docs/dist/license.txt | 4 ++-- spring-core/spring-core.gradle | 2 +- .../main/java/org/springframework/objenesis/package-info.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/framework-docs/src/docs/dist/license.txt b/framework-docs/src/docs/dist/license.txt index 89cf3d232fa..a5fb64294f3 100644 --- a/framework-docs/src/docs/dist/license.txt +++ b/framework-docs/src/docs/dist/license.txt @@ -263,10 +263,10 @@ JavaPoet 1.13.0 is licensed under the Apache License, version 2.0, the text of which is included above. ->>> Objenesis 3.2 (org.objenesis:objenesis:3.2): +>>> Objenesis 3.4 (org.objenesis:objenesis:3.4): Per the LICENSE file in the Objenesis ZIP distribution downloaded from -http://objenesis.org/download.html, Objenesis 3.2 is licensed under the +http://objenesis.org/download.html, Objenesis 3.4 is licensed under the Apache License, version 2.0, the text of which is included above. Per the NOTICE file in the Objenesis ZIP distribution downloaded from diff --git a/spring-core/spring-core.gradle b/spring-core/spring-core.gradle index a947f95c1ae..ba7057d50e5 100644 --- a/spring-core/spring-core.gradle +++ b/spring-core/spring-core.gradle @@ -15,7 +15,7 @@ multiRelease { } def javapoetVersion = "1.13.0" -def objenesisVersion = "3.3" +def objenesisVersion = "3.4" configurations { java21Api.extendsFrom(api) diff --git a/spring-core/src/main/java/org/springframework/objenesis/package-info.java b/spring-core/src/main/java/org/springframework/objenesis/package-info.java index 017681c78f0..166e59b9c83 100644 --- a/spring-core/src/main/java/org/springframework/objenesis/package-info.java +++ b/spring-core/src/main/java/org/springframework/objenesis/package-info.java @@ -1,6 +1,6 @@ /** * Spring's repackaging of - * Objenesis 3.2 + * Objenesis 3.4 * (with SpringObjenesis entry point; for internal use only). * *

This repackaging technique avoids any potential conflicts with From 4e49f67ec5e176ac772e0972f017756afcd1af42 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Wed, 11 Sep 2024 17:16:14 +0200 Subject: [PATCH 2/2] Upgrade to SLF4J 2.0.16, Tomcat 10.1.29, Jetty 12.0.13, Netty 4.1.113, Undertow 2.3.17, AssertJ 3.26.3, Checkstyle 10.18.1 --- .../build/CheckstyleConventions.java | 2 +- framework-platform/framework-platform.gradle | 26 +++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/buildSrc/src/main/java/org/springframework/build/CheckstyleConventions.java b/buildSrc/src/main/java/org/springframework/build/CheckstyleConventions.java index 373f74f6119..db28118a74b 100644 --- a/buildSrc/src/main/java/org/springframework/build/CheckstyleConventions.java +++ b/buildSrc/src/main/java/org/springframework/build/CheckstyleConventions.java @@ -50,7 +50,7 @@ public class CheckstyleConventions { project.getPlugins().apply(CheckstylePlugin.class); project.getTasks().withType(Checkstyle.class).forEach(checkstyle -> checkstyle.getMaxHeapSize().set("1g")); CheckstyleExtension checkstyle = project.getExtensions().getByType(CheckstyleExtension.class); - checkstyle.setToolVersion("10.17.0"); + checkstyle.setToolVersion("10.18.1"); checkstyle.getConfigDirectory().set(project.getRootProject().file("src/checkstyle")); String version = SpringJavaFormatPlugin.class.getPackage().getImplementationVersion(); DependencySet checkstyleDependencies = project.getConfigurations().getByName("checkstyle").getDependencies(); diff --git a/framework-platform/framework-platform.gradle b/framework-platform/framework-platform.gradle index eff7270bb16..aef0edb5ddb 100644 --- a/framework-platform/framework-platform.gradle +++ b/framework-platform/framework-platform.gradle @@ -9,15 +9,15 @@ javaPlatform { dependencies { api(platform("com.fasterxml.jackson:jackson-bom:2.15.4")) api(platform("io.micrometer:micrometer-bom:1.12.10")) - api(platform("io.netty:netty-bom:4.1.112.Final")) + api(platform("io.netty:netty-bom:4.1.113.Final")) api(platform("io.netty:netty5-bom:5.0.0.Alpha5")) api(platform("io.projectreactor:reactor-bom:2023.0.10")) api(platform("io.rsocket:rsocket-bom:1.1.3")) api(platform("org.apache.groovy:groovy-bom:4.0.22")) api(platform("org.apache.logging.log4j:log4j-bom:2.21.1")) - api(platform("org.assertj:assertj-bom:3.26.0")) - api(platform("org.eclipse.jetty:jetty-bom:12.0.12")) - api(platform("org.eclipse.jetty.ee10:jetty-ee10-bom:12.0.12")) + api(platform("org.assertj:assertj-bom:3.26.3")) + api(platform("org.eclipse.jetty:jetty-bom:12.0.13")) + api(platform("org.eclipse.jetty.ee10:jetty-ee10-bom:12.0.13")) api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3")) api(platform("org.jetbrains.kotlinx:kotlinx-serialization-bom:1.6.3")) api(platform("org.junit:junit-bom:5.10.3")) @@ -56,9 +56,9 @@ dependencies { api("io.r2dbc:r2dbc-spi:1.0.0.RELEASE") api("io.reactivex.rxjava3:rxjava:3.1.8") api("io.smallrye.reactive:mutiny:1.10.0") - api("io.undertow:undertow-core:2.3.15.Final") - api("io.undertow:undertow-servlet:2.3.15.Final") - api("io.undertow:undertow-websockets-jsr:2.3.15.Final") + api("io.undertow:undertow-core:2.3.17.Final") + api("io.undertow:undertow-servlet:2.3.17.Final") + api("io.undertow:undertow-websockets-jsr:2.3.17.Final") api("io.vavr:vavr:0.10.4") api("jakarta.activation:jakarta.activation-api:2.0.1") api("jakarta.annotation:jakarta.annotation-api:2.0.0") @@ -104,10 +104,10 @@ dependencies { api("org.apache.httpcomponents.client5:httpclient5:5.3.1") api("org.apache.httpcomponents.core5:httpcore5-reactive:5.2.5") api("org.apache.poi:poi-ooxml:5.2.5") - api("org.apache.tomcat.embed:tomcat-embed-core:10.1.28") - api("org.apache.tomcat.embed:tomcat-embed-websocket:10.1.28") - api("org.apache.tomcat:tomcat-util:10.1.28") - api("org.apache.tomcat:tomcat-websocket:10.1.28") + api("org.apache.tomcat.embed:tomcat-embed-core:10.1.29") + api("org.apache.tomcat.embed:tomcat-embed-websocket:10.1.29") + api("org.apache.tomcat:tomcat-util:10.1.29") + api("org.apache.tomcat:tomcat-websocket:10.1.29") api("org.aspectj:aspectjrt:1.9.22.1") api("org.aspectj:aspectjtools:1.9.22.1") api("org.aspectj:aspectjweaver:1.9.22.1") @@ -116,7 +116,7 @@ dependencies { api("org.codehaus.jettison:jettison:1.5.4") api("org.crac:crac:1.4.0") api("org.dom4j:dom4j:2.1.4") - api("org.eclipse.jetty:jetty-reactive-httpclient:4.0.5") + api("org.eclipse.jetty:jetty-reactive-httpclient:4.0.7") api("org.eclipse.persistence:org.eclipse.persistence.jpa:3.0.4") api("org.eclipse:yasson:2.0.4") api("org.ehcache:ehcache:3.10.8") @@ -140,7 +140,7 @@ dependencies { api("org.seleniumhq.selenium:htmlunit-driver:2.70.0") api("org.seleniumhq.selenium:selenium-java:3.141.59") api("org.skyscreamer:jsonassert:1.5.3") - api("org.slf4j:slf4j-api:2.0.13") + api("org.slf4j:slf4j-api:2.0.16") api("org.testng:testng:7.9.0") api("org.webjars:underscorejs:1.8.3") api("org.webjars:webjars-locator-core:0.55")