Update libthrift to 0.20.0

airlift · May 8, 2024 · 2944509 · 2944509
1 parent 3974c4b
commit 2944509
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 17 deletions.
diff --git a/...ration-tests/src/test/java/io/airlift/drift/integration/LegacyApacheThriftTesterUtil.java b/...ration-tests/src/test/java/io/airlift/drift/integration/LegacyApacheThriftTesterUtil.java
@@ -27,11 +27,11 @@
 import org.apache.thrift.protocol.TBinaryProtocol;
 import org.apache.thrift.protocol.TCompactProtocol;
 import org.apache.thrift.protocol.TProtocol;
-import org.apache.thrift.transport.TFramedTransport;
 import org.apache.thrift.transport.TSocket;
 import org.apache.thrift.transport.TTransport;
 import org.apache.thrift.transport.TTransportException;
 import org.apache.thrift.transport.TTransportFactory;
+import org.apache.thrift.transport.layered.TFramedTransport;
 
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLSocket;

diff --git a/...gration-tests/src/test/java/io/airlift/drift/integration/TestClientsWithApacheServer.java b/...gration-tests/src/test/java/io/airlift/drift/integration/TestClientsWithApacheServer.java
@@ -29,10 +29,10 @@
 import org.apache.thrift.server.TServer;
 import org.apache.thrift.server.TServer.Args;
 import org.apache.thrift.server.TSimpleServer;
-import org.apache.thrift.transport.TFramedTransport;
 import org.apache.thrift.transport.TServerSocket;
 import org.apache.thrift.transport.TTransportException;
 import org.apache.thrift.transport.TTransportFactory;
+import org.apache.thrift.transport.layered.TFramedTransport;
 import org.testng.annotations.Test;
 
 import javax.net.ssl.SSLContext;

diff --git a/.../main/java/io/airlift/drift/transport/apache/client/ApacheThriftMethodInvokerFactory.java b/.../main/java/io/airlift/drift/transport/apache/client/ApacheThriftMethodInvokerFactory.java
@@ -26,8 +26,8 @@
 import org.apache.thrift.protocol.TBinaryProtocol;
 import org.apache.thrift.protocol.TCompactProtocol;
 import org.apache.thrift.protocol.TProtocolFactory;
-import org.apache.thrift.transport.TFramedTransport;
 import org.apache.thrift.transport.TTransportFactory;
+import org.apache.thrift.transport.layered.TFramedTransport;
 
 import javax.net.ssl.KeyManager;
 import javax.net.ssl.KeyManagerFactory;

diff --git a/...apache/src/test/java/io/airlift/drift/transport/apache/TestApacheThriftMethodInvoker.java b/...apache/src/test/java/io/airlift/drift/transport/apache/TestApacheThriftMethodInvoker.java
@@ -47,11 +47,11 @@
 import org.apache.thrift.server.TServer;
 import org.apache.thrift.server.TServer.Args;
 import org.apache.thrift.server.TSimpleServer;
-import org.apache.thrift.transport.TFramedTransport;
 import org.apache.thrift.transport.TNonblockingSocket;
 import org.apache.thrift.transport.TServerSocket;
 import org.apache.thrift.transport.TSocket;
 import org.apache.thrift.transport.TTransportFactory;
+import org.apache.thrift.transport.layered.TFramedTransport;
 import org.testng.annotations.Test;
 
 import java.util.List;

diff --git a/...ty/src/test/java/io/airlift/drift/transport/netty/client/TestDriftNettyMethodInvoker.java b/...ty/src/test/java/io/airlift/drift/transport/netty/client/TestDriftNettyMethodInvoker.java
@@ -64,11 +64,11 @@
 import org.apache.thrift.server.TServer;
 import org.apache.thrift.server.TServer.Args;
 import org.apache.thrift.server.TSimpleServer;
-import org.apache.thrift.transport.TFramedTransport;
 import org.apache.thrift.transport.TNonblockingSocket;
 import org.apache.thrift.transport.TServerSocket;
 import org.apache.thrift.transport.TSocket;
 import org.apache.thrift.transport.TTransportFactory;
+import org.apache.thrift.transport.layered.TFramedTransport;
 import org.testng.annotations.Test;
 
 import java.util.List;

diff --git a/.../src/test/java/io/airlift/drift/transport/netty/server/TestDriftNettyServerTransport.java b/.../src/test/java/io/airlift/drift/transport/netty/server/TestDriftNettyServerTransport.java
@@ -43,9 +43,9 @@
 import org.apache.thrift.protocol.TMessageType;
 import org.apache.thrift.protocol.TProtocol;
 import org.apache.thrift.protocol.TProtocolFactory;
-import org.apache.thrift.transport.TFramedTransport;
 import org.apache.thrift.transport.TSocket;
 import org.apache.thrift.transport.TTransportFactory;
+import org.apache.thrift.transport.layered.TFramedTransport;
 import org.testng.annotations.Test;
 
 import java.util.List;

diff --git a/pom.xml b/pom.xml
@@ -235,17 +235,7 @@
             <dependency>
                 <groupId>org.apache.thrift</groupId>
                 <artifactId>libthrift</artifactId>
-                <version>0.12.0</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.apache.httpcomponents</groupId>
-                        <artifactId>httpclient</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.apache.httpcomponents</groupId>
-                        <artifactId>httpcore</artifactId>
-                    </exclusion>
-                </exclusions>
+                <version>0.20.0</version>
             </dependency>
         </dependencies>
     </dependencyManagement>