root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Upgrade to Derby 10.15.2.0 

Closes gh-29509
This commit is contained in:
Andy Wilkinson 2022-01-20 16:09:56 +00:00
parent 75fce16633
commit 7b35fabf07
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceProperties.java
View File

@ -195,6 +195,7 @@ public class DataSourceProperties implements BeanClassLoaderAware, InitializingB
throw ex; throw ex;
} }
catch (Throwable ex) { catch (Throwable ex) {
ex.printStackTrace();
return false; return false;
} }
} }

6
spring-boot-project/spring-boot-dependencies/build.gradle
View File

@ -174,11 +174,13 @@ bom {
] ]
} }
} }
library("Derby", "10.14.2.0") { library("Derby", "10.15.2.0") {
group("org.apache.derby") { group("org.apache.derby") {
modules = [ modules = [
"derby", "derby",
"derbyclient" "derbyclient",
"derbyshared",
"derbytools"
] ]
} }
} }

3
spring-boot-project/spring-boot-devtools/build.gradle
View File

@ -37,7 +37,7 @@ dependencies {
optional("io.projectreactor:reactor-core") optional("io.projectreactor:reactor-core")
optional("io.r2dbc:r2dbc-spi") optional("io.r2dbc:r2dbc-spi")
optional("jakarta.servlet:jakarta.servlet-api") optional("jakarta.servlet:jakarta.servlet-api")
optional("org.apache.derby:derby") optional("org.apache.derby:derbytools")
optional("org.hibernate:hibernate-core-jakarta") optional("org.hibernate:hibernate-core-jakarta")
optional("org.springframework:spring-jdbc") optional("org.springframework:spring-jdbc")
optional("org.springframework:spring-orm") optional("org.springframework:spring-orm")
@ -52,6 +52,7 @@ dependencies {
testImplementation("ch.qos.logback:logback-classic") testImplementation("ch.qos.logback:logback-classic")
testImplementation("com.h2database:h2") testImplementation("com.h2database:h2")
testImplementation("com.zaxxer:HikariCP") testImplementation("com.zaxxer:HikariCP")
testImplementation("org.apache.derby:derby")
testImplementation("org.apache.derby:derbyclient") testImplementation("org.apache.derby:derbyclient")
testImplementation("org.apache.tomcat.embed:tomcat-embed-websocket") testImplementation("org.apache.tomcat.embed:tomcat-embed-websocket")
testImplementation("org.apache.tomcat.embed:tomcat-embed-core") testImplementation("org.apache.tomcat.embed:tomcat-embed-core")

1
spring-boot-project/spring-boot/build.gradle
View File

@ -118,6 +118,7 @@ dependencies {
testImplementation("mysql:mysql-connector-java") testImplementation("mysql:mysql-connector-java")
testImplementation("net.sourceforge.jtds:jtds") testImplementation("net.sourceforge.jtds:jtds")
testImplementation("org.apache.derby:derby") testImplementation("org.apache.derby:derby")
testImplementation("org.apache.derby:derbytools")
testImplementation("org.awaitility:awaitility") testImplementation("org.awaitility:awaitility")
testImplementation("org.eclipse.jetty:jetty-client") testImplementation("org.eclipse.jetty:jetty-client")
testImplementation("org.eclipse.jetty.http2:http2-client") testImplementation("org.eclipse.jetty.http2:http2-client")