From f1567fb21ab7b093304063a27b11729f431b035b Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Fri, 30 Jun 2023 12:47:30 +0200 Subject: [PATCH 1/2] Raise beforeCompletion/afterCompletion exception log level to error Closes gh-30776 --- .../transaction/reactive/TransactionSynchronizationUtils.java | 4 ++-- .../transaction/support/TransactionSynchronizationUtils.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-tx/src/main/java/org/springframework/transaction/reactive/TransactionSynchronizationUtils.java b/spring-tx/src/main/java/org/springframework/transaction/reactive/TransactionSynchronizationUtils.java index 7eaa43a0c7..192580a64c 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/reactive/TransactionSynchronizationUtils.java +++ b/spring-tx/src/main/java/org/springframework/transaction/reactive/TransactionSynchronizationUtils.java @@ -85,7 +85,7 @@ abstract class TransactionSynchronizationUtils { public static Mono triggerBeforeCompletion(Collection synchronizations) { return Flux.fromIterable(synchronizations) .concatMap(TransactionSynchronization::beforeCompletion).onErrorContinue((t, o) -> - logger.debug("TransactionSynchronization.beforeCompletion threw exception", t)).then(); + logger.error("TransactionSynchronization.beforeCompletion threw exception", t)).then(); } /** @@ -115,7 +115,7 @@ abstract class TransactionSynchronizationUtils { Collection synchronizations, int completionStatus) { return Flux.fromIterable(synchronizations).concatMap(it -> it.afterCompletion(completionStatus)) - .onErrorContinue((t, o) -> logger.debug("TransactionSynchronization.afterCompletion threw exception", t)).then(); + .onErrorContinue((t, o) -> logger.error("TransactionSynchronization.afterCompletion threw exception", t)).then(); } diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronizationUtils.java b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronizationUtils.java index f97dd23285..33854e60f0 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronizationUtils.java +++ b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronizationUtils.java @@ -108,7 +108,7 @@ public abstract class TransactionSynchronizationUtils { synchronization.beforeCompletion(); } catch (Throwable ex) { - logger.debug("TransactionSynchronization.beforeCompletion threw exception", ex); + logger.error("TransactionSynchronization.beforeCompletion threw exception", ex); } } } @@ -172,7 +172,7 @@ public abstract class TransactionSynchronizationUtils { synchronization.afterCompletion(completionStatus); } catch (Throwable ex) { - logger.debug("TransactionSynchronization.afterCompletion threw exception", ex); + logger.error("TransactionSynchronization.afterCompletion threw exception", ex); } } } From 1e403d16061fd7f40cd229dd106bdbbdb0ba212d Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Fri, 30 Jun 2023 12:58:28 +0200 Subject: [PATCH 2/2] Upgrade to Groovy 4.0.13 and Checkstyle 10.12.1 --- build.gradle | 2 +- framework-platform/framework-platform.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 3323daddf7..cf3aa535d1 100644 --- a/build.gradle +++ b/build.gradle @@ -75,7 +75,7 @@ configure([rootProject] + javaProjects) { project -> } checkstyle { - toolVersion = "10.12.0" + toolVersion = "10.12.1" configDirectory.set(rootProject.file("src/checkstyle")) } diff --git a/framework-platform/framework-platform.gradle b/framework-platform/framework-platform.gradle index d16b7088da..041014f7af 100644 --- a/framework-platform/framework-platform.gradle +++ b/framework-platform/framework-platform.gradle @@ -13,7 +13,7 @@ dependencies { api(platform("io.netty:netty5-bom:5.0.0.Alpha5")) api(platform("io.projectreactor:reactor-bom:2022.0.8")) api(platform("io.rsocket:rsocket-bom:1.1.3")) - api(platform("org.apache.groovy:groovy-bom:4.0.12")) + api(platform("org.apache.groovy:groovy-bom:4.0.13")) api(platform("org.apache.logging.log4j:log4j-bom:2.20.0")) api(platform("org.eclipse.jetty:jetty-bom:11.0.15")) api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.4"))