From f0688e8222d0aa826d4d0cc093fb88890f5b3636 Mon Sep 17 00:00:00 2001 From: Chris Cochrane <78791827+chriscochrane@users.noreply.github.com> Date: Thu, 24 Oct 2024 13:28:33 +0100 Subject: [PATCH 1/3] Jetty upgrade (#7850) --- constants.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/constants.properties b/constants.properties index d29b038341..90a9a495d9 100644 --- a/constants.properties +++ b/constants.properties @@ -53,7 +53,7 @@ artemisVersion=2.19.1 # TODO Upgrade Jackson only when corda is using kotlin 1.3.10 jacksonVersion=2.17.2 jacksonKotlinVersion=2.9.7 -jettyVersion=9.4.53.v20231009 +jettyVersion=9.4.56.v20240826 jerseyVersion=2.25 servletVersion=4.0.1 assertjVersion=3.12.2 From af83cb9c8c872d4077d55aa4bcd9ad7fcec9767a Mon Sep 17 00:00:00 2001 From: Chris Cochrane <78791827+chriscochrane@users.noreply.github.com> Date: Thu, 24 Oct 2024 13:29:04 +0100 Subject: [PATCH 2/3] Jetty upgrade (#7849) --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 9ae8e9bdf9..7cf3adb4bd 100644 --- a/build.gradle +++ b/build.gradle @@ -65,7 +65,7 @@ buildscript { // TODO Upgrade Jackson only when corda is using kotlin 1.3.10 ext.jackson_version = '2.17.2' ext.jackson_kotlin_version = '2.9.7' - ext.jetty_version = '9.4.53.v20231009' + ext.jetty_version = '9.4.56.v20240826' ext.jersey_version = '2.25' ext.servlet_version = '4.0.1' ext.assertj_version = '3.12.2' From 5b9d65ad5190a7ed1b065a6ca496462d345a3be2 Mon Sep 17 00:00:00 2001 From: Chris Cochrane <78791827+chriscochrane@users.noreply.github.com> Date: Mon, 28 Oct 2024 13:25:52 +0000 Subject: [PATCH 3/3] MockNetwork remove hibernate sessions on stop (#7857) --- .../net/corda/testing/node/internal/InternalMockNetwork.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/InternalMockNetwork.kt b/testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/InternalMockNetwork.kt index 4df37b8258..cf7a5695f9 100644 --- a/testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/InternalMockNetwork.kt +++ b/testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/InternalMockNetwork.kt @@ -84,6 +84,7 @@ import java.time.Clock import java.util.concurrent.TimeUnit import java.util.concurrent.atomic.AtomicInteger import java.util.concurrent.atomic.AtomicReference +import org.hibernate.internal.SessionFactoryRegistry val MOCK_VERSION_INFO = VersionInfo(PLATFORM_VERSION, "Mock release", "Mock revision", "Mock Vendor") @@ -621,6 +622,7 @@ open class InternalMockNetwork(cordappPackages: List = emptyList(), } messagingNetwork.stop() } + SessionFactoryRegistry.INSTANCE.clearRegistrations() } /** Block until all scheduled activity, active flows and network activity has ceased. */