From 831f06ae52ed441415fa98ffaeafb547cd26b222 Mon Sep 17 00:00:00 2001
From: senmiaoliu <senmiaoliu@trip.com>
Date: Wed, 1 Nov 2023 10:59:23 +0800
Subject: [PATCH] just copy server resource sql

---
 build/dist                              |  4 +--
 kyuubi-assembly/assembly/assembly.xml   | 36 ----------------------
 kyuubi-assembly/pom.xml                 | 24 ---------------
 kyuubi-server/pom.xml                   | 21 -------------
 kyuubi-server/src/assembly/assembly.xml | 40 -------------------------
 5 files changed, 2 insertions(+), 123 deletions(-)
 delete mode 100644 kyuubi-assembly/assembly/assembly.xml
 delete mode 100644 kyuubi-server/src/assembly/assembly.xml

diff --git a/build/dist b/build/dist
index 7c7327f0955..e34723d94bd 100755
--- a/build/dist
+++ b/build/dist
@@ -249,7 +249,7 @@ mkdir -p "$DISTDIR/pid"
 mkdir -p "$DISTDIR/logs"
 mkdir -p "$DISTDIR/work"
 mkdir -p "$DISTDIR/jars"
-mkdir -p "$DISTDIR/metastore-sql"
+mkdir -p "$DISTDIR/db-schema"
 mkdir -p "$DISTDIR/beeline-jars"
 mkdir -p "$DISTDIR/web-ui"
 mkdir -p "$DISTDIR/externals/engines/flink"
@@ -272,7 +272,7 @@ echo "Build flags: $@" >> "$DISTDIR/RELEASE"
 cp -r "$KYUUBI_HOME"/kyuubi-assembly/target/scala-$SCALA_VERSION/jars/*.jar "$DISTDIR/jars/"
 
 # Copy kyuubi metadata sql
-cp -r "$KYUUBI_HOME"/kyuubi-assembly/target/kyuubi-assembly/metastore-sql/* "$DISTDIR/metastore-sql/"
+cp -r "$KYUUBI_HOME"/kyuubi-server/src/main/resources/sql/* "$DISTDIR/db-schema/"
 
 # Copy kyuubi beeline jars
 cp "$KYUUBI_HOME"/kyuubi-hive-beeline/target/*.jar "$DISTDIR/beeline-jars/"
diff --git a/kyuubi-assembly/assembly/assembly.xml b/kyuubi-assembly/assembly/assembly.xml
deleted file mode 100644
index 7baaf110168..00000000000
--- a/kyuubi-assembly/assembly/assembly.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
-  ~ contributor license agreements.  See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright ownership.
-  ~ The ASF licenses this file to You under the Apache License, Version 2.0
-  ~ (the "License"); you may not use this file except in compliance with
-  ~ the License.  You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.1 http://maven.apache.org/xsd/assembly-2.1.1.xsd">
-    <id>kyuubi-assembly</id>
-    <formats>
-        <format>dir</format>
-    </formats>
-    <includeBaseDirectory>false</includeBaseDirectory>
-
-    <fileSets>
-        <fileSet>
-            <directory>${project.parent.basedir}/kyuubi-server/target/kyuubi-server/metastore-sql</directory>
-            <includes>
-                <include>**/*</include>
-            </includes>
-            <outputDirectory>metastore-sql</outputDirectory>
-        </fileSet>
-    </fileSets>
-</assembly>
diff --git a/kyuubi-assembly/pom.xml b/kyuubi-assembly/pom.xml
index 0b5d1aee379..4fa0d9a0fd3 100644
--- a/kyuubi-assembly/pom.xml
+++ b/kyuubi-assembly/pom.xml
@@ -120,28 +120,4 @@
             <artifactId>log4j-1.2-api</artifactId>
         </dependency>
     </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>assemble</id>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <phase>package</phase>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>assembly/assembly.xml</descriptor>
-                            </descriptors>
-                            <finalName>kyuubi-assembly</finalName>
-                            <appendAssemblyId>false</appendAssemblyId>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
 </project>
diff --git a/kyuubi-server/pom.xml b/kyuubi-server/pom.xml
index f84d704deb6..56155a27bec 100644
--- a/kyuubi-server/pom.xml
+++ b/kyuubi-server/pom.xml
@@ -581,27 +581,6 @@
                     </execution>
                 </executions>
             </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>assemble</id>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <phase>package</phase>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>src/assembly/assembly.xml</descriptor>
-                            </descriptors>
-                            <finalName>kyuubi-server</finalName>
-                            <appendAssemblyId>false</appendAssemblyId>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
         <outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory>
         <testOutputDirectory>target/scala-${scala.binary.version}/test-classes</testOutputDirectory>
diff --git a/kyuubi-server/src/assembly/assembly.xml b/kyuubi-server/src/assembly/assembly.xml
deleted file mode 100644
index 374e0764bb5..00000000000
--- a/kyuubi-server/src/assembly/assembly.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
-  ~ contributor license agreements.  See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright ownership.
-  ~ The ASF licenses this file to You under the Apache License, Version 2.0
-  ~ (the "License"); you may not use this file except in compliance with
-  ~ the License.  You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.2.0 https://maven.apache.org/xsd/assembly-2.2.0.xsd">
-    <id>kyuubi-server</id>
-
-    <formats>
-        <format>dir</format>
-    </formats>
-
-    <baseDirectory>kyuubi-server</baseDirectory>
-
-    <includeBaseDirectory>false</includeBaseDirectory>
-
-    <fileSets>
-        <fileSet>
-            <directory>${project.basedir}/src/main/resources/sql</directory>
-            <includes>
-                <include>**/*</include>
-            </includes>
-            <outputDirectory>metastore-sql</outputDirectory>
-        </fileSet>
-    </fileSets>
-</assembly>