You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kyuubi.apache.org by fc...@apache.org on 2022/04/08 02:16:22 UTC
[incubator-kyuubi] branch master updated: [KYUUBI #2292] Unify kyuubi server plugin location
This is an automated email from the ASF dual-hosted git repository.
fchen 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 b41ec9399 [KYUUBI #2292] Unify kyuubi server plugin location
b41ec9399 is described below
commit b41ec939913b540763e2e9f0cbd2005a9c720b25
Author: ulysses-you <ul...@gmail.com>
AuthorDate: Fri Apr 8 10:16:11 2022 +0800
[KYUUBI #2292] Unify kyuubi server plugin location
### _Why are the changes needed?_
Move `kyuubi-server-plugin` to `extension/kyuubi-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 #2293 from ulysses-you/server-plugin.
Closes #2292
54b1c1e1 [ulysses-you] ordering
55cd92fe [ulysses-you] fix
9e7d4e8c [ulysses-you] unify
Authored-by: ulysses-you <ul...@gmail.com>
Signed-off-by: Fu Chen <cf...@gmail.com>
---
.github/labeler.yml | 4 ++--
.travis.yml | 2 +-
extensions/README.md | 2 +-
.../kyuubi-server/kyuubi-server-plugin}/pom.xml | 1 +
.../main/java/org/apache/kyuubi/plugin/DefaultSessionConfAdvisor.java | 0
.../src/main/java/org/apache/kyuubi/plugin/SessionConfAdvisor.java | 0
pom.xml | 2 +-
7 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/.github/labeler.yml b/.github/labeler.yml
index afbdcf633..9471b7311 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -99,7 +99,7 @@
"module:server":
- "bin/kyuubi"
- "kyuubi-server/**/*"
- - "kyuubi-server-plugin/**/*"
+ - "extension/kyuubi-server/kyuubi-server-plugin/**/*"
"module:spark":
- "externals/kyuubi-spark-sql-engine/**/*"
@@ -107,4 +107,4 @@
- "tools/spark-block-cleaner/**/*"
"module:plugin":
- - "kyuubi-server-plugin/**/*"
+ - "extension/kyuubi-server/kyuubi-server-plugin/**/*"
diff --git a/.travis.yml b/.travis.yml
index 13ed67d89..2924e6db9 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,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/kyuubi-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/README.md b/extensions/README.md
index abe03f27a..92eac9097 100644
--- a/extensions/README.md
+++ b/extensions/README.md
@@ -21,7 +21,7 @@ This folder contains plugins/extension for kyuubi server and different engine ty
- ext
- - server
+ - kyuubi-server
- spark
- flink
- trino
diff --git a/kyuubi-server-plugin/pom.xml b/extensions/kyuubi-server/kyuubi-server-plugin/pom.xml
similarity index 97%
rename from kyuubi-server-plugin/pom.xml
rename to extensions/kyuubi-server/kyuubi-server-plugin/pom.xml
index bb70f398d..c30d344d1 100644
--- a/kyuubi-server-plugin/pom.xml
+++ b/extensions/kyuubi-server/kyuubi-server-plugin/pom.xml
@@ -23,6 +23,7 @@
<artifactId>kyuubi-parent</artifactId>
<groupId>org.apache.kyuubi</groupId>
<version>1.6.0-SNAPSHOT</version>
+ <relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/kyuubi-server-plugin/src/main/java/org/apache/kyuubi/plugin/DefaultSessionConfAdvisor.java b/extensions/kyuubi-server/kyuubi-server-plugin/src/main/java/org/apache/kyuubi/plugin/DefaultSessionConfAdvisor.java
similarity index 100%
rename from kyuubi-server-plugin/src/main/java/org/apache/kyuubi/plugin/DefaultSessionConfAdvisor.java
rename to extensions/kyuubi-server/kyuubi-server-plugin/src/main/java/org/apache/kyuubi/plugin/DefaultSessionConfAdvisor.java
diff --git a/kyuubi-server-plugin/src/main/java/org/apache/kyuubi/plugin/SessionConfAdvisor.java b/extensions/kyuubi-server/kyuubi-server-plugin/src/main/java/org/apache/kyuubi/plugin/SessionConfAdvisor.java
similarity index 100%
rename from kyuubi-server-plugin/src/main/java/org/apache/kyuubi/plugin/SessionConfAdvisor.java
rename to extensions/kyuubi-server/kyuubi-server-plugin/src/main/java/org/apache/kyuubi/plugin/SessionConfAdvisor.java
diff --git a/pom.xml b/pom.xml
index ea56d978d..1d49b8e1d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,6 +66,7 @@
<modules>
<module>dev/kyuubi-codecov</module>
+ <module>extensions/kyuubi-server/kyuubi-server-plugin</module>
<module>extensions/spark/kyuubi-spark-authz</module>
<module>externals/kyuubi-download</module>
<module>externals/kyuubi-flink-sql-engine</module>
@@ -82,7 +83,6 @@
<module>kyuubi-hive-jdbc-shaded</module>
<module>kyuubi-metrics</module>
<module>kyuubi-server</module>
- <module>kyuubi-server-plugin</module>
<module>kyuubi-zookeeper</module>
</modules>