From 3097b59994e87a6c1f9cbd13c2521843142472f4 Mon Sep 17 00:00:00 2001
From: Hang Chen <chenhang@apache.org>
Date: Thu, 26 Aug 2021 16:12:45 +0800
Subject: [PATCH 1/2] upgrade aircompressor from 0.19 to 0.20

---
 distribution/server/src/assemble/LICENSE.bin.txt | 2 +-
 pom.xml                                          | 4 ++--
 pulsar-sql/presto-distribution/LICENSE           | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt
index 41052de646efb..936528ad8b7e2 100644
--- a/distribution/server/src/assemble/LICENSE.bin.txt
+++ b/distribution/server/src/assemble/LICENSE.bin.txt
@@ -425,7 +425,7 @@ The Apache Software License, Version 2.0
     - org.apache.httpcomponents-httpclient-4.5.5.jar
     - org.apache.httpcomponents-httpcore-4.4.9.jar
  * AirCompressor
-    - io.airlift-aircompressor-0.16.jar
+    - io.airlift-aircompressor-0.20.jar
  * AsyncHttpClient
     - org.asynchttpclient-async-http-client-2.12.1.jar
     - org.asynchttpclient-async-http-client-netty-utils-2.12.1.jar
diff --git a/pom.xml b/pom.xml
index 718ef2d81df4f..e793d8998b7bf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -157,7 +157,7 @@ flexible messaging model and an intuitive client API.</description>
     <prometheus-jmx.version>0.14.0</prometheus-jmx.version>
     <confluent.version>5.3.2</confluent.version>
     <kafka-avro-convert-jackson.version>1.9.13</kafka-avro-convert-jackson.version>
-    <aircompressor.version>0.16</aircompressor.version>
+    <aircompressor.version>0.20</aircompressor.version>
     <asynchttpclient.version>2.12.1</asynchttpclient.version>
     <jcommander.version>1.78</jcommander.version>
     <commons-lang3.version>3.6</commons-lang3.version>
@@ -598,7 +598,7 @@ flexible messaging model and an intuitive client API.</description>
         <artifactId>jna</artifactId>
         <version>${jna.version}</version>
       </dependency>
-      
+
       <dependency>
          <groupId>com.github.docker-java</groupId>
          <artifactId>docker-java-core</artifactId>
diff --git a/pulsar-sql/presto-distribution/LICENSE b/pulsar-sql/presto-distribution/LICENSE
index a52dda264ba59..906cad724359e 100644
--- a/pulsar-sql/presto-distribution/LICENSE
+++ b/pulsar-sql/presto-distribution/LICENSE
@@ -273,7 +273,7 @@ The Apache Software License, Version 2.0
   * CGLIB Nodep
     - cglib-nodep-3.3.0.jar
   * Airlift
-    - aircompressor-0.16.jar
+    - aircompressor-0.20.jar
     - airline-0.8.jar
     - bootstrap-0.199.jar
     - bootstrap-0.195.jar

From 6142c05491fd882ca0d05129be0b9f6dfe95a726 Mon Sep 17 00:00:00 2001
From: JiangHaiting <jianghaiting@apache.org>
Date: Fri, 29 Jul 2022 19:20:17 +0800
Subject: [PATCH 2/2] fix license-check

(cherry picked from commit 325ff78cfc94e7e22e9a2d07dff9b9bcb3357e55)
---
 pulsar-sql/presto-distribution/pom.xml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pulsar-sql/presto-distribution/pom.xml b/pulsar-sql/presto-distribution/pom.xml
index 7df994c0de568..1a236821d3fd3 100644
--- a/pulsar-sql/presto-distribution/pom.xml
+++ b/pulsar-sql/presto-distribution/pom.xml
@@ -38,6 +38,7 @@
         <presto.version>332</presto.version>
         <jersey.version>2.31</jersey.version>
         <airlift.version>0.170</airlift.version>
+        <aircompressor.version>0.20</aircompressor.version>
         <objenesis.version>2.6</objenesis.version>
         <objectsize.version>0.0.12</objectsize.version>
         <guice.version>4.2.0</guice.version>
@@ -136,6 +137,18 @@
             <version>${presto.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>aircompressor</artifactId>
+            <version>${aircompressor.version}</version>
+            <exclusions>
+              <exclusion>
+                <groupId>org.openjdk.jol</groupId>
+                <artifactId>jol-core</artifactId>
+              </exclusion>
+            </exclusions>
+        </dependency>
+
         <dependency>
             <groupId>io.airlift</groupId>
             <artifactId>launcher</artifactId>