From 15406bed756db69ad1cebb1ad5c7689b9ab1e431 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <andy.wilkinson@broadcom.com>
Date: Thu, 4 Jun 2026 08:57:04 +0100
Subject: [PATCH] Reapply "Upgrade to Netty 4.2.15.Final"

This reverts commit 490614fe7e0d711f33262a53c18d9348afef9759.

Closes gh-50692
---
 module/spring-boot-r2dbc/build.gradle          | 6 ++++++
 platform/spring-boot-dependencies/build.gradle | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/module/spring-boot-r2dbc/build.gradle b/module/spring-boot-r2dbc/build.gradle
index eb87eca4f413..84a992cb513b 100644
--- a/module/spring-boot-r2dbc/build.gradle
+++ b/module/spring-boot-r2dbc/build.gradle
@@ -90,3 +90,9 @@ tasks.named("compileTestJava") {
 tasks.named("compileDockerTestJava") {
 	options.nullability.checking = "tests"
 }
+
+tasks.named("dockerTest") {
+	systemProperties = [
+		"io.netty.handler.ssl.defaultEndpointVerificationAlgorithm" : "NONE"
+	]
+}
diff --git a/platform/spring-boot-dependencies/build.gradle b/platform/spring-boot-dependencies/build.gradle
index b8b04d3845e8..1e3180c3fb50 100644
--- a/platform/spring-boot-dependencies/build.gradle
+++ b/platform/spring-boot-dependencies/build.gradle
@@ -1693,7 +1693,7 @@ bom {
 			releaseNotes("https://github.com/neo4j/neo4j-java-driver/releases/tag/{version}")
 		}
 	}
-	library("Netty", "4.2.14.Final") {
+	library("Netty", "4.2.15.Final") {
 		prohibit {
 			contains ".Alpha"
 			contains ".Beta"