diff --git a/gradle.properties b/gradle.properties index 3d2d78d6aa5c..30aa3f0a755a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,10 +18,10 @@ junitJupiterVersion=6.0.3 kotlinVersion=2.3.21 mavenVersion=3.9.13 mockitoVersion=5.23.0 -nativeBuildToolsVersion=1.1.0 +nativeBuildToolsVersion=1.1.1 nullabilityPluginVersion=0.0.11 snakeYamlVersion=2.6 -springFrameworkVersion=7.0.7 +springFrameworkVersion=7.0.8-SNAPSHOT springFramework60xVersion=6.0.23 tomcatVersion=11.0.22 protobufGradlePluginVersion=0.9.6 diff --git a/module/spring-boot-hibernate/src/main/java/org/springframework/boot/hibernate/SpringJtaPlatform.java b/module/spring-boot-hibernate/src/main/java/org/springframework/boot/hibernate/SpringJtaPlatform.java index 6342a1073184..36ed1fe2df60 100644 --- a/module/spring-boot-hibernate/src/main/java/org/springframework/boot/hibernate/SpringJtaPlatform.java +++ b/module/spring-boot-hibernate/src/main/java/org/springframework/boot/hibernate/SpringJtaPlatform.java @@ -21,6 +21,7 @@ import org.hibernate.engine.transaction.jta.platform.internal.AbstractJtaPlatform; import org.jspecify.annotations.Nullable; +import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter; import org.springframework.transaction.jta.JtaTransactionManager; import org.springframework.util.Assert; @@ -32,7 +33,11 @@ * @author Josh Long * @author Phillip Webb * @since 4.0.0 + * @deprecated since 4.1.0 for removal in 4.3.0 in favor of @link + * {@link HibernateJpaVendorAdapter#setJtaTransactionManager(Object)} and + * {@link org.springframework.orm.jpa.hibernate.ConfigurableJtaPlatform} */ +@Deprecated(since = "4.1.0", forRemoval = true) public class SpringJtaPlatform extends AbstractJtaPlatform { private static final long serialVersionUID = 1L; @@ -45,11 +50,13 @@ public SpringJtaPlatform(JtaTransactionManager transactionManager) { } @Override + @SuppressWarnings("NullAway") protected @Nullable TransactionManager locateTransactionManager() { return this.transactionManager.getTransactionManager(); } @Override + @SuppressWarnings("NullAway") protected @Nullable UserTransaction locateUserTransaction() { return this.transactionManager.getUserTransaction(); } diff --git a/module/spring-boot-hibernate/src/main/java/org/springframework/boot/hibernate/autoconfigure/metrics/HibernateMetricsAutoConfiguration.java b/module/spring-boot-hibernate/src/main/java/org/springframework/boot/hibernate/autoconfigure/metrics/HibernateMetricsAutoConfiguration.java index 3951ad2bb0e6..a46d76f75000 100644 --- a/module/spring-boot-hibernate/src/main/java/org/springframework/boot/hibernate/autoconfigure/metrics/HibernateMetricsAutoConfiguration.java +++ b/module/spring-boot-hibernate/src/main/java/org/springframework/boot/hibernate/autoconfigure/metrics/HibernateMetricsAutoConfiguration.java @@ -23,7 +23,7 @@ import jakarta.persistence.EntityManagerFactory; import jakarta.persistence.PersistenceException; import org.hibernate.SessionFactory; -import org.hibernate.stat.HibernateMetrics; +import org.hibernate.orm.micrometer.HibernateMetrics; import org.springframework.beans.factory.SmartInitializingSingleton; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; diff --git a/platform/spring-boot-dependencies/build.gradle b/platform/spring-boot-dependencies/build.gradle index cc522f4eba99..6024148fe40b 100644 --- a/platform/spring-boot-dependencies/build.gradle +++ b/platform/spring-boot-dependencies/build.gradle @@ -23,7 +23,7 @@ description = "Spring Boot Dependencies" bom { upgrade { - policy = "same-major-version" + policy = "same-minor-version" gitHub { issueLabels = [ "type: dependency-upgrade", @@ -312,7 +312,7 @@ bom { site("https://commons.apache.org/proper/commons-pool") } } - library("Couchbase Client", "3.11.2") { + library("Couchbase Client", "3.11.3") { group("com.couchbase.client") { modules = [ "java-client" @@ -401,7 +401,7 @@ bom { releaseNotes("https://github.com/ehcache/ehcache3/releases/tag/v{version}") } } - library("Elasticsearch Client", "9.3.4") { + library("Elasticsearch Client", "9.4.1") { prohibit { contains "-alpha" contains "-beta" @@ -635,7 +635,7 @@ bom { releaseNotes("https://github.com/hazelcast/hazelcast/releases/tag/v{version}") } } - library("Hibernate", "7.3.4.Final") { + library("Hibernate", "7.4.0.Final") { group("org.hibernate.orm") { modules = [ "hibernate-agroal", @@ -1035,7 +1035,7 @@ bom { ] } } - library("Jaxen", "2.0.1") { + library("Jaxen", "2.0.3") { group("jaxen") { modules = [ "jaxen" @@ -1143,7 +1143,7 @@ bom { ] } } - library("jOOQ", "3.21.3") { + library("jOOQ", "3.21.4") { group("org.jooq") { bom("jooq-bom") plugins = [ @@ -1316,7 +1316,7 @@ bom { releaseNotes("https://github.com/Kotlin/kotlinx.serialization/releases/tag/v{version}") } } - library("Lettuce", "7.5.1.RELEASE") { + library("Lettuce", "7.5.2.RELEASE") { prohibit { contains ".BETA" because "we don't want betas" @@ -1340,7 +1340,7 @@ bom { releaseNotes("https://github.com/redis/lettuce/releases/tag/{version}") } } - library("Liquibase", "5.0.2") { + library("Liquibase", "5.0.3") { group("org.liquibase") { modules = [ "liquibase-cdi", @@ -1480,7 +1480,7 @@ bom { releaseNotes("https://github.com/apache/maven-deploy-plugin/releases/tag/maven-deploy-plugin-{version}") } } - library("Maven Enforcer Plugin", "3.6.2") { + library("Maven Enforcer Plugin", "3.6.3") { group("org.apache.maven.plugins") { plugins = [ "maven-enforcer-plugin" @@ -1613,7 +1613,7 @@ bom { releaseNotes("https://github.com/apache/maven-war-plugin/releases/tag/maven-war-plugin-{version}") } } - library("Micrometer", "1.17.0-RC1") { + library("Micrometer", "1.17.0-SNAPSHOT") { considerSnapshots() group("io.micrometer") { modules = [ @@ -1636,7 +1636,7 @@ bom { releaseNotes("https://github.com/micrometer-metrics/micrometer/releases/tag/v{version}") } } - library("Micrometer Tracing", "1.7.0-RC1") { + library("Micrometer Tracing", "1.7.0-SNAPSHOT") { considerSnapshots() group("io.micrometer") { bom("micrometer-tracing-bom") @@ -1658,7 +1658,7 @@ bom { releaseNotes("https://github.com/mockito/mockito/releases/tag/v{version}") } } - library("MongoDB", "5.7.0-beta1") { + library("MongoDB", "5.7.0") { alignWith { version { of "org.mongodb:mongodb-driver-core" @@ -1729,7 +1729,7 @@ bom { ] } } - library("Neo4j Java Driver", "6.0.5") { + library("Neo4j Java Driver", "6.1.0") { alignWith { version { of "org.neo4j.driver:neo4j-java-driver" @@ -1752,7 +1752,7 @@ bom { releaseNotes("https://github.com/neo4j/neo4j-java-driver/releases/tag/{version}") } } - library("Netty", "4.2.13.Final") { + library("Netty", "4.2.14.Final") { prohibit { contains ".Alpha" contains ".Beta" @@ -1768,7 +1768,7 @@ bom { releaseNotes("https://github.com/netty/netty/releases/tag/netty-{version}") } } - library("OpenTelemetry", "1.60.1") { + library("OpenTelemetry", "1.62.0") { group("io.opentelemetry") { bom("opentelemetry-bom") } @@ -1842,7 +1842,7 @@ bom { releaseNotes("https://github.com/oracle/oracle-r2dbc/releases/tag/{version}") } } - library("Protobuf Maven Plugin", "5.1.3") { + library("Protobuf Maven Plugin", "5.1.4") { group("io.github.ascopes") { plugins = [ "protobuf-maven-plugin" @@ -1930,7 +1930,7 @@ bom { releaseNotes("https://github.com/googleapis/sdk-platform-java/releases/tag/v-{version}") } } - library("Protobuf Java", "4.34.1") { + library("Protobuf Java", "4.34.2") { group("com.google.protobuf") { bom("protobuf-bom") } @@ -2081,7 +2081,7 @@ bom { ] } } - library("Reactor Bom", "2025.0.5") { + library("Reactor Bom", "2025.0.6-SNAPSHOT") { considerSnapshots() calendarName = "Reactor" group("io.projectreactor") { @@ -2484,7 +2484,7 @@ bom { releaseNotes("https://github.com/sendgrid/sendgrid-java/releases/tag/{version}") } } - library("SLF4J", "2.0.17") { + library("SLF4J", "2.0.18") { prohibit { contains "-alpha" because "we don't want alphas" @@ -2512,7 +2512,7 @@ bom { ] } } - library("Spring AMQP", "4.1.0-RC1") { + library("Spring AMQP", "4.1.0-SNAPSHOT") { considerSnapshots() group("org.springframework.amqp") { bom("spring-amqp-bom") @@ -2527,7 +2527,7 @@ bom { releaseNotes("https://github.com/spring-projects/spring-amqp/releases/tag/v{version}") } } - library("Spring Batch", "6.0.3") { + library("Spring Batch", "6.0.4-SNAPSHOT") { considerSnapshots() group("org.springframework.batch") { bom("spring-batch-bom") @@ -2542,7 +2542,7 @@ bom { releaseNotes("https://github.com/spring-projects/spring-batch/releases/tag/v{version}") } } - library("Spring Data Bom", "2026.0.0-RC1") { + library("Spring Data Bom", "2026.0.0-SNAPSHOT") { considerSnapshots() calendarName = "Spring Data Release" group("org.springframework.data") { @@ -2590,7 +2590,7 @@ bom { releaseNotes("https://github.com/spring-projects/spring-graphql/releases/tag/v{version}") } } - library("Spring gRPC", "1.1.0-RC1") { + library("Spring gRPC", "1.1.0-SNAPSHOT") { considerSnapshots() group("org.springframework.grpc") { modules = [ @@ -2607,7 +2607,7 @@ bom { releaseNotes("https://github.com/spring-projects/spring-grpc/releases/tag/v{version}") } } - library("Spring HATEOAS", "3.1.0-RC1") { + library("Spring HATEOAS", "3.1.0-SNAPSHOT") { considerSnapshots() group("org.springframework.hateoas") { modules = [ @@ -2624,7 +2624,7 @@ bom { releaseNotes("https://github.com/spring-projects/spring-hateoas/releases/tag/{version}") } } - library("Spring Integration", "7.1.0-RC1") { + library("Spring Integration", "7.1.0-SNAPSHOT") { considerSnapshots() group("org.springframework.integration") { bom("spring-integration-bom") @@ -2639,7 +2639,7 @@ bom { releaseNotes("https://github.com/spring-projects/spring-integration/releases/tag/v{version}") } } - library("Spring Kafka", "4.1.0-RC1") { + library("Spring Kafka", "4.1.0-SNAPSHOT") { considerSnapshots() group("org.springframework.kafka") { modules = [ @@ -2657,7 +2657,7 @@ bom { releaseNotes("https://github.com/spring-projects/spring-kafka/releases/tag/v{version}") } } - library("Spring LDAP", "4.1.0-RC1") { + library("Spring LDAP", "4.1.0-SNAPSHOT") { considerSnapshots() group("org.springframework.ldap") { modules = [ @@ -2677,7 +2677,7 @@ bom { releaseNotes("https://github.com/spring-projects/spring-ldap/releases/tag/{version}") } } - library("Spring Pulsar", "2.0.5") { + library("Spring Pulsar", "2.0.6-SNAPSHOT") { considerSnapshots() group("org.springframework.pulsar") { bom("spring-pulsar-bom") @@ -2692,7 +2692,7 @@ bom { releaseNotes("https://github.com/spring-projects/spring-pulsar/releases/tag/v{version}") } } - library("Spring RESTDocs", "4.0.0") { + library("Spring RESTDocs", "4.0.1-SNAPSHOT") { considerSnapshots() group("org.springframework.restdocs") { bom("spring-restdocs-bom") @@ -2707,7 +2707,7 @@ bom { releaseNotes("https://github.com/spring-projects/spring-restdocs/releases/tag/v{version}") } } - library("Spring Security", "7.1.0-RC1") { + library("Spring Security", "7.1.0-SNAPSHOT") { considerSnapshots() group("org.springframework.security") { bom("spring-security-bom") @@ -2722,7 +2722,7 @@ bom { releaseNotes("https://github.com/spring-projects/spring-security/releases/tag/{version}") } } - library("Spring Session", "4.1.0-RC1") { + library("Spring Session", "4.1.0-SNAPSHOT") { considerSnapshots() prohibit { startsWith(["Apple-", "Bean-", "Corn-", "Dragonfruit-"]) @@ -2745,7 +2745,7 @@ bom { releaseNotes("https://github.com/spring-projects/spring-session/releases/tag/{version}") } } - library("Spring WS", "5.0.1") { + library("Spring WS", "5.0.2-SNAPSHOT") { considerSnapshots() group("org.springframework.ws") { bom("spring-ws-bom")