diff --git a/core/pom.xml b/core/pom.xml
index 4cb0fe055fd0a..f2d1f4eb144a9 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -347,6 +347,11 @@
derby
test
+
+ org.apache.derby
+ derbytools
+ test
+
org.seleniumhq.selenium
selenium-java
diff --git a/dev/deps/spark-deps-hadoop-3-hive-2.3 b/dev/deps/spark-deps-hadoop-3-hive-2.3
index ebfe6acad9601..ba7c7aee894a6 100644
--- a/dev/deps/spark-deps-hadoop-3-hive-2.3
+++ b/dev/deps/spark-deps-hadoop-3-hive-2.3
@@ -59,7 +59,9 @@ datanucleus-core/4.1.17//datanucleus-core-4.1.17.jar
datanucleus-rdbms/4.1.19//datanucleus-rdbms-4.1.19.jar
datasketches-java/3.3.0//datasketches-java-3.3.0.jar
datasketches-memory/2.1.0//datasketches-memory-2.1.0.jar
-derby/10.14.2.0//derby-10.14.2.0.jar
+derby/10.16.1.1//derby-10.16.1.1.jar
+derbyshared/10.16.1.1//derbyshared-10.16.1.1.jar
+derbytools/10.16.1.1//derbytools-10.16.1.1.jar
dropwizard-metrics-hadoop-metrics2-reporter/0.1.2//dropwizard-metrics-hadoop-metrics2-reporter-0.1.2.jar
flatbuffers-java/1.12.0//flatbuffers-java-1.12.0.jar
gcs-connector/hadoop3-2.2.18/shaded/gcs-connector-hadoop3-2.2.18-shaded.jar
diff --git a/pom.xml b/pom.xml
index 27ee42f103dd2..33cb6cf257f6e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -138,8 +138,8 @@
2.3
3.4.1
-
- 10.14.2.0
+
+ 10.16.1.1
1.13.1
1.9.2
shaded-protobuf
@@ -962,6 +962,11 @@
derby
${derby.version}
+
+ org.apache.derby
+ derbytools
+ ${derby.version}
+
io.dropwizard.metrics
metrics-core
diff --git a/sql/core/pom.xml b/sql/core/pom.xml
index 185d50c018c6a..c83104a6bd456 100644
--- a/sql/core/pom.xml
+++ b/sql/core/pom.xml
@@ -194,6 +194,11 @@
derby
test
+
+ org.apache.derby
+ derbytools
+ test
+
org.apache.parquet
parquet-avro
diff --git a/sql/hive-thriftserver/src/test/scala/org/apache/spark/sql/hive/thriftserver/CliSuite.scala b/sql/hive-thriftserver/src/test/scala/org/apache/spark/sql/hive/thriftserver/CliSuite.scala
index 649c985cade98..bbcbf80126b0c 100644
--- a/sql/hive-thriftserver/src/test/scala/org/apache/spark/sql/hive/thriftserver/CliSuite.scala
+++ b/sql/hive-thriftserver/src/test/scala/org/apache/spark/sql/hive/thriftserver/CliSuite.scala
@@ -812,7 +812,7 @@ class CliSuite extends SparkFunSuite {
val catalogUrl =
s"spark.sql.catalog.$catalogName.url=jdbc:derby:memory:$catalogName;create=true"
val catalogDriver =
- s"spark.sql.catalog.$catalogName.driver=org.apache.derby.jdbc.AutoloadedDriver"
+ s"spark.sql.catalog.$catalogName.driver=org.apache.derby.iapi.jdbc.AutoloadedDriver"
val catalogConfigs =
Seq(catalogImpl, catalogDriver, catalogUrl, "spark.sql.catalogImplementation=in-memory")
.flatMap(Seq("--conf", _))
diff --git a/sql/hive/pom.xml b/sql/hive/pom.xml
index 8b8842333793f..42618fe5bc22d 100644
--- a/sql/hive/pom.xml
+++ b/sql/hive/pom.xml
@@ -172,6 +172,10 @@
org.apache.derby
derby
+
+ org.apache.derby
+ derbytools
+
org.scala-lang
scala-compiler