Skip to content

Commit c1158ac

Browse files
huage1994yaooqinn
authored andcommitted
[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](#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 add45cf [guanhua.lgh] [FEATURE] EOL Support for Spark 3.0 Authored-by: guanhua.lgh <guanhua.lgh@alibaba-inc.com> Signed-off-by: Kent Yao <yao@apache.org>
1 parent 1bc3916 commit c1158ac

File tree

5 files changed

+4
-24
lines changed

5 files changed

+4
-24
lines changed

.github/workflows/master.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,19 +45,13 @@ jobs:
4545
- 8
4646
- 11
4747
spark:
48-
- '3.0'
4948
- '3.1'
5049
- '3.2'
5150
- '3.3'
5251
spark-archive: [""]
5352
exclude-tags: [""]
5453
comment: ["normal"]
5554
include:
56-
- java: 8
57-
spark: '3.2'
58-
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'
59-
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'
60-
comment: 'verify-spark-3.0'
6155
- java: 8
6256
spark: '3.2'
6357
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'

.github/workflows/style.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
cache: 'maven'
4747
check-latest: false
4848
- name: Scalastyle with maven
49-
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
49+
run: build/mvn scalastyle:check -Pflink-provided,hive-provided,spark-provided,spark-block-cleaner,spark-3.3,spark-3.2,spark-3.1,tpcds
5050
- name: Print scalastyle error report
5151
if: failure()
5252
run: >-
@@ -57,4 +57,4 @@ jobs:
5757
fi
5858
done
5959
- name: JavaStyle with maven
60-
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
60+
run: build/mvn spotless:check -Pflink-provided,hive-provided,spark-provided,spark-block-cleaner,spark-3.3,spark-3.2,spark-3.1,tpcds

dev/reformat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ set -x
2020

2121
KYUUBI_HOME="$(cd "`dirname "$0"`/.."; pwd)"
2222

23-
PROFILES="-Pflink-provided,hive-provided,spark-provided,spark-block-cleaner,spark-3.3,spark-3.2,spark-3.1,spark-3.0,tpcds"
23+
PROFILES="-Pflink-provided,hive-provided,spark-provided,spark-block-cleaner,spark-3.3,spark-3.2,spark-3.1,tpcds"
2424

2525
${KYUUBI_HOME}/build/mvn spotless:apply $PROFILES

docs/develop_tools/building.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ Since v1.1.0, Kyuubi support building with different Spark profiles,
6464

6565
Profile | Default | Since
6666
--- | --- | ---
67-
-Pspark-3.0 | Yes | 1.0.0
6867
-Pspark-3.1 | No | 1.1.0
68+
-Pspark-3.2 | Yes | 1.4.0
6969

7070

7171
## Building with Apache dlcdn site

pom.xml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1985,20 +1985,6 @@
19851985
</properties>
19861986
</profile>
19871987

1988-
<profile>
1989-
<id>spark-3.0</id>
1990-
<properties>
1991-
<spark.version>3.0.3</spark.version>
1992-
<delta.version>0.8.0</delta.version>
1993-
<iceberg.name>iceberg-spark3-runtime</iceberg.name>
1994-
<!--
1995-
https://hudi.apache.org/releases/release-0.11.0/#bundle-usage-updates
1996-
Hudi 0.11.0 Spark bundle for 3.0.x is no longer officially supported.
1997-
-->
1998-
<maven.plugin.scalatest.exclude.tags>org.scalatest.tags.Slow,org.apache.kyuubi.tags.HudiTest</maven.plugin.scalatest.exclude.tags>
1999-
</properties>
2000-
</profile>
2001-
20021988
<profile>
20031989
<id>spark-3.1</id>
20041990
<properties>

0 commit comments

Comments
 (0)