Skip to content

Commit 7b35fab

Browse files
committed
Upgrade to Derby 10.15.2.0
Closes gh-29509
1 parent 75fce16 commit 7b35fab

File tree

4 files changed

+8
-3
lines changed

4 files changed

+8
-3
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,7 @@ private boolean driverClassIsLoadable() {
195195
throw ex;
196196
}
197197
catch (Throwable ex) {
198+
ex.printStackTrace();
198199
return false;
199200
}
200201
}

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,11 +174,13 @@ bom {
174174
]
175175
}
176176
}
177-
library("Derby", "10.14.2.0") {
177+
library("Derby", "10.15.2.0") {
178178
group("org.apache.derby") {
179179
modules = [
180180
"derby",
181-
"derbyclient"
181+
"derbyclient",
182+
"derbyshared",
183+
"derbytools"
182184
]
183185
}
184186
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ dependencies {
3737
optional("io.projectreactor:reactor-core")
3838
optional("io.r2dbc:r2dbc-spi")
3939
optional("jakarta.servlet:jakarta.servlet-api")
40-
optional("org.apache.derby:derby")
40+
optional("org.apache.derby:derbytools")
4141
optional("org.hibernate:hibernate-core-jakarta")
4242
optional("org.springframework:spring-jdbc")
4343
optional("org.springframework:spring-orm")
@@ -52,6 +52,7 @@ dependencies {
5252
testImplementation("ch.qos.logback:logback-classic")
5353
testImplementation("com.h2database:h2")
5454
testImplementation("com.zaxxer:HikariCP")
55+
testImplementation("org.apache.derby:derby")
5556
testImplementation("org.apache.derby:derbyclient")
5657
testImplementation("org.apache.tomcat.embed:tomcat-embed-websocket")
5758
testImplementation("org.apache.tomcat.embed:tomcat-embed-core")

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ dependencies {
118118
testImplementation("mysql:mysql-connector-java")
119119
testImplementation("net.sourceforge.jtds:jtds")
120120
testImplementation("org.apache.derby:derby")
121+
testImplementation("org.apache.derby:derbytools")
121122
testImplementation("org.awaitility:awaitility")
122123
testImplementation("org.eclipse.jetty:jetty-client")
123124
testImplementation("org.eclipse.jetty.http2:http2-client")

0 commit comments

Comments
 (0)