Skip to content

Commit feea292

Browse files
pan3793pan3793
committed
Switch to Kyuubi Shaded Zookeeper
1 parent 86e5b7a commit feea292

File tree

25 files changed

+94
-277
lines changed

25 files changed

+94
-277
lines changed

‎.github/workflows/master.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,17 +57,17 @@ jobs:
5757
include:
5858
- java: 8
5959
spark: '3.3'
60-
spark-archive: '-Dspark.archive.mirror=https://archive.apache.org/dist/spark/spark-3.1.3 -Dspark.archive.name=spark-3.1.3-bin-hadoop3.2.tgz'
60+
spark-archive: '-Dspark.archive.mirror=https://archive.apache.org/dist/spark/spark-3.1.3 -Dspark.archive.name=spark-3.1.3-bin-hadoop3.2.tgz -Pzookeeper-3.6'
6161
exclude-tags: '-Dmaven.plugin.scalatest.exclude.tags=org.scalatest.tags.Slow,org.apache.kyuubi.tags.DeltaTest,org.apache.kyuubi.tags.IcebergTest'
6262
comment: 'verify-on-spark-3.1-binary'
6363
- java: 8
6464
spark: '3.3'
65-
spark-archive: '-Dspark.archive.mirror=https://archive.apache.org/dist/spark/spark-3.2.4 -Dspark.archive.name=spark-3.2.4-bin-hadoop3.2.tgz'
65+
spark-archive: '-Dspark.archive.mirror=https://archive.apache.org/dist/spark/spark-3.2.4 -Dspark.archive.name=spark-3.2.4-bin-hadoop3.2.tgz -Pzookeeper-3.6'
6666
exclude-tags: '-Dmaven.plugin.scalatest.exclude.tags=org.scalatest.tags.Slow,org.apache.kyuubi.tags.DeltaTest,org.apache.kyuubi.tags.IcebergTest'
6767
comment: 'verify-on-spark-3.2-binary'
6868
- java: 8
6969
spark: '3.3'
70-
spark-archive: '-Dspark.archive.mirror=https://archive.apache.org/dist/spark/spark-3.4.0 -Dspark.archive.name=spark-3.4.0-bin-hadoop3.tgz'
70+
spark-archive: '-Dspark.archive.mirror=https://archive.apache.org/dist/spark/spark-3.4.0 -Dspark.archive.name=spark-3.4.0-bin-hadoop3.tgz -Pzookeeper-3.6'
7171
exclude-tags: '-Dmaven.plugin.scalatest.exclude.tags=org.scalatest.tags.Slow,org.apache.kyuubi.tags.DeltaTest,org.apache.kyuubi.tags.IcebergTest'
7272
comment: 'verify-on-spark-3.4-binary'
7373
env:

‎LICENSE-binary‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -212,9 +212,6 @@ com.google.android:annotations
212212
commons-lang:commons-lang
213213
commons-logging:commons-logging
214214
org.apache.commons:commons-lang3
215-
org.apache.curator:curator-client
216-
org.apache.curator:curator-framework
217-
org.apache.curator:curator-recipes
218215
org.apache.derby:derby
219216
com.google.errorprone:error_prone_annotations
220217
net.jodah:failsafe
@@ -318,7 +315,6 @@ io.swagger.core.v3:swagger-jaxrs2
318315
io.swagger.core.v3:swagger-models
319316
io.vertx:vertx-core
320317
io.vertx:vertx-grpc
321-
org.apache.zookeeper:zookeeper
322318
com.squareup.retrofit2:retrofit
323319
com.squareup.okhttp3:okhttp
324320
org.apache.kafka:kafka-clients

‎NOTICE-binary‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -92,15 +92,6 @@ Copyright 2001-2020 The Apache Software Foundation
9292
Apache Commons Logging
9393
Copyright 2003-2013 The Apache Software Foundation
9494

95-
Curator Client
96-
Copyright 2011-2017 The Apache Software Foundation
97-
98-
Curator Framework
99-
Copyright 2011-2017 The Apache Software Foundation
100-
101-
Curator Recipes
102-
Copyright 2011-2017 The Apache Software Foundation
103-
10495
=========================================================================
10596
== NOTICE file corresponding to section 4(d) of the Apache License,
10697
== Version 2.0, in this case for the Apache Derby distribution.

‎bin/kyuubi-zk-cli‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#
1818

1919
## Zookeeper Shell Client Entrance
20-
CLASS="org.apache.zookeeper.ZooKeeperMain"
20+
CLASS="org.apache.kyuubi.shaded.zookeeper.ZooKeeperMain"
2121

2222
export KYUUBI_HOME="$(cd "$(dirname "$0")"/..; pwd)"
2323

‎dev/dependencyList‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@ commons-collections/3.2.2//commons-collections-3.2.2.jar
3232
commons-lang/2.6//commons-lang-2.6.jar
3333
commons-lang3/3.12.0//commons-lang3-3.12.0.jar
3434
commons-logging/1.1.3//commons-logging-1.1.3.jar
35-
curator-client/2.12.0//curator-client-2.12.0.jar
36-
curator-framework/2.12.0//curator-framework-2.12.0.jar
37-
curator-recipes/2.12.0//curator-recipes-2.12.0.jar
3835
derby/10.14.2.0//derby-10.14.2.0.jar
3936
error_prone_annotations/2.14.0//error_prone_annotations-2.14.0.jar
4037
failsafe/2.4.4//failsafe-2.4.4.jar
@@ -195,5 +192,4 @@ units/1.6//units-1.6.jar
195192
vertx-core/4.3.2//vertx-core-4.3.2.jar
196193
vertx-grpc/4.3.2//vertx-grpc-4.3.2.jar
197194
zjsonpatch/0.3.0//zjsonpatch-0.3.0.jar
198-
zookeeper/3.4.14//zookeeper-3.4.14.jar
199195
zstd-jni/1.5.2-1//zstd-jni-1.5.2-1.jar

‎externals/kyuubi-flink-sql-engine/pom.xml‎

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -186,20 +186,15 @@
186186
<shadedArtifactAttached>false</shadedArtifactAttached>
187187
<artifactSet>
188188
<includes>
189-
<include>org.apache.kyuubi:kyuubi-common_${scala.binary.version}</include>
190-
<include>org.apache.kyuubi:kyuubi-ha_${scala.binary.version}</include>
191189
<include>com.fasterxml.jackson.core:*</include>
192190
<include>com.fasterxml.jackson.module:*</include>
193191
<include>com.google.guava:failureaccess</include>
194192
<include>com.google.guava:guava</include>
195193
<include>commons-codec:commons-codec</include>
196194
<include>org.apache.commons:commons-lang3</include>
197-
<include>org.apache.curator:curator-client</include>
198-
<include>org.apache.curator:curator-framework</include>
199-
<include>org.apache.curator:curator-recipes</include>
200195
<include>org.apache.hive:hive-service-rpc</include>
201196
<include>org.apache.thrift:*</include>
202-
<include>org.apache.zookeeper:*</include>
197+
<include>org.apache.kyuubi:*</include>
203198
</includes>
204199
</artifactSet>
205200
<filters>
@@ -228,13 +223,6 @@
228223
<include>com.fasterxml.jackson.**</include>
229224
</includes>
230225
</relocation>
231-
<relocation>
232-
<pattern>org.apache.curator</pattern>
233-
<shadedPattern>${kyuubi.shade.packageName}.org.apache.curator</shadedPattern>
234-
<includes>
235-
<include>org.apache.curator.**</include>
236-
</includes>
237-
</relocation>
238226
<relocation>
239227
<pattern>com.google.common</pattern>
240228
<shadedPattern>${kyuubi.shade.packageName}.com.google.common</shadedPattern>
@@ -278,20 +266,6 @@
278266
<include>org.apache.thrift.**</include>
279267
</includes>
280268
</relocation>
281-
<relocation>
282-
<pattern>org.apache.jute</pattern>
283-
<shadedPattern>${kyuubi.shade.packageName}.org.apache.jute</shadedPattern>
284-
<includes>
285-
<include>org.apache.jute.**</include>
286-
</includes>
287-
</relocation>
288-
<relocation>
289-
<pattern>org.apache.zookeeper</pattern>
290-
<shadedPattern>${kyuubi.shade.packageName}.org.apache.zookeeper</shadedPattern>
291-
<includes>
292-
<include>org.apache.zookeeper.**</include>
293-
</includes>
294-
</relocation>
295269
</relocations>
296270
<transformers>
297271
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"></transformer>

‎externals/kyuubi-hive-sql-engine/pom.xml‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -179,12 +179,7 @@
179179
<include>com.fasterxml.jackson.core:jackson-core</include>
180180
<include>com.fasterxml.jackson.core:jackson-databind</include>
181181
<include>com.fasterxml.jackson.module:jackson-module-scala_${scala.binary.version}</include>
182-
<include>org.apache.kyuubi:kyuubi-common_${scala.binary.version}</include>
183-
<include>org.apache.kyuubi:kyuubi-events_${scala.binary.version}</include>
184-
<include>org.apache.kyuubi:kyuubi-ha_${scala.binary.version}</include>
185-
<include>org.apache.curator:curator-client</include>
186-
<include>org.apache.curator:curator-framework</include>
187-
<include>org.apache.curator:curator-recipes</include>
182+
<include>org.apache.kyuubi:*</include>
188183
</includes>
189184
</artifactSet>
190185
<filters>
@@ -205,15 +200,6 @@
205200
</excludes>
206201
</filter>
207202
</filters>
208-
<relocations>
209-
<relocation>
210-
<pattern>org.apache.curator</pattern>
211-
<shadedPattern>${kyuubi.shade.packageName}.org.apache.curator</shadedPattern>
212-
<includes>
213-
<include>org.apache.curator.**</include>
214-
</includes>
215-
</relocation>
216-
</relocations>
217203
</configuration>
218204
<executions>
219205
<execution>

‎externals/kyuubi-spark-sql-engine/pom.xml‎

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -194,15 +194,9 @@
194194
<include>io.perfmark:perfmark-api</include>
195195
<include>io.vertx:*</include>
196196
<include>net.jodah:failsafe</include>
197-
<include>org.apache.curator:curator-client</include>
198-
<include>org.apache.curator:curator-framework</include>
199-
<include>org.apache.curator:curator-recipes</include>
200197
<include>org.apache.hive:hive-service-rpc</include>
201-
<include>org.apache.kyuubi:kyuubi-common_${scala.binary.version}</include>
202-
<include>org.apache.kyuubi:kyuubi-events_${scala.binary.version}</include>
203-
<include>org.apache.kyuubi:kyuubi-ha_${scala.binary.version}</include>
198+
<include>org.apache.kyuubi:*</include>
204199
<include>org.apache.thrift:*</include>
205-
<include>org.apache.zookeeper:zookeeper</include>
206200
<include>org.checkerframework:checker-qual</include>
207201
<include>org.codehaus.mojo:animal-sniffer-annotations</include>
208202
</includes>
@@ -227,27 +221,6 @@
227221
</filter>
228222
</filters>
229223
<relocations>
230-
<relocation>
231-
<pattern>org.apache.curator</pattern>
232-
<shadedPattern>${kyuubi.shade.packageName}.org.apache.curator</shadedPattern>
233-
<includes>
234-
<include>org.apache.curator.**</include>
235-
</includes>
236-
</relocation>
237-
<relocation>
238-
<pattern>org.apache.zookeeper</pattern>
239-
<shadedPattern>${kyuubi.shade.packageName}.org.apache.zookeeper</shadedPattern>
240-
<includes>
241-
<include>org.apache.zookeeper.**</include>
242-
</includes>
243-
</relocation>
244-
<relocation>
245-
<pattern>org.apache.jute</pattern>
246-
<shadedPattern>${kyuubi.shade.packageName}.org.apache.jute</shadedPattern>
247-
<includes>
248-
<include>org.apache.jute.**</include>
249-
</includes>
250-
</relocation>
251224
<relocation>
252225
<pattern>org.apache.hive.service.rpc.thrift</pattern>
253226
<shadedPattern>${kyuubi.shade.packageName}.org.apache.hive.service.rpc.thrift</shadedPattern>

‎kyuubi-assembly/pom.xml‎

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -69,28 +69,18 @@
6969
</dependency>
7070

7171
<dependency>
72-
<groupId>org.apache.hadoop</groupId>
73-
<artifactId>hadoop-client-api</artifactId>
72+
<groupId>org.apache.kyuubi</groupId>
73+
<artifactId>${kyuubi-shaded-zookeeper.artifacts}</artifactId>
7474
</dependency>
7575

7676
<dependency>
7777
<groupId>org.apache.hadoop</groupId>
78-
<artifactId>hadoop-client-runtime</artifactId>
79-
</dependency>
80-
81-
<dependency>
82-
<groupId>org.apache.curator</groupId>
83-
<artifactId>curator-framework</artifactId>
84-
</dependency>
85-
86-
<dependency>
87-
<groupId>org.apache.curator</groupId>
88-
<artifactId>curator-client</artifactId>
78+
<artifactId>hadoop-client-api</artifactId>
8979
</dependency>
9080

9181
<dependency>
92-
<groupId>org.apache.curator</groupId>
93-
<artifactId>curator-recipes</artifactId>
82+
<groupId>org.apache.hadoop</groupId>
83+
<artifactId>hadoop-client-runtime</artifactId>
9484
</dependency>
9585

9686
<dependency>

‎kyuubi-ctl/pom.xml‎

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,11 @@
4848
<version>${project.version}</version>
4949
</dependency>
5050

51+
<dependency>
52+
<groupId>org.apache.kyuubi</groupId>
53+
<artifactId>${kyuubi-shaded-zookeeper.artifacts}</artifactId>
54+
</dependency>
55+
5156
<dependency>
5257
<groupId>org.apache.hadoop</groupId>
5358
<artifactId>hadoop-client-api</artifactId>
@@ -60,16 +65,6 @@
6065
<scope>provided</scope>
6166
</dependency>
6267

63-
<dependency>
64-
<groupId>org.apache.curator</groupId>
65-
<artifactId>curator-framework</artifactId>
66-
</dependency>
67-
68-
<dependency>
69-
<groupId>org.apache.curator</groupId>
70-
<artifactId>curator-recipes</artifactId>
71-
</dependency>
72-
7368
<dependency>
7469
<groupId>com.github.scopt</groupId>
7570
<artifactId>scopt_${scala.binary.version}</artifactId>
@@ -86,11 +81,6 @@
8681
<version>${snakeyaml.version}</version>
8782
</dependency>
8883

89-
<dependency>
90-
<groupId>org.apache.zookeeper</groupId>
91-
<artifactId>zookeeper</artifactId>
92-
</dependency>
93-
9484
<dependency>
9585
<groupId>org.apache.kyuubi</groupId>
9686
<artifactId>kyuubi-common_${scala.binary.version}</artifactId>

0 commit comments

Comments
 (0)