From 7b35fabf07251dc55e29c5e9af02e3b60eb7d174 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 20 Jan 2022 16:09:56 +0000 Subject: [PATCH] Upgrade to Derby 10.15.2.0 Closes gh-29509 --- .../boot/autoconfigure/jdbc/DataSourceProperties.java | 1 + spring-boot-project/spring-boot-dependencies/build.gradle | 6 ++++-- spring-boot-project/spring-boot-devtools/build.gradle | 3 ++- spring-boot-project/spring-boot/build.gradle | 1 + 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceProperties.java index 0cbc87f222..80ee3f0bbb 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceProperties.java @@ -195,6 +195,7 @@ public class DataSourceProperties implements BeanClassLoaderAware, InitializingB throw ex; } catch (Throwable ex) { + ex.printStackTrace(); return false; } } diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 107cbfcedf..e98159c773 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -174,11 +174,13 @@ bom { ] } } - library("Derby", "10.14.2.0") { + library("Derby", "10.15.2.0") { group("org.apache.derby") { modules = [ "derby", - "derbyclient" + "derbyclient", + "derbyshared", + "derbytools" ] } } diff --git a/spring-boot-project/spring-boot-devtools/build.gradle b/spring-boot-project/spring-boot-devtools/build.gradle index 25e98d6d1b..4a424d1c95 100644 --- a/spring-boot-project/spring-boot-devtools/build.gradle +++ b/spring-boot-project/spring-boot-devtools/build.gradle @@ -37,7 +37,7 @@ dependencies { optional("io.projectreactor:reactor-core") optional("io.r2dbc:r2dbc-spi") optional("jakarta.servlet:jakarta.servlet-api") - optional("org.apache.derby:derby") + optional("org.apache.derby:derbytools") optional("org.hibernate:hibernate-core-jakarta") optional("org.springframework:spring-jdbc") optional("org.springframework:spring-orm") @@ -52,6 +52,7 @@ dependencies { testImplementation("ch.qos.logback:logback-classic") testImplementation("com.h2database:h2") testImplementation("com.zaxxer:HikariCP") + testImplementation("org.apache.derby:derby") testImplementation("org.apache.derby:derbyclient") testImplementation("org.apache.tomcat.embed:tomcat-embed-websocket") testImplementation("org.apache.tomcat.embed:tomcat-embed-core") diff --git a/spring-boot-project/spring-boot/build.gradle b/spring-boot-project/spring-boot/build.gradle index 9d39951b64..bc8bf35891 100644 --- a/spring-boot-project/spring-boot/build.gradle +++ b/spring-boot-project/spring-boot/build.gradle @@ -118,6 +118,7 @@ dependencies { testImplementation("mysql:mysql-connector-java") testImplementation("net.sourceforge.jtds:jtds") testImplementation("org.apache.derby:derby") + testImplementation("org.apache.derby:derbytools") testImplementation("org.awaitility:awaitility") testImplementation("org.eclipse.jetty:jetty-client") testImplementation("org.eclipse.jetty.http2:http2-client")