From eadca7589c6eef28725278c6818417b96330342d Mon Sep 17 00:00:00 2001
From: Kent Yao <yao@apache.org>
Date: Mon, 18 Jan 2021 14:23:31 +0800
Subject: [PATCH] [KYUUBI #296] Add spark 2.4 profile and shade hive-sevice-rpc
 to engine jar to fix thrift build err (#296)

* add spark 2.4.7 profile

* nit

* nit

* scala versions for profile spark-2.4
---
 externals/kyuubi-download/pom.xml         |  2 +-
 externals/kyuubi-spark-sql-engine/pom.xml | 34 ++++++++++++++++++++++-
 pom.xml                                   |  9 ++++++
 3 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/externals/kyuubi-download/pom.xml b/externals/kyuubi-download/pom.xml
index bb5d3745c..0409fa150 100644
--- a/externals/kyuubi-download/pom.xml
+++ b/externals/kyuubi-download/pom.xml
@@ -65,4 +65,4 @@
         </plugins>
     </build>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/externals/kyuubi-spark-sql-engine/pom.xml b/externals/kyuubi-spark-sql-engine/pom.xml
index b1e40d6be..e85ca79eb 100644
--- a/externals/kyuubi-spark-sql-engine/pom.xml
+++ b/externals/kyuubi-spark-sql-engine/pom.xml
@@ -93,4 +93,36 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+
+    <profiles>
+        <profile>
+            <id>spark-2.4</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-shade-plugin</artifactId>
+                        <configuration>
+                            <shadedArtifactAttached>false</shadedArtifactAttached>
+                            <artifactSet>
+                                <includes>
+                                    <include>org.apache.kyuubi:kyuubi-common</include>
+                                    <include>org.apache.kyuubi:kyuubi-ha</include>
+                                    <include>org.apache.hive:hive-service-rpc</include>
+                                </includes>
+                            </artifactSet>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>shade</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+</project>
diff --git a/pom.xml b/pom.xml
index f6da6098b..6f54c26e7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -808,5 +808,14 @@
                 <module>dev/kyuubi-tpcds</module>
             </modules>
         </profile>
+
+        <profile>
+            <id>spark-2.4</id>
+            <properties>
+                <spark.version>2.4.7</spark.version>
+                <scala.version>2.11.12</scala.version>
+                <scala.binary.version>2.11</scala.binary.version>
+            </properties>
+        </profile>
     </profiles>
 </project>