diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 76f570a13..7fd209a83 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -37,13 +37,14 @@ jobs: spark: '3.0' spark-hadoop: '2.7' - java: 8 - spark: '3.0' + spark: '3.1' spark-hadoop: '2.7' - profiles: '-Dspark.archive.mirror=https://archive.apache.org/dist/spark/spark-3.1.2 -Dspark.archive.name=spark-3.1.2-bin-hadoop2.7.tgz -Dmaven.plugin.scalatest.exclude.tags=org.apache.kyuubi.tags.ExtendedSQLTest,org.apache.kyuubi.tags.DeltaTest,org.apache.kyuubi.tags.IcebergTest' + profiles: '-Dspark.archive.mirror=https://archive.apache.org/dist/spark/spark-3.0.3 -Dspark.archive.name=spark-3.0.3-bin-hadoop2.7.tgz -Dmaven.plugin.scalatest.exclude.tags=org.apache.kyuubi.tags.ExtendedSQLTest,org.apache.kyuubi.tags.DeltaTest,org.apache.kyuubi.tags.IcebergTest' - java: 8 spark: '3.1' spark-hadoop: '3.2' profiles: '-Pkyuubi-extension-spark_3.1' + codecov: 'true' - java: 11 spark: '3.1' spark-hadoop: '3.2' @@ -86,7 +87,7 @@ jobs: ./build/mvn clean install -Dmaven.javadoc.skip=true -V -Pspark-${{ matrix.spark }} -Pspark-hadoop-${{ matrix.spark-hadoop }} ${{ matrix.profiles }} - name: Code coverage - if: ${{ matrix.profiles == '' }} + if: ${{ matrix.codecov == 'true' }} run: bash <(curl -s https://codecov.io/bash) - name: Detected Dependency List Change run: build/dependency.sh diff --git a/.travis.yml b/.travis.yml index 6f0a6cc44..cc404e11b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ sudo: required dist: bionic language: scala scala: - - 2.12.10 + - 2.12.14 jdk: - openjdk8 - openjdk11 @@ -29,19 +29,19 @@ cache: matrix: include: - - name: Test Kyuubi w/ Default Profile + - name: Test Kyuubi w/ -Pspark-3.0 -Pspark-hadoop-2.7 env: - - PROFILE="" + - PROFILE="-Pspark-3.0 -Pspark-hadoop-2.7" - JOB="build" - - CODECOV="true" - - name: Test Kyuubi w/ -Pspark-3.0 and Spark 3.1 binary + - name: Test Kyuubi w/ -Pspark-3.1 and Spark 3.0 binary env: - - PROFILE="-Pspark-3.0 -Dspark.archive.mirror=https://archive.apache.org/dist/spark/spark-3.1.2 -Dspark.archive.name=spark-3.1.2-bin-hadoop2.7.tgz -Dmaven.plugin.scalatest.exclude.tags=org.apache.kyuubi.tags.ExtendedSQLTest,org.apache.kyuubi.tags.DeltaTest,org.apache.kyuubi.tags.IcebergTest" + - PROFILE="-Pspark-3.1 -Pspark-hadoop-2.7 -Dspark.archive.mirror=https://archive.apache.org/dist/spark/spark-3.0.3 -Dspark.archive.name=spark-3.0.3-bin-hadoop2.7.tgz -Dmaven.plugin.scalatest.exclude.tags=org.apache.kyuubi.tags.ExtendedSQLTest,org.apache.kyuubi.tags.DeltaTest,org.apache.kyuubi.tags.IcebergTest" - JOB="build" - name: Test Kyuubi w/ -Pspark-3.1 -Pkyuubi-extension-spark_3.1 env: - PROFILE="-Pspark-3.1 -Pkyuubi-extension-spark_3.1" - JOB="build" + - CODECOV="true" - name: Test Kyuubi w/ -Pspark-master env: - PROFILE="-Pspark-master" diff --git a/pom.xml b/pom.xml index b1ac8836e..49d7e4631 100644 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,7 @@ The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt + https://www.apache.org/licenses/LICENSE-2.0.txt manual @@ -68,10 +68,10 @@ 3.2.2 3.10 2.12.0 - 0.8.0 + 1.0.0 30.1-jre 3.2.2 - 2.7 + 3.2 2.3.7 2.11.4 4.0.4 @@ -80,7 +80,7 @@ 9.4.41.v20210516 5.1.4 0.10.0 - 3.0.3 + 3.1.2 spark-${spark.version}-bin-hadoop${hadoop.binary.version}.tgz https://archive.apache.org/dist/spark/spark-${spark.version} false @@ -103,7 +103,7 @@ 4.3.0 2.22.0 2.0.2 - org.apache.kyuubi.tags.ExtendedSQLTest + org.apache.kyuubi.tags.ExtendedSQLTest,org.apache.kyuubi.tags.IcebergTest 0.8.6 3.2.4