You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kyuubi.apache.org by ya...@apache.org on 2022/04/11 11:04:50 UTC

[incubator-kyuubi] branch master updated: [KYUUBI #2292][FOLLOWUP] Unify kyuubi server plugin location

This is an automated email from the ASF dual-hosted git repository.

yao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-kyuubi.git


The following commit(s) were added to refs/heads/master by this push:
     new 936276119 [KYUUBI #2292][FOLLOWUP] Unify kyuubi server plugin location
936276119 is described below

commit 93627611971fa8926f4af4d895d90d968bf72d88
Author: Fu Chen <cf...@gmail.com>
AuthorDate: Mon Apr 11 19:04:41 2022 +0800

    [KYUUBI #2292][FOLLOWUP] Unify kyuubi server plugin location
    
    ### _Why are the changes needed?_
    
    resolved https://github.com/apache/incubator-kyuubi/pull/2293#discussion_r846934352
    
    Move `kyuubi-server-plugin` to `extension/server/`
    
    ### _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.apache.org/docs/latest/develop_tools/testing.html#running-tests) locally before make a pull request
    
    Closes #2319 from cfmcgrady/kyuubi-2293-followup.
    
    Closes #2292
    
    949fc3d6 [Fu Chen] kyuubi-server -> server
    
    Authored-by: Fu Chen <cf...@gmail.com>
    Signed-off-by: Kent Yao <ya...@apache.org>
---
 .github/labeler.yml                                                     | 2 +-
 .travis.yml                                                             | 2 +-
 extensions/{kyuubi-server => server}/kyuubi-server-plugin/pom.xml       | 0
 .../main/java/org/apache/kyuubi/plugin/DefaultSessionConfAdvisor.java   | 0
 .../src/main/java/org/apache/kyuubi/plugin/SessionConfAdvisor.java      | 0
 pom.xml                                                                 | 2 +-
 6 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/labeler.yml b/.github/labeler.yml
index 1edf1e187..9aca743e7 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -99,7 +99,7 @@
 "module:server":
   - "bin/kyuubi"
   - "kyuubi-server/**/*"
-  - "extension/kyuubi-server/kyuubi-server-plugin/**/*"
+  - "extension/server/kyuubi-server-plugin/**/*"
 
 "module:spark":
   - "externals/kyuubi-spark-sql-engine/**/*" 
diff --git a/.travis.yml b/.travis.yml
index 2924e6db9..340fa8a91 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,7 +37,7 @@ matrix:
   include:
   - name: Build Kyuubi common on Linux ARM64
     script:
-      - ./build/mvn test $MVN_ARGS -pl kyuubi-common,kyuubi-zookeeper,kyuubi-ha,kyuubi-ctl,kyuubi-metrics,kyuubi-hive-beeline,kyuubi-hive-jdbc,extensions/kyuubi-server/kyuubi-server-plugin -am
+      - ./build/mvn test $MVN_ARGS -pl kyuubi-common,kyuubi-zookeeper,kyuubi-ha,kyuubi-ctl,kyuubi-metrics,kyuubi-hive-beeline,kyuubi-hive-jdbc,extensions/server/kyuubi-server-plugin -am
   - name: Build Kyuubi Flink on Linux ARM64
     script:
       - ./build/mvn test $MVN_ARGS -pl externals/kyuubi-flink-sql-engine,kyuubi-server
diff --git a/extensions/kyuubi-server/kyuubi-server-plugin/pom.xml b/extensions/server/kyuubi-server-plugin/pom.xml
similarity index 100%
rename from extensions/kyuubi-server/kyuubi-server-plugin/pom.xml
rename to extensions/server/kyuubi-server-plugin/pom.xml
diff --git a/extensions/kyuubi-server/kyuubi-server-plugin/src/main/java/org/apache/kyuubi/plugin/DefaultSessionConfAdvisor.java b/extensions/server/kyuubi-server-plugin/src/main/java/org/apache/kyuubi/plugin/DefaultSessionConfAdvisor.java
similarity index 100%
rename from extensions/kyuubi-server/kyuubi-server-plugin/src/main/java/org/apache/kyuubi/plugin/DefaultSessionConfAdvisor.java
rename to extensions/server/kyuubi-server-plugin/src/main/java/org/apache/kyuubi/plugin/DefaultSessionConfAdvisor.java
diff --git a/extensions/kyuubi-server/kyuubi-server-plugin/src/main/java/org/apache/kyuubi/plugin/SessionConfAdvisor.java b/extensions/server/kyuubi-server-plugin/src/main/java/org/apache/kyuubi/plugin/SessionConfAdvisor.java
similarity index 100%
rename from extensions/kyuubi-server/kyuubi-server-plugin/src/main/java/org/apache/kyuubi/plugin/SessionConfAdvisor.java
rename to extensions/server/kyuubi-server-plugin/src/main/java/org/apache/kyuubi/plugin/SessionConfAdvisor.java
diff --git a/pom.xml b/pom.xml
index 4a27c862b..0e4f40ff9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,7 +66,7 @@
 
     <modules>
         <module>dev/kyuubi-codecov</module>
-        <module>extensions/kyuubi-server/kyuubi-server-plugin</module>
+        <module>extensions/server/kyuubi-server-plugin</module>
         <module>extensions/spark/kyuubi-spark-authz</module>
         <module>externals/kyuubi-download</module>
         <module>externals/kyuubi-flink-sql-engine</module>