Merge branch '2.6.x' into 2.7.x

Closes gh-31814

Author: wilkinsona

spring-boot-project/spring-boot-dependencies/build.gradle

@@ -269,7 +269,10 @@ bom {
 		group("org.apache.derby") {
 			modules = [
 				"derby",
-				"derbyclient"
+				"derbyclient",
+				"derbynet",
+				"derbyoptionaltools",
+				"derbytools"
 			]
 		}
 	}