Skip to content

Commit

Permalink
[KYUUBI #1876] Set Spark 3.2.1 as default
Browse files Browse the repository at this point in the history
<!--
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.
-->
Set Spark 3.2.1 as default.

### _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

- [x] [Run test](https://kyuubi.apache.org/docs/latest/develop_tools/testing.html#running-tests) locally before make a pull request

Closes #1913 from SteNicholas/KYUUBI-1876.

Closes #1876

1a6e4c6 [SteNicholas] [KYUUBI #1876] Set Spark 3.2.1 as default

Authored-by: SteNicholas <programgeek@163.com>
Signed-off-by: Cheng Pan <chengpan@apache.org>
  • Loading branch information
SteNicholas authored and pan3793 committed Feb 15, 2022
1 parent 6811530 commit 24e265d
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 8 deletions.
4 changes: 2 additions & 2 deletions bin/docker-image-tool.sh
Expand Up @@ -208,8 +208,8 @@ Examples:
$0 -r docker.io/myrepo -t v1.4.0 build
$0 -r docker.io/myrepo -t v1.4.0 push
- Build and push with tag "v3.0.0" and Spark-3.1.2 as base image to docker.io/myrepo
$0 -r docker.io/myrepo -t v3.0.0 -b BASE_IMAGE=repo/spark:3.1.2 build
- Build and push with tag "v3.0.0" and Spark-3.2.1 as base image to docker.io/myrepo
$0 -r docker.io/myrepo -t v3.0.0 -b BASE_IMAGE=repo/spark:3.2.1 build
$0 -r docker.io/myrepo -t v3.0.0 push
- Build and push for multiple archs to docker.io/myrepo
Expand Down
2 changes: 1 addition & 1 deletion build/release/create-package.sh
Expand Up @@ -75,7 +75,7 @@ package_binary() {

echo "Creating binary release tarball ${BIN_TGZ_FILE}"

${KYUUBI_DIR}/build/dist --tgz --spark-provided -Pspark-3.1
${KYUUBI_DIR}/build/dist --tgz --spark-provided -Pspark-3.2

cp "${BIN_TGZ_FILE}" "${RELEASE_DIR}"

Expand Down
2 changes: 1 addition & 1 deletion docs/community/release.md
Expand Up @@ -175,7 +175,7 @@ export RELEASE_RC_NO=<RC number, e.g. 0>
```shell
build/mvn versions:set -DgenerateBackupPoms=false \
-DnewVersion="${RELEASE_VERSION}" \
-Pspark-3.1,spark-block-cleaner
-Pspark-3.2,spark-block-cleaner

git commit -am "[RELEASE] Bump ${RELEASE_VERSION}"
```
Expand Down
4 changes: 2 additions & 2 deletions docs/deployment/kyuubi_on_kubernetes.md
Expand Up @@ -47,8 +47,8 @@ Examples:
$0 -r docker.io/myrepo -t v1.4.0 build
$0 -r docker.io/myrepo -t v1.4.0 push

- Build and push with tag "v3.0.0" and Spark-3.1.2 as base image to docker.io/myrepo
$0 -r docker.io/myrepo -t v3.0.0 -b BASE_IMAGE=repo/spark:3.1.2 build
- Build and push with tag "v3.0.0" and Spark-3.2.1 as base image to docker.io/myrepo
$0 -r docker.io/myrepo -t v3.0.0 -b BASE_IMAGE=repo/spark:3.2.1 build
$0 -r docker.io/myrepo -t v3.0.0 push

- Build and push for multiple archs to docker.io/myrepo
Expand Down
5 changes: 3 additions & 2 deletions pom.xml
Expand Up @@ -101,7 +101,7 @@
<commons-lang.version>2.6</commons-lang.version>
<commons-lang3.version>3.10</commons-lang3.version>
<curator.version>2.12.0</curator.version>
<delta.version>1.0.1</delta.version>
<delta.version>1.1.0</delta.version>
<flink.version>1.14.3</flink.version>
<flink.archive.name>flink-${flink.version}-bin-scala_${scala.binary.version}.tgz</flink.archive.name>
<flink.archive.mirror>https://archive.apache.org/dist/flink/flink-${flink.version}</flink.archive.mirror>
Expand Down Expand Up @@ -133,7 +133,8 @@
<scopt.version>4.0.1</scopt.version>
<slf4j.version>1.7.35</slf4j.version>
<log4j.version>2.17.1</log4j.version>
<spark.version>3.1.2</spark.version>
<!-- If you change the minor version of Spark, don't forget to change the default 'delta.version' -->
<spark.version>3.2.1</spark.version>
<spark.archive.name>spark-${spark.version}-bin-hadoop${hadoop.binary.version}.tgz</spark.archive.name>
<spark.archive.mirror>https://archive.apache.org/dist/spark/spark-${spark.version}</spark.archive.mirror>
<spark.archive.download.skip>false</spark.archive.download.skip>
Expand Down

0 comments on commit 24e265d

Please sign in to comment.