This is an automated email from the ASF dual-hosted git repository.
jiayu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-sedona.git
The following commit(s) were added to refs/heads/master by this push:
new 727ffaad [DOCS] Enable CI on all supported Spark versions (#649)
727ffaad is described below
commit 727ffaad84c1239d730adc69464401ba9039ae08
Author: Jia Yu <[email protected]>
AuthorDate: Tue Jul 12 21:47:12 2022 -0700
[DOCS] Enable CI on all supported Spark versions (#649)
* Enable CI on all supported Spark version
* Add Jackson version support
* Update Jackson
* Test again
* Change jackson.version to sedona.jackson.version
* Remove fail fast
---
.github/workflows/java.yml | 26 +++++++++++++++++++++++---
pom.xml | 8 ++++----
2 files changed, 27 insertions(+), 7 deletions(-)
diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml
index 6d8f7b59..e088f312 100644
--- a/.github/workflows/java.yml
+++ b/.github/workflows/java.yml
@@ -14,15 +14,31 @@ jobs:
runs-on: ubuntu-18.04
strategy:
matrix:
- spark: [2.4.8, 3.0.3, 3.1.2, 3.2.0, 3.3.0]
- scala: [2.12.15]
include:
- spark: 3.3.0
scala: 2.13.8
+ jackson: 2.13.3
- spark: 3.2.0
scala: 2.13.5
+ jackson: 2.12.3
+ - spark: 3.3.0
+ scala: 2.12.15
+ jackson: 2.13.3
+ - spark: 3.2.0
+ scala: 2.12.15
+ jackson: 2.12.3
+ - spark: 3.1.2
+ scala: 2.12.15
+ jackson: 2.10.0
+ - spark: 3.0.3
+ scala: 2.12.15
+ jackson: 2.10.0
+ - spark: 2.4.8
+ scala: 2.12.15
+ jackson: 2.6.7
- spark: 2.4.8
scala: 2.11.8
+ jackson: 2.6.7
steps:
- uses: actions/checkout@v2
@@ -42,7 +58,11 @@ jobs:
- env:
SPARK_VERSION: ${{ matrix.spark }}
SCALA_VERSION: ${{ matrix.scala }}
- run: if [ ${SPARK_VERSION:0:1} == "3" ]; then mvn -q clean install
-Dscala=${SCALA_VERSION:0:4} -Dspark=3.0 ; else mvn -q clean install
-Dscala=${SCALA_VERSION:0:4} -Dspark=2.4 ; fi
+ JACKSON_VERSION: ${{ matrix.jackson }}
+ run: |
+ if [ ${SPARK_VERSION:0:1} == "3" ]; \
+ then mvn -q clean install -Dscala=${SCALA_VERSION:0:4} -Dspark=3.0
-Dspark.version=${SPARK_VERSION} -Dsedona.jackson.version=${JACKSON_VERSION}; \
+ else mvn -q clean install -Dscala=${SCALA_VERSION:0:4} -Dspark=2.4
-Dspark.version=${SPARK_VERSION} -Dsedona.jackson.version=${JACKSON_VERSION};
fi \
- run: mkdir staging
- run: cp core/target/sedona-*.jar staging
- run: cp sql/target/sedona-*.jar staging
diff --git a/pom.xml b/pom.xml
index 27b89854..958c346c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,13 +69,13 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>${jackson.version}</version>
+ <version>${sedona.jackson.version}</version>
<scope>${dependency.scope}</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
- <version>${jackson.version}</version>
+ <version>${sedona.jackson.version}</version>
<scope>${dependency.scope}</scope>
</dependency>
<dependency>
@@ -532,7 +532,7 @@
<spark.version>3.3.0</spark.version>
<spark.compat.version>3.0</spark.compat.version>
<spark.converter.version>spark3</spark.converter.version>
- <jackson.version>2.13.3</jackson.version>
+ <sedona.jackson.version>2.13.3</sedona.jackson.version>
<maven.deploy.skip>false</maven.deploy.skip>
</properties>
</profile>
@@ -549,7 +549,7 @@
<spark.version>2.4.7</spark.version>
<spark.compat.version>2.4</spark.compat.version>
<spark.converter.version>spark2</spark.converter.version>
- <jackson.version>2.6.7</jackson.version>
+ <sedona.jackson.version>2.6.7</sedona.jackson.version>
<maven.deploy.skip>true</maven.deploy.skip>
</properties>
</profile>
