You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kyuubi.apache.org by ch...@apache.org on 2023/05/17 10:23:51 UTC

[kyuubi-shaded] branch master updated: [KYUUBI-SHADED #7] Shorten relocated package name

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 f7da10c  [KYUUBI-SHADED #7] Shorten relocated package name
f7da10c is described below

commit f7da10c3e3b251fd062fd8de9636f102517bffd7
Author: Cheng Pan <ch...@apache.org>
AuthorDate: Wed May 17 18:23:43 2023 +0800

    [KYUUBI-SHADED #7] Shorten relocated package name
    
    ### _Why are the changes needed?_
    
    ### _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 #7 from pan3793/package-name.
    
    2114cc9 [Cheng Pan] shaded package name
    
    Authored-by: Cheng Pan <ch...@apache.org>
    Signed-off-by: Cheng Pan <ch...@apache.org>
---
 kyuubi-shaded-zookeeper-parent/pom.xml | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/kyuubi-shaded-zookeeper-parent/pom.xml b/kyuubi-shaded-zookeeper-parent/pom.xml
index 17e7630..3bc16ac 100644
--- a/kyuubi-shaded-zookeeper-parent/pom.xml
+++ b/kyuubi-shaded-zookeeper-parent/pom.xml
@@ -37,11 +37,6 @@ under the License.
         <module>kyuubi-shaded-zookeeper-36</module>
     </modules>
 
-    <properties>
-        <shading.zookeeper.prefix>${shading.prefix}.zookeeper</shading.zookeeper.prefix>
-        <shading.curator.prefix>${shading.prefix}.curator</shading.curator.prefix>
-    </properties>
-
     <build>
         <plugins>
             <plugin>
@@ -65,27 +60,23 @@ under the License.
                             <relocations>
                                 <relocation>
                                     <pattern>org.apache.zookeeper</pattern>
-                                    <shadedPattern>${shading.zookeeper.prefix}.org.apache.zookeeper</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>io.netty</pattern>
-                                    <shadedPattern>${shading.zookeeper.prefix}.io.netty</shadedPattern>
+                                    <shadedPattern>${shading.prefix}.zookeeper</shadedPattern>
                                 </relocation>
                                 <relocation>
                                     <pattern>org.apache.jute</pattern>
-                                    <shadedPattern>${shading.zookeeper.prefix}.org.apache.jute</shadedPattern>
+                                    <shadedPattern>${shading.prefix}.jute</shadedPattern>
                                 </relocation>
                                 <relocation>
                                     <pattern>com.codahale.metrics</pattern>
-                                    <shadedPattern>${shading.zookeeper.prefix}.com.codahale.metrics</shadedPattern>
+                                    <shadedPattern>${shading.prefix}.metrics</shadedPattern>
                                 </relocation>
                                 <relocation>
                                     <pattern>org.apache.curator</pattern>
-                                    <shadedPattern>${shading.curator.prefix}.org.apache.curator</shadedPattern>
+                                    <shadedPattern>${shading.prefix}.curator</shadedPattern>
                                 </relocation>
                                 <relocation>
                                     <pattern>com.google</pattern>
-                                    <shadedPattern>${shading.curator.prefix}.com.google</shadedPattern>
+                                    <shadedPattern>${shading.prefix}.google</shadedPattern>
                                 </relocation>
                             </relocations>
                         </configuration>