This is an automated email from the ASF dual-hosted git repository.
jianghaiting pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/branch-2.7 by this push:
new c5aaac7c529 [Branch 2.7] upgrade aircompressor to 0.20 (#16893)
c5aaac7c529 is described below
commit c5aaac7c529613b6c7665c495221b3fb0a783e48
Author: JiangHaiting <[email protected]>
AuthorDate: Mon Aug 1 16:12:51 2022 +0800
[Branch 2.7] upgrade aircompressor to 0.20 (#16893)
* upgrade aircompressor from 0.19 to 0.20
* fix license-check
(cherry picked from commit 325ff78cfc94e7e22e9a2d07dff9b9bcb3357e55)
Co-authored-by: Hang Chen <[email protected]>
---
distribution/server/src/assemble/LICENSE.bin.txt | 2 +-
pom.xml | 4 ++--
pulsar-sql/presto-distribution/LICENSE | 2 +-
pulsar-sql/presto-distribution/pom.xml | 13 +++++++++++++
4 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/distribution/server/src/assemble/LICENSE.bin.txt
b/distribution/server/src/assemble/LICENSE.bin.txt
index 41052de646e..936528ad8b7 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 718ef2d81df..e793d8998b7 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 a52dda264ba..906cad72435 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
diff --git a/pulsar-sql/presto-distribution/pom.xml
b/pulsar-sql/presto-distribution/pom.xml
index 7df994c0de5..1a236821d3f 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>
