diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcDriver.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcDriver.java
index 183e3d5c7b055..d0daaa8bda155 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcDriver.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcDriver.java
@@ -31,6 +31,7 @@
import java.util.Objects;
import java.util.Optional;
import java.util.Properties;
+import java.util.logging.Logger;
import org.apache.arrow.driver.jdbc.utils.ArrowFlightConnectionConfigImpl.ArrowFlightConnectionProperty;
import org.apache.arrow.driver.jdbc.utils.UrlParser;
@@ -58,7 +59,7 @@ public class ArrowFlightJdbcDriver extends UnregisteredDriver {
// Netty requires some extra properties to unlock some native memory management api
// Setting this property if not already set externally
// This has to be done before any netty class is being loaded
- final String key = "cfjd.io.netty.tryReflectionSetAccessible";
+ final String key = "io.netty.tryReflectionSetAccessible";
final String tryReflectionSetAccessible = System.getProperty(key);
if (tryReflectionSetAccessible == null) {
System.setProperty(key, Boolean.TRUE.toString());
@@ -67,6 +68,13 @@ public class ArrowFlightJdbcDriver extends UnregisteredDriver {
new ArrowFlightJdbcDriver().register();
}
+ @Override
+ public Logger getParentLogger() {
+ // Return the logger associated with the driver package ('org.apache.arrow.driver.jdbc')
+ // When packaged in flight-sql-jdbc-driver, it will also apply to all shaded dependencies
+ return Logger.getLogger(getClass().getPackage().getName());
+ }
+
@Override
public ArrowFlightConnection connect(final String url, final Properties info)
throws SQLException {
diff --git a/java/flight/flight-sql-jdbc-driver/pom.xml b/java/flight/flight-sql-jdbc-driver/pom.xml
index 53d929afa781c..2157c09eaf583 100644
--- a/java/flight/flight-sql-jdbc-driver/pom.xml
+++ b/java/flight/flight-sql-jdbc-driver/pom.xml
@@ -97,6 +97,11 @@
slf4j-api
runtime
+
+ org.slf4j
+ slf4j-jdk14
+ runtime
+
io.netty
@@ -190,17 +195,16 @@
com.
- cfjd.com.
+ org.apache.arrow.driver.jdbc.shaded.com.
com.sun.**
org.
- cfjd.org.
+ org.apache.arrow.driver.jdbc.shaded.org.
org.apache.arrow.driver.jdbc.**
- org.slf4j.**
org.apache.arrow.flight.name
org.apache.arrow.flight.version
@@ -210,24 +214,24 @@
io.
- cfjd.io.
+ org.apache.arrow.driver.jdbc.shaded.io.
net.
- cfjd.net.
+ org.apache.arrow.driver.jdbc.shaded.net.
mozilla.
- cfjd.mozilla.
+ org.apache.arrow.driver.jdbc.shaded.mozilla.
META-INF.native.libnetty_
- META-INF.native.libcfjd_netty_
+ META-INF.native.liboaadj_netty_
META-INF.native.netty_
- META-INF.native.cfjd_netty_
+ META-INF.native.oaadj_netty_
diff --git a/java/flight/flight-sql-jdbc-driver/src/test/java/org/apache/arrow/driver/jdbc/ITDriverJarValidation.java b/java/flight/flight-sql-jdbc-driver/src/test/java/org/apache/arrow/driver/jdbc/ITDriverJarValidation.java
index fdb580d493abf..0cae2fd5f5cb8 100644
--- a/java/flight/flight-sql-jdbc-driver/src/test/java/org/apache/arrow/driver/jdbc/ITDriverJarValidation.java
+++ b/java/flight/flight-sql-jdbc-driver/src/test/java/org/apache/arrow/driver/jdbc/ITDriverJarValidation.java
@@ -42,8 +42,7 @@
/**
* Check the content of the JDBC driver jar
*
- * After shading everything should be either under org.apache.arrow.driver.jdbc.,
- * org.slf4j., or cfjd. packages
+ * After shading everything should be either under org.apache.arrow.driver.jdbc. package
*/
public class ITDriverJarValidation {
/**
@@ -57,8 +56,6 @@ public class ITDriverJarValidation {
*/
public static final Set ALLOWED_PREFIXES = ImmutableSet.of(
"org/apache/arrow/driver/jdbc/",
- "cfjd/",
- "org/slf4j/",
"META-INF/");
/**
diff --git a/java/pom.xml b/java/pom.xml
index bdefbea2d8787..8e9ddd5480ea8 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -680,6 +680,11 @@
slf4j-api
${dep.slf4j.version}
+
+ org.slf4j
+ slf4j-jdk14
+ ${dep.slf4j.version}
+
javax.annotation
javax.annotation-api