From 0a92d84778dcb03dd5bf2860f2d997d1db2687f4 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Tue, 25 Jan 2022 23:50:45 +0100 Subject: [PATCH 1/3] Check open status before close call (aligned with EntityManagerFactoryUtils) Closes gh-27972 --- .../springframework/orm/hibernate5/SessionFactoryUtils.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate5/SessionFactoryUtils.java b/spring-orm/src/main/java/org/springframework/orm/hibernate5/SessionFactoryUtils.java index d3b61969aac..f9e482cd93f 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate5/SessionFactoryUtils.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate5/SessionFactoryUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -133,7 +133,9 @@ public abstract class SessionFactoryUtils { public static void closeSession(@Nullable Session session) { if (session != null) { try { - session.close(); + if (session.isOpen()) { + session.close(); + } } catch (Throwable ex) { logger.error("Failed to release Hibernate Session", ex); From 993b6d1351d6a92eb27b60e47d77cab8083b1b87 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Tue, 25 Jan 2022 23:51:22 +0100 Subject: [PATCH 2/3] Upgrade to Tomcat 9.0.58, Protobuf 3.19.3, Rome 1.18, H2 2.1.210, SLF4J 1.7.35, Mockito 4.3.1, HtmlUnit 2.57, XMLUnit 2.9, Checkstyle 9.2.1 --- build.gradle | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index d2b3fcf89fd..0b73d65a8de 100644 --- a/build.gradle +++ b/build.gradle @@ -45,7 +45,7 @@ configure(allprojects) { project -> entry 'log4j-jul' entry 'log4j-slf4j-impl' } - dependency "org.slf4j:slf4j-api:1.7.33" + dependency "org.slf4j:slf4j-api:1.7.35" dependency("com.google.code.findbugs:findbugs:3.0.1") { exclude group: "dom4j", name: "dom4j" } @@ -77,7 +77,7 @@ configure(allprojects) { project -> exclude group: "stax", name: "stax-api" } dependency "com.google.code.gson:gson:2.8.9" - dependency "com.google.protobuf:protobuf-java-util:3.19.1" + dependency "com.google.protobuf:protobuf-java-util:3.19.3" dependency "com.googlecode.protobuf-java-format:protobuf-java-format:1.4" dependency("com.thoughtworks.xstream:xstream:1.4.18") { exclude group: "xpp3", name: "xpp3_min" @@ -94,10 +94,10 @@ configure(allprojects) { project -> dependency "org.ogce:xpp3:1.1.6" dependency "org.yaml:snakeyaml:1.30" - dependency "com.h2database:h2:2.0.206" + dependency "com.h2database:h2:2.1.210" dependency "com.github.ben-manes.caffeine:caffeine:2.9.3" dependency "com.github.librepdf:openpdf:1.3.26" - dependency "com.rometools:rome:1.16.0" + dependency "com.rometools:rome:1.18.0" dependency "commons-io:commons-io:2.5" dependency "io.vavr:vavr:0.10.4" dependency "net.sf.jopt-simple:jopt-simple:5.0.4" @@ -128,14 +128,14 @@ configure(allprojects) { project -> dependency "org.webjars:webjars-locator-core:0.48" dependency "org.webjars:underscorejs:1.8.3" - dependencySet(group: 'org.apache.tomcat', version: '9.0.56') { + dependencySet(group: 'org.apache.tomcat', version: '9.0.58') { entry 'tomcat-util' entry('tomcat-websocket') { exclude group: "org.apache.tomcat", name: "tomcat-servlet-api" exclude group: "org.apache.tomcat", name: "tomcat-websocket-api" } } - dependencySet(group: 'org.apache.tomcat.embed', version: '9.0.56') { + dependencySet(group: 'org.apache.tomcat.embed', version: '9.0.58') { entry 'tomcat-embed-core' entry 'tomcat-embed-websocket' } @@ -192,13 +192,13 @@ configure(allprojects) { project -> dependency "org.hamcrest:hamcrest:2.1" dependency "org.awaitility:awaitility:3.1.6" dependency "org.assertj:assertj-core:3.22.0" - dependencySet(group: 'org.xmlunit', version: '2.8.4') { + dependencySet(group: 'org.xmlunit', version: '2.9.0') { entry 'xmlunit-assertj' entry('xmlunit-matchers') { exclude group: "org.hamcrest", name: "hamcrest-core" } } - dependencySet(group: 'org.mockito', version: '4.2.0') { + dependencySet(group: 'org.mockito', version: '4.3.1') { entry('mockito-core') { exclude group: "org.hamcrest", name: "hamcrest-core" } @@ -206,7 +206,7 @@ configure(allprojects) { project -> } dependency "io.mockk:mockk:1.12.1" - dependency("net.sourceforge.htmlunit:htmlunit:2.56.0") { + dependency("net.sourceforge.htmlunit:htmlunit:2.57.0") { exclude group: "commons-logging", name: "commons-logging" } dependency("org.seleniumhq.selenium:htmlunit-driver:2.56.0") { @@ -340,7 +340,7 @@ configure([rootProject] + javaProjects) { project -> } checkstyle { - toolVersion = "9.2" + toolVersion = "9.2.1" configDirectory.set(rootProject.file("src/checkstyle")) } From 1272cd557d14f1ecf28e518b6bbd6edcd62e0536 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Wed, 26 Jan 2022 00:02:12 +0100 Subject: [PATCH 3/3] Upgrade to SmallRye Mutiny 1.3.1, Aalto 1.3.1, Woodstox 6.2.8 --- build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 0b73d65a8de..99304936499 100644 --- a/build.gradle +++ b/build.gradle @@ -68,12 +68,12 @@ configure(allprojects) { project -> dependency "io.reactivex:rxjava-reactive-streams:1.2.1" dependency "io.reactivex.rxjava2:rxjava:2.2.21" dependency "io.reactivex.rxjava3:rxjava:3.1.3" - dependency "io.smallrye.reactive:mutiny:1.2.0" + dependency "io.smallrye.reactive:mutiny:1.3.1" dependency "io.projectreactor.tools:blockhound:1.0.6.RELEASE" dependency "com.caucho:hessian:4.0.63" - dependency "com.fasterxml:aalto-xml:1.3.0" - dependency("com.fasterxml.woodstox:woodstox-core:6.2.7") { + dependency "com.fasterxml:aalto-xml:1.3.1" + dependency("com.fasterxml.woodstox:woodstox-core:6.2.8") { exclude group: "stax", name: "stax-api" } dependency "com.google.code.gson:gson:2.8.9"