diff --git a/java/flight/flight-sql-jdbc-core/pom.xml b/java/flight/flight-sql-jdbc-core/pom.xml
index 74a2f8d320f37..6c577954f8fc5 100644
--- a/java/flight/flight-sql-jdbc-core/pom.xml
+++ b/java/flight/flight-sql-jdbc-core/pom.xml
@@ -128,7 +128,7 @@
org.apache.calcite.avatica
avatica
- 1.18.0
+ 1.24.0
diff --git a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ConnectionMutualTlsTest.java b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ConnectionMutualTlsTest.java
index 927b3e426c6ba..cc44cc57be9b3 100644
--- a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ConnectionMutualTlsTest.java
+++ b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ConnectionMutualTlsTest.java
@@ -36,7 +36,6 @@
import org.apache.arrow.memory.BufferAllocator;
import org.apache.arrow.memory.RootAllocator;
import org.apache.arrow.util.AutoCloseables;
-import org.apache.calcite.avatica.org.apache.http.auth.UsernamePasswordCredentials;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@@ -112,15 +111,13 @@ public void tearDown() throws Exception {
*/
@Test
public void testGetEncryptedClientAuthenticated() throws Exception {
- final UsernamePasswordCredentials credentials = new UsernamePasswordCredentials(
- userTest, passTest);
try (ArrowFlightSqlClientHandler client =
new ArrowFlightSqlClientHandler.Builder()
.withHost(FLIGHT_SERVER_TEST_RULE.getHost())
.withPort(FLIGHT_SERVER_TEST_RULE.getPort())
- .withUsername(credentials.getUserName())
- .withPassword(credentials.getPassword())
+ .withUsername(userTest)
+ .withPassword(passTest)
.withTlsRootCertificates(tlsRootCertsPath)
.withClientCertificate(clientMTlsCertPath)
.withClientKey(clientMTlsKeyPath)
@@ -137,15 +134,13 @@ public void testGetEncryptedClientAuthenticated() throws Exception {
*/
@Test
public void testGetEncryptedClientWithBadMTlsCertPath() {
- final UsernamePasswordCredentials credentials = new UsernamePasswordCredentials(
- userTest, passTest);
assertThrows(SQLException.class, () -> {
try (ArrowFlightSqlClientHandler handler = new ArrowFlightSqlClientHandler.Builder()
.withHost(FLIGHT_SERVER_TEST_RULE.getHost())
.withPort(FLIGHT_SERVER_TEST_RULE.getPort())
- .withUsername(credentials.getUserName())
- .withPassword(credentials.getPassword())
+ .withUsername(userTest)
+ .withPassword(passTest)
.withTlsRootCertificates(tlsRootCertsPath)
.withClientCertificate(badClientMTlsCertPath)
.withClientKey(clientMTlsKeyPath)
@@ -163,15 +158,13 @@ public void testGetEncryptedClientWithBadMTlsCertPath() {
*/
@Test
public void testGetEncryptedClientWithBadMTlsKeyPath() {
- final UsernamePasswordCredentials credentials = new UsernamePasswordCredentials(
- userTest, passTest);
assertThrows(SQLException.class, () -> {
try (ArrowFlightSqlClientHandler handler = new ArrowFlightSqlClientHandler.Builder()
.withHost(FLIGHT_SERVER_TEST_RULE.getHost())
.withPort(FLIGHT_SERVER_TEST_RULE.getPort())
- .withUsername(credentials.getUserName())
- .withPassword(credentials.getPassword())
+ .withUsername(userTest)
+ .withPassword(passTest)
.withTlsRootCertificates(tlsRootCertsPath)
.withClientCertificate(clientMTlsCertPath)
.withClientKey(badClientMTlsKeyPath)
diff --git a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ConnectionTlsRootCertsTest.java b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ConnectionTlsRootCertsTest.java
index 5579cf0cf5f54..e5ffc2bcf79c8 100644
--- a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ConnectionTlsRootCertsTest.java
+++ b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ConnectionTlsRootCertsTest.java
@@ -35,7 +35,6 @@
import org.apache.arrow.memory.BufferAllocator;
import org.apache.arrow.memory.RootAllocator;
import org.apache.arrow.util.AutoCloseables;
-import org.apache.calcite.avatica.org.apache.http.auth.UsernamePasswordCredentials;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@@ -95,15 +94,13 @@ public void tearDown() throws Exception {
*/
@Test
public void testGetEncryptedClientAuthenticated() throws Exception {
- final UsernamePasswordCredentials credentials = new UsernamePasswordCredentials(
- userTest, passTest);
try (ArrowFlightSqlClientHandler client =
new ArrowFlightSqlClientHandler.Builder()
.withHost(FLIGHT_SERVER_TEST_RULE.getHost())
.withPort(FLIGHT_SERVER_TEST_RULE.getPort())
- .withUsername(credentials.getUserName())
- .withPassword(credentials.getPassword())
+ .withUsername(userTest)
+ .withPassword(passTest)
.withTlsRootCertificates(tlsRootCertsPath)
.withBufferAllocator(allocator)
.withEncryption(true)
diff --git a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ConnectionTlsTest.java b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ConnectionTlsTest.java
index 7e160f3f0c385..f5a7b68e06cd8 100644
--- a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ConnectionTlsTest.java
+++ b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ConnectionTlsTest.java
@@ -36,7 +36,6 @@
import org.apache.arrow.memory.RootAllocator;
import org.apache.arrow.util.AutoCloseables;
import org.apache.arrow.util.Preconditions;
-import org.apache.calcite.avatica.org.apache.http.auth.UsernamePasswordCredentials;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@@ -96,15 +95,13 @@ public void tearDown() throws Exception {
*/
@Test
public void testGetEncryptedClientAuthenticatedWithDisableCertVerification() throws Exception {
- final UsernamePasswordCredentials credentials = new UsernamePasswordCredentials(
- userTest, passTest);
try (ArrowFlightSqlClientHandler client =
new ArrowFlightSqlClientHandler.Builder()
.withHost(FLIGHT_SERVER_TEST_RULE.getHost())
.withPort(FLIGHT_SERVER_TEST_RULE.getPort())
- .withUsername(credentials.getUserName())
- .withPassword(credentials.getPassword())
+ .withUsername(userTest)
+ .withPassword(passTest)
.withDisableCertificateVerification(true)
.withBufferAllocator(allocator)
.withEncryption(true)
@@ -120,16 +117,14 @@ public void testGetEncryptedClientAuthenticatedWithDisableCertVerification() thr
*/
@Test
public void testGetEncryptedClientAuthenticated() throws Exception {
- final UsernamePasswordCredentials credentials = new UsernamePasswordCredentials(
- userTest, passTest);
try (ArrowFlightSqlClientHandler client =
new ArrowFlightSqlClientHandler.Builder()
.withHost(FLIGHT_SERVER_TEST_RULE.getHost())
.withPort(FLIGHT_SERVER_TEST_RULE.getPort())
.withSystemTrustStore(false)
- .withUsername(credentials.getUserName())
- .withPassword(credentials.getPassword())
+ .withUsername(userTest)
+ .withPassword(passTest)
.withTrustStorePath(trustStorePath)
.withTrustStorePassword(trustStorePass)
.withBufferAllocator(allocator)
diff --git a/java/flight/flight-sql-jdbc-driver/pom.xml b/java/flight/flight-sql-jdbc-driver/pom.xml
index d4ef1b4ea3b9b..a8e55ea4089d5 100644
--- a/java/flight/flight-sql-jdbc-driver/pom.xml
+++ b/java/flight/flight-sql-jdbc-driver/pom.xml
@@ -114,7 +114,7 @@
org.apache.calcite.avatica
avatica
- 1.18.0
+ 1.24.0
runtime