From 35a1fbefeae9a6bb3658032b9611869c157887c6 Mon Sep 17 00:00:00 2001
From: Xue Yu <278006819@qq.com>
Date: Mon, 13 May 2019 05:38:06 +0800
Subject: [PATCH] upgrade avatica to 1.12.0 (#7644)

---
 pom.xml     | 2 +-
 sql/pom.xml | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 41638ddb4e2..f4d252eb45b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,7 +76,7 @@
         <project.build.resourceEncoding>UTF-8</project.build.resourceEncoding>
         <apache.curator.version>4.1.0</apache.curator.version>
         <apache.curator.test.version>2.12.0</apache.curator.test.version>
-        <avatica.version>1.10.0</avatica.version>
+        <avatica.version>1.12.0</avatica.version>
         <calcite.version>1.17.0</calcite.version>
         <dropwizard.metrics.version>4.0.0</dropwizard.metrics.version>
         <fastutil.version>8.1.0</fastutil.version>
diff --git a/sql/pom.xml b/sql/pom.xml
index ea301eb8157..6a754ab5bba 100644
--- a/sql/pom.xml
+++ b/sql/pom.xml
@@ -65,6 +65,12 @@
     <dependency>
       <groupId>org.apache.calcite.avatica</groupId>
       <artifactId>avatica-server</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.eclipse.jetty</groupId>
+          <artifactId>jetty-http</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>io.netty</groupId>