From 7f040fb2c2fd66ed7a5972ab99c25852ed34ceda Mon Sep 17 00:00:00 2001
From: ulysses-you <ulyssesyou18@gmail.com>
Date: Thu, 13 May 2021 18:32:55 +0800
Subject: [PATCH] [KYUUBI #634] Move kyuubi extension to its own dir when
 building

<!--
Thanks for sending a pull request!

Here are some tips for you:
  1. If this is your first time, please read our contributor guidelines: https://kyuubi.readthedocs.io/en/latest/community/contributions.html
  2. If the PR is related to an issue in https://github.com/NetEase/kyuubi/issues, add '[KYUUBI #XXXX]' in your PR title, e.g., '[KYUUBI #XXXX] Your PR title ...'.
  3. If the PR is unfinished, add '[WIP]' in your PR title, e.g., '[WIP][KYUUBI #XXXX] Your PR title ...'.
-->

### _Why are the changes needed?_
<!--
Please clarify why the changes are needed. For instance,
  1. If you add a feature, you can talk about the use case of it.
  2. If you fix a bug, you can clarify why it is a bug.
-->
Make Kyuubi jars clear.

### _How was this patch tested?_
Manual test.  After this PR, the packaged dir looks like:
![image](https://user-images.githubusercontent.com/12025282/118102872-e3895400-b40b-11eb-994c-26d28b45e9a8.png)

Closes #634 from ulysses-you/extension-dir.

Closes #634

2c5009a [ulysses-you] comment
35063ea [ulysses-you] Merge branch 'master' of https://github.com/NetEase/kyuubi into extension-dir
f2b4fff [ulysses-you] init

Authored-by: ulysses-you <ulyssesyou18@gmail.com>
Signed-off-by: Kent Yao <yao@apache.org>
---
 build/dist              |  7 +++++++
 kyuubi-assembly/pom.xml | 12 ------------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/build/dist b/build/dist
index e64060156..3ad1cee3f 100755
--- a/build/dist
+++ b/build/dist
@@ -193,6 +193,13 @@ cp -r "$KYUUBI_HOME/kyuubi-assembly/target/scala-$SCALA_VERSION/jars/" "$DISTDIR
 # Copy spark engines
 cp "$KYUUBI_HOME/externals/kyuubi-spark-sql-engine/target/kyuubi-spark-sql-engine-$VERSION.jar" "$DISTDIR/externals/engines/spark"
 
+# Copy Kyuubi extension
+SPARK_MID_VERSION=${SPARK_VERSION%.*}
+if [[ -d $"$KYUUBI_HOME/dev/kyuubi-extension-spark_$SPARK_MID_VERSION" ]]; then
+  mkdir -p "$DISTDIR/extension"
+  cp "$KYUUBI_HOME/dev/kyuubi-extension-spark_$SPARK_MID_VERSION/target/kyuubi-extension-spark_$SPARK_MID_VERSION-$VERSION.jar" "$DISTDIR/extension"
+fi
+
 if [[ "$SPARK_PROVIDED" != "true" ]]; then
   # Copy spark binary dist
   cp -r "$KYUUBI_HOME/externals/kyuubi-download/target/spark-$SPARK_VERSION-bin-hadoop${SPARK_HADOOP_VERSION}$HIVE_VERSION_SUFFIX/" \
diff --git a/kyuubi-assembly/pom.xml b/kyuubi-assembly/pom.xml
index 44b60fe5c..562471b70 100644
--- a/kyuubi-assembly/pom.xml
+++ b/kyuubi-assembly/pom.xml
@@ -101,16 +101,4 @@
         </dependency>
     </dependencies>
 
-    <profiles>
-        <profile>
-            <id>kyuubi-extension-spark_3.1</id>
-            <dependencies>
-                <dependency>
-                    <groupId>org.apache.kyuubi</groupId>
-                    <artifactId>kyuubi-extension-spark_3.1</artifactId>
-                    <version>${project.version}</version>
-                </dependency>
-            </dependencies>
-        </profile>
-    </profiles>
 </project>