This is an automated email from the ASF dual-hosted git repository.
chengpan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kyuubi-shaded.git
The following commit(s) were added to refs/heads/master by this push:
new 7122fd1 [KYUUBI-SHADED #22] Replace the word 'shaded' with 'relocated'
7122fd1 is described below
commit 7122fd1120129ef1e97fa6dacfb0932c8440ac92
Author: Cheng Pan <[email protected]>
AuthorDate: Mon Dec 4 14:14:16 2023 +0800
[KYUUBI-SHADED #22] Replace the word 'shaded' with 'relocated'
### _Why are the changes needed?_
Follow the discussion
https://lists.apache.org/thread/v1qswzoxd6zgpbpw3ddm97hry3g5sn6l to rename the
modules' names, also supply the module description.
### _How was this patch tested?_
- [ ] Add some test cases that check the changes thoroughly including
negative and positive cases if possible
- [ ] Add screenshots for manual tests if appropriate
- [ ] [Run
test](https://kyuubi.readthedocs.io/en/master/develop_tools/testing.html#running-tests)
locally before make a pull request
Closes #22 from pan3793/rename.
a7fb26f [Cheng Pan] Replace the word 'shaded' with 'relocated'
Authored-by: Cheng Pan <[email protected]>
Signed-off-by: Cheng Pan <[email protected]>
---
.../pom.xml | 7 +++----
.../pom.xml | 6 +++---
.../src/main/resources/META-INF/NOTICE | 2 +-
.../kyuubi-relocated-zookeeper-34}/pom.xml | 5 +++--
.../java/org/apache/zookeeper/client/StaticHostProvider.java | 0
.../src/main/resources/META-INF/NOTICE | 2 +-
.../kyuubi-relocated-zookeeper-36}/pom.xml | 5 +++--
.../src/main/resources/META-INF/NOTICE | 2 +-
.../pom.xml | 10 +++++-----
pom.xml | 8 ++++----
10 files changed, 24 insertions(+), 23 deletions(-)
diff --git a/kyuubi-shaded-force-shading/pom.xml
b/kyuubi-relocated-force-shading/pom.xml
similarity index 85%
rename from kyuubi-shaded-force-shading/pom.xml
rename to kyuubi-relocated-force-shading/pom.xml
index 8d284c6..c88ef4f 100644
--- a/kyuubi-shaded-force-shading/pom.xml
+++ b/kyuubi-relocated-force-shading/pom.xml
@@ -22,11 +22,10 @@ under the License.
<parent>
<groupId>org.apache.kyuubi</groupId>
- <artifactId>kyuubi-shaded-parent</artifactId>
+ <artifactId>kyuubi-relocated-parent</artifactId>
<version>0.2.0-SNAPSHOT</version>
</parent>
- <artifactId>kyuubi-shaded-force-shading</artifactId>
- <packaging>jar</packaging>
-
+ <artifactId>kyuubi-relocated-force-shading</artifactId>
+ <description>An empty module used for creating shaded
artifacts.</description>
</project>
diff --git a/kyuubi-shaded-hive-service-rpc/pom.xml
b/kyuubi-relocated-hive-service-rpc/pom.xml
similarity index 96%
rename from kyuubi-shaded-hive-service-rpc/pom.xml
rename to kyuubi-relocated-hive-service-rpc/pom.xml
index 92bc958..b281334 100644
--- a/kyuubi-shaded-hive-service-rpc/pom.xml
+++ b/kyuubi-relocated-hive-service-rpc/pom.xml
@@ -24,12 +24,12 @@ under the License.
<parent>
<groupId>org.apache.kyuubi</groupId>
- <artifactId>kyuubi-shaded-parent</artifactId>
+ <artifactId>kyuubi-relocated-parent</artifactId>
<version>0.2.0-SNAPSHOT</version>
</parent>
- <artifactId>kyuubi-shaded-hive-service-rpc</artifactId>
- <name>kyuubi-shaded-hive-service-rpc</name>
+ <artifactId>kyuubi-relocated-hive-service-rpc</artifactId>
+ <description>Relocated Hive Service RPC and Thrift classes used by Kyuubi
internally.</description>
<properties>
<hive.service.rpc.version>3.1.3</hive.service.rpc.version>
diff --git a/kyuubi-shaded-hive-service-rpc/src/main/resources/META-INF/NOTICE
b/kyuubi-relocated-hive-service-rpc/src/main/resources/META-INF/NOTICE
similarity index 92%
rename from kyuubi-shaded-hive-service-rpc/src/main/resources/META-INF/NOTICE
rename to kyuubi-relocated-hive-service-rpc/src/main/resources/META-INF/NOTICE
index 3a16699..2c160c9 100644
--- a/kyuubi-shaded-hive-service-rpc/src/main/resources/META-INF/NOTICE
+++ b/kyuubi-relocated-hive-service-rpc/src/main/resources/META-INF/NOTICE
@@ -1,4 +1,4 @@
-kyuubi-shaded-hive-service-rpc
+kyuubi-relocated-hive-service-rpc
Copyright 2023 The Apache Software Foundation
This product includes software developed at
diff --git a/kyuubi-shaded-zookeeper-parent/kyuubi-shaded-zookeeper-34/pom.xml
b/kyuubi-relocated-zookeeper-parent/kyuubi-relocated-zookeeper-34/pom.xml
similarity index 96%
rename from kyuubi-shaded-zookeeper-parent/kyuubi-shaded-zookeeper-34/pom.xml
rename to
kyuubi-relocated-zookeeper-parent/kyuubi-relocated-zookeeper-34/pom.xml
index c80baf5..415dca8 100644
--- a/kyuubi-shaded-zookeeper-parent/kyuubi-shaded-zookeeper-34/pom.xml
+++ b/kyuubi-relocated-zookeeper-parent/kyuubi-relocated-zookeeper-34/pom.xml
@@ -24,11 +24,12 @@ under the License.
<parent>
<groupId>org.apache.kyuubi</groupId>
- <artifactId>kyuubi-shaded-zookeeper-parent</artifactId>
+ <artifactId>kyuubi-relocated-zookeeper-parent</artifactId>
<version>0.2.0-SNAPSHOT</version>
</parent>
- <artifactId>kyuubi-shaded-zookeeper-34</artifactId>
+ <artifactId>kyuubi-relocated-zookeeper-34</artifactId>
+ <description>Relocated Zookeeper 3.4 classes used by Kyuubi
internally.</description>
<properties>
<zookeeper.version>3.4.14</zookeeper.version>
diff --git
a/kyuubi-shaded-zookeeper-parent/kyuubi-shaded-zookeeper-34/src/main/java/org/apache/zookeeper/client/StaticHostProvider.java
b/kyuubi-relocated-zookeeper-parent/kyuubi-relocated-zookeeper-34/src/main/java/org/apache/zookeeper/client/StaticHostProvider.java
similarity index 100%
rename from
kyuubi-shaded-zookeeper-parent/kyuubi-shaded-zookeeper-34/src/main/java/org/apache/zookeeper/client/StaticHostProvider.java
rename to
kyuubi-relocated-zookeeper-parent/kyuubi-relocated-zookeeper-34/src/main/java/org/apache/zookeeper/client/StaticHostProvider.java
diff --git
a/kyuubi-shaded-zookeeper-parent/kyuubi-shaded-zookeeper-34/src/main/resources/META-INF/NOTICE
b/kyuubi-relocated-zookeeper-parent/kyuubi-relocated-zookeeper-34/src/main/resources/META-INF/NOTICE
similarity index 94%
rename from
kyuubi-shaded-zookeeper-parent/kyuubi-shaded-zookeeper-34/src/main/resources/META-INF/NOTICE
rename to
kyuubi-relocated-zookeeper-parent/kyuubi-relocated-zookeeper-34/src/main/resources/META-INF/NOTICE
index 79d955d..224bd94 100644
---
a/kyuubi-shaded-zookeeper-parent/kyuubi-shaded-zookeeper-34/src/main/resources/META-INF/NOTICE
+++
b/kyuubi-relocated-zookeeper-parent/kyuubi-relocated-zookeeper-34/src/main/resources/META-INF/NOTICE
@@ -1,4 +1,4 @@
-flink-shaded-zookeeper-34
+kyuubi-relocated-zookeeper-34
Copyright 2023 The Apache Software Foundation
This product includes software developed at
diff --git a/kyuubi-shaded-zookeeper-parent/kyuubi-shaded-zookeeper-36/pom.xml
b/kyuubi-relocated-zookeeper-parent/kyuubi-relocated-zookeeper-36/pom.xml
similarity index 96%
rename from kyuubi-shaded-zookeeper-parent/kyuubi-shaded-zookeeper-36/pom.xml
rename to
kyuubi-relocated-zookeeper-parent/kyuubi-relocated-zookeeper-36/pom.xml
index de0b35e..cde6ecb 100644
--- a/kyuubi-shaded-zookeeper-parent/kyuubi-shaded-zookeeper-36/pom.xml
+++ b/kyuubi-relocated-zookeeper-parent/kyuubi-relocated-zookeeper-36/pom.xml
@@ -24,11 +24,12 @@ under the License.
<parent>
<groupId>org.apache.kyuubi</groupId>
- <artifactId>kyuubi-shaded-zookeeper-parent</artifactId>
+ <artifactId>kyuubi-relocated-zookeeper-parent</artifactId>
<version>0.2.0-SNAPSHOT</version>
</parent>
- <artifactId>kyuubi-shaded-zookeeper-36</artifactId>
+ <artifactId>kyuubi-relocated-zookeeper-36</artifactId>
+ <description>Relocated Zookeeper 3.6 classes used by Kyuubi
internally.</description>
<properties>
<zookeeper.version>3.6.4</zookeeper.version>
diff --git
a/kyuubi-shaded-zookeeper-parent/kyuubi-shaded-zookeeper-36/src/main/resources/META-INF/NOTICE
b/kyuubi-relocated-zookeeper-parent/kyuubi-relocated-zookeeper-36/src/main/resources/META-INF/NOTICE
similarity index 95%
rename from
kyuubi-shaded-zookeeper-parent/kyuubi-shaded-zookeeper-36/src/main/resources/META-INF/NOTICE
rename to
kyuubi-relocated-zookeeper-parent/kyuubi-relocated-zookeeper-36/src/main/resources/META-INF/NOTICE
index 04eca74..e169494 100644
---
a/kyuubi-shaded-zookeeper-parent/kyuubi-shaded-zookeeper-36/src/main/resources/META-INF/NOTICE
+++
b/kyuubi-relocated-zookeeper-parent/kyuubi-relocated-zookeeper-36/src/main/resources/META-INF/NOTICE
@@ -1,4 +1,4 @@
-kyuubi-shaded-zookeeper-36
+kyuubi-relocated-zookeeper-36
Copyright 2023 The Apache Software Foundation
This product includes software developed at
diff --git a/kyuubi-shaded-zookeeper-parent/pom.xml
b/kyuubi-relocated-zookeeper-parent/pom.xml
similarity index 95%
rename from kyuubi-shaded-zookeeper-parent/pom.xml
rename to kyuubi-relocated-zookeeper-parent/pom.xml
index 45b7c5a..5fa7480 100644
--- a/kyuubi-shaded-zookeeper-parent/pom.xml
+++ b/kyuubi-relocated-zookeeper-parent/pom.xml
@@ -24,17 +24,17 @@ under the License.
<parent>
<groupId>org.apache.kyuubi</groupId>
- <artifactId>kyuubi-shaded-parent</artifactId>
+ <artifactId>kyuubi-relocated-parent</artifactId>
<version>0.2.0-SNAPSHOT</version>
</parent>
- <artifactId>kyuubi-shaded-zookeeper-parent</artifactId>
+ <artifactId>kyuubi-relocated-zookeeper-parent</artifactId>
<packaging>pom</packaging>
- <name>kyuubi-shaded-zookeeper-parent</name>
+ <name>kyuubi-relocated-zookeeper-parent</name>
<modules>
- <module>kyuubi-shaded-zookeeper-34</module>
- <module>kyuubi-shaded-zookeeper-36</module>
+ <module>kyuubi-relocated-zookeeper-34</module>
+ <module>kyuubi-relocated-zookeeper-36</module>
</modules>
<build>
diff --git a/pom.xml b/pom.xml
index e7391d6..c2c8d3f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
</parent>
<groupId>org.apache.kyuubi</groupId>
- <artifactId>kyuubi-shaded-parent</artifactId>
+ <artifactId>kyuubi-relocated-parent</artifactId>
<version>0.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -51,9 +51,9 @@
</mailingLists>
<modules>
- <module>kyuubi-shaded-force-shading</module>
- <module>kyuubi-shaded-hive-service-rpc</module>
- <module>kyuubi-shaded-zookeeper-parent</module>
+ <module>kyuubi-relocated-force-shading</module>
+ <module>kyuubi-relocated-hive-service-rpc</module>
+ <module>kyuubi-relocated-zookeeper-parent</module>
</modules>
<scm>