Remove direct dependency of Netty (#1692)

Co-authored-by: AbdulRehman Faraj <[email protected]>
awslabs · Jan 11, 2024 · 1de2211 · 1de2211
1 parent 77435a4
commit 1de2211
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 33 deletions.
diff --git a/athena-federation-sdk/pom.xml b/athena-federation-sdk/pom.xml
@@ -192,26 +192,6 @@
             <groupId>org.apache.arrow</groupId>
             <artifactId>arrow-memory-netty</artifactId>
             <version>${apache.arrow.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>io.netty</groupId>
-                    <artifactId>netty-buffer</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>io.netty</groupId>
-                    <artifactId>netty-common</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty-buffer</artifactId>
-            <version>${netty.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty-common</artifactId>
-            <version>${netty.version}</version>
         </dependency>
         <dependency>
             <groupId>com.amazonaws</groupId>
@@ -480,4 +460,4 @@
 
         </plugins>
     </build>
-</project>
+</project>
diff --git a/athena-hbase/pom.xml b/athena-hbase/pom.xml
@@ -77,11 +77,6 @@
             <artifactId>jettison</artifactId>
             <version>1.5.4</version>
         </dependency>
-        <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty-transport</artifactId>
-            <version>${netty.version}</version>
-        </dependency>
         <dependency>
             <groupId>com.google.protobuf</groupId>
             <artifactId>protobuf-java</artifactId>
@@ -167,10 +162,6 @@
                     <groupId>log4j</groupId>
                     <artifactId>log4j</artifactId>
                 </exclusion>
-                <exclusion>
-                    <groupId>io.netty</groupId>
-                    <artifactId>netty-transport</artifactId>
-                </exclusion>
                 <exclusion>
                     <groupId>com.google.protobuf</groupId>
                     <artifactId>protobuf-java</artifactId>

diff --git a/...vertica/src/main/java/com/amazonaws/athena/connectors/vertica/VerticaMetadataHandler.java b/...vertica/src/main/java/com/amazonaws/athena/connectors/vertica/VerticaMetadataHandler.java
@@ -41,7 +41,7 @@
 import com.amazonaws.services.s3.model.ObjectListing;
 import com.amazonaws.services.s3.model.S3ObjectSummary;
 import com.amazonaws.services.secretsmanager.AWSSecretsManager;
-import io.netty.util.internal.StringUtil;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.arrow.util.VisibleForTesting;
 import org.apache.arrow.vector.complex.reader.FieldReader;
 import org.apache.arrow.vector.types.pojo.ArrowType;
@@ -71,7 +71,7 @@ public class VerticaMetadataHandler
     private static  final String TABLE_SCHEMA = "TABLE_SCHEM";
     private static final String[] TABLE_TYPES = {"TABLE"};
     private static final String EXPORT_BUCKET_KEY = "export_bucket";
-    private static final String EMPTY_STRING = StringUtil.EMPTY_STRING;
+    private static final String EMPTY_STRING = StringUtils.EMPTY;
     private final VerticaConnectionFactory connectionFactory;
     private final QueryFactory queryFactory = new QueryFactory();
     private final VerticaSchemaUtils verticaSchemaUtils;

diff --git a/pom.xml b/pom.xml
@@ -28,7 +28,6 @@
         <surefire.failsafe.version>3.2.3</surefire.failsafe.version>
         <log4j2Version>2.22.1</log4j2Version>
         <apache.arrow.version>13.0.0</apache.arrow.version>
-        <netty.version>4.1.101.Final</netty.version>
         <guava.version>33.0.0-jre</guava.version>
         <protobuf3.version>3.25.1</protobuf3.version>
         <antlr.st4.version>4.3.4</antlr.st4.version>