You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kyuubi.apache.org by ch...@apache.org on 2021/12/31 06:51:34 UTC

[incubator-kyuubi] branch master updated: [KYUUBI #1656] Fix dist failed with --spark-provided

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

chengpan 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 05b2298  [KYUUBI #1656] Fix dist failed with --spark-provided
05b2298 is described below

commit 05b22989effcd2895f9839c9246b83ed0cafc523
Author: shenbing <sh...@163.com>
AuthorDate: Fri Dec 31 14:51:26 2021 +0800

    [KYUUBI #1656] Fix dist failed with --spark-provided
    
    <!--
    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/apache/incubator-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.
    -->
    
    ### _How was this patch tested?_
    - [ ] Add some test cases that check the changes thoroughly including negative and positive cases if possible
    
    - [x] Add screenshots for manual tests if appropriate
    ![image](https://user-images.githubusercontent.com/16119667/147799077-3ccff7ba-d1bc-494e-b7ae-d92c900b2fff.png)
    ![image](https://user-images.githubusercontent.com/16119667/147799399-cc0fc685-0fc7-4ea2-b72b-1bed97cd9dbf.png)
    
    - [ ] [Run test](https://kyuubi.readthedocs.io/en/latest/develop_tools/testing.html#running-tests) locally before make a pull request
    
    Closes #1664 from shenbinglife/master.
    
    Closes #1656
    
    576f387c [shenbing] [KYUUBI #1656] Add flink profile active to maven opts
    de9c14d0 [shenbing] [KYUUBI #1656] Fix dist failed with --spark-provided
    
    Authored-by: shenbing <sh...@163.com>
    Signed-off-by: Cheng Pan <ch...@apache.org>
---
 build/dist | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/build/dist b/build/dist
index e064299..86e6dbc 100755
--- a/build/dist
+++ b/build/dist
@@ -171,7 +171,11 @@ fi
 
 MVN_DIST_OPT="-DskipTests"
 if [[ "$SPARK_PROVIDED" == "true" ]]; then
-  MVN_DIST_OPT="$MVN_DIST_OPT -Pflink-provided,spark-provided"
+  MVN_DIST_OPT="$MVN_DIST_OPT -Pspark-provided"
+fi
+
+if [[ "$FLINK_PROVIDED" == "true" ]]; then
+  MVN_DIST_OPT="$MVN_DIST_OPT -Pflink-provided"
 fi
 
 BUILD_COMMAND=("$MVN" clean install $MVN_DIST_OPT $@)