Skip to content

Commit 69efac5

Browse files
ulysses-youyaooqinn
authored andcommitted
[KYUUBI #1618] Correct hadoop version in RELEASE file
<!-- 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. --> correct verion of - Spark Hadoop - Kyuubi Hadoop ### _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.readthedocs.io/en/latest/develop_tools/testing.html#running-tests) locally before make a pull request Closes #1618 from ulysses-you/correct-version. Closes #1618 64c8a5a [ulysses-you] grep -v 86d48df [ulysses-you] fix eb39f63 [ulysses-you] fix Authored-by: ulysses-you <ulyssesyou18@gmail.com> Signed-off-by: Kent Yao <yao@apache.org>
1 parent 4c6a07f commit 69efac5

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

bin/load-kyuubi-env.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ export KYUUBI_SCALA_VERSION="${KYUUBI_SCALA_VERSION:-"2.12"}"
7272

7373
if [[ -f ${KYUUBI_HOME}/RELEASE ]]; then
7474
KYUUBI_VERSION="$(grep "Kyuubi " "$KYUUBI_HOME/RELEASE" | awk -F ' ' '{print $2}')"
75-
SPARK_VERSION_BUILD="$(grep "Spark " "$KYUUBI_HOME/RELEASE" | awk -F ' ' '{print $2}')"
76-
HADOOP_VERSION_BUILD="$(grep "Hadoop " "$KYUUBI_HOME/RELEASE" | awk -F ' ' '{print $2}')"
75+
SPARK_VERSION_BUILD="$(grep "Spark " "$KYUUBI_HOME/RELEASE" | awk -F ' ' '{print $2}' | grep -v 'Hadoop')"
76+
HADOOP_VERSION_BUILD="$(grep "Spark Hadoop " "$KYUUBI_HOME/RELEASE" | awk -F ' ' '{print $3}')"
7777
SPARK_BUILTIN="${KYUUBI_HOME}/externals/spark-$SPARK_VERSION_BUILD-bin-hadoop${HADOOP_VERSION_BUILD:0:3}"
7878
else
7979
MVN="${MVN:-"${KYUUBI_HOME}/build/mvn"}"

build/dist

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,8 @@ echo "Kyuubi $VERSION $GITREVSTRING built for" > "$DISTDIR/RELEASE"
184184
echo "Java $JAVA_VERSION" >> "$DISTDIR/RELEASE"
185185
echo "Scala $SCALA_VERSION" >> "$DISTDIR/RELEASE"
186186
echo "Spark $SPARK_VERSION" >> "$DISTDIR/RELEASE"
187-
echo "Hadoop $SPARK_HADOOP_VERSION" >> "$DISTDIR/RELEASE"
187+
echo "Spark Hadoop $SPARK_HADOOP_VERSION" >> "$DISTDIR/RELEASE"
188+
echo "Kyuubi Hadoop $HADOOP_VERSION" >> "$DISTDIR/RELEASE"
188189
echo "Hive $HIVE_VERSION" >> "$DISTDIR/RELEASE"
189190
echo "Build flags: $@" >> "$DISTDIR/RELEASE"
190191

0 commit comments

Comments
 (0)