From c1158acccaa23edbbd29c5d1f4000635892aa21f Mon Sep 17 00:00:00 2001 From: "guanhua.lgh" Date: Tue, 12 Jul 2022 11:01:50 +0800 Subject: [PATCH] [KYUUBI #2974][FEATURE] EOL Support for Spark 3.0 ### _Why are the changes needed?_ This PR is to drop support for spark 3.0 from compiling/building and test. [#2974](https://github.com/apache/incubator-kyuubi/issues/2974) Following the discussion on dev list https://lists.apache.org/thread/3mw8zz9r0tzg2dpj6717xy59610bhkp4 ### _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 #3035 from huage1994/2974. Closes #2974 add45cfe [guanhua.lgh] [FEATURE] EOL Support for Spark 3.0 Authored-by: guanhua.lgh Signed-off-by: Kent Yao --- .github/workflows/master.yml | 6 ------ .github/workflows/style.yml | 4 ++-- dev/reformat | 2 +- docs/develop_tools/building.md | 2 +- pom.xml | 14 -------------- 5 files changed, 4 insertions(+), 24 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 60f1430e5..896808c66 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -45,7 +45,6 @@ jobs: - 8 - 11 spark: - - '3.0' - '3.1' - '3.2' - '3.3' @@ -53,11 +52,6 @@ jobs: exclude-tags: [""] comment: ["normal"] include: - - java: 8 - spark: '3.2' - spark-archive: '-Dspark.archive.mirror=https://archive.apache.org/dist/spark/spark-3.0.3 -Dspark.archive.name=spark-3.0.3-bin-hadoop2.7.tgz' - exclude-tags: '-Dmaven.plugin.scalatest.exclude.tags=org.scalatest.tags.Slow,org.apache.kyuubi.tags.DeltaTest,org.apache.kyuubi.tags.HudiTest,org.apache.kyuubi.tags.IcebergTest' - comment: 'verify-spark-3.0' - java: 8 spark: '3.2' spark-archive: '-Dspark.archive.mirror=https://archive.apache.org/dist/spark/spark-3.1.3 -Dspark.archive.name=spark-3.1.3-bin-hadoop3.2.tgz' diff --git a/.github/workflows/style.yml b/.github/workflows/style.yml index 2ee2dd61c..9780ebd2f 100644 --- a/.github/workflows/style.yml +++ b/.github/workflows/style.yml @@ -46,7 +46,7 @@ jobs: cache: 'maven' check-latest: false - name: Scalastyle with maven - run: build/mvn scalastyle:check -Pflink-provided,hive-provided,spark-provided,spark-block-cleaner,spark-3.3,spark-3.2,spark-3.1,spark-3.0,tpcds + run: build/mvn scalastyle:check -Pflink-provided,hive-provided,spark-provided,spark-block-cleaner,spark-3.3,spark-3.2,spark-3.1,tpcds - name: Print scalastyle error report if: failure() run: >- @@ -57,4 +57,4 @@ jobs: fi done - name: JavaStyle with maven - run: build/mvn spotless:check -Pflink-provided,hive-provided,spark-provided,spark-block-cleaner,spark-3.3,spark-3.2,spark-3.1,spark-3.0,tpcds + run: build/mvn spotless:check -Pflink-provided,hive-provided,spark-provided,spark-block-cleaner,spark-3.3,spark-3.2,spark-3.1,tpcds diff --git a/dev/reformat b/dev/reformat index a0ed455db..88a8c238a 100755 --- a/dev/reformat +++ b/dev/reformat @@ -20,6 +20,6 @@ set -x KYUUBI_HOME="$(cd "`dirname "$0"`/.."; pwd)" -PROFILES="-Pflink-provided,hive-provided,spark-provided,spark-block-cleaner,spark-3.3,spark-3.2,spark-3.1,spark-3.0,tpcds" +PROFILES="-Pflink-provided,hive-provided,spark-provided,spark-block-cleaner,spark-3.3,spark-3.2,spark-3.1,tpcds" ${KYUUBI_HOME}/build/mvn spotless:apply $PROFILES diff --git a/docs/develop_tools/building.md b/docs/develop_tools/building.md index 7f5e632ee..3656db79b 100644 --- a/docs/develop_tools/building.md +++ b/docs/develop_tools/building.md @@ -64,8 +64,8 @@ Since v1.1.0, Kyuubi support building with different Spark profiles, Profile | Default | Since --- | --- | --- --Pspark-3.0 | Yes | 1.0.0 -Pspark-3.1 | No | 1.1.0 +-Pspark-3.2 | Yes | 1.4.0 ## Building with Apache dlcdn site diff --git a/pom.xml b/pom.xml index 11244dc9c..40b38bc7d 100644 --- a/pom.xml +++ b/pom.xml @@ -1985,20 +1985,6 @@ - - spark-3.0 - - 3.0.3 - 0.8.0 - iceberg-spark3-runtime - - org.scalatest.tags.Slow,org.apache.kyuubi.tags.HudiTest - - - spark-3.1