You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@orc.apache.org by om...@apache.org on 2021/02/08 17:22:29 UTC
[orc] branch master updated: ORC-737: Upgrade Spark to 3.1.0
This is an automated email from the ASF dual-hosted git repository.
omalley pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/orc.git
The following commit(s) were added to refs/heads/master by this push:
new 3b40375 ORC-737: Upgrade Spark to 3.1.0
3b40375 is described below
commit 3b40375d9ddfa1b823dbaf5f30a35b6735a754dc
Author: Dongjoon Hyun <do...@apache.org>
AuthorDate: Sun Jan 17 20:35:17 2021 -0800
ORC-737: Upgrade Spark to 3.1.0
Fixes #630
Signed-off-by: Owen O'Malley <om...@apache.org>
---
java/bench/pom.xml | 12 ++++++------
java/bench/spark/pom.xml | 25 ++++++++++++++++++++-----
2 files changed, 26 insertions(+), 11 deletions(-)
diff --git a/java/bench/pom.xml b/java/bench/pom.xml
index d1073bb..cde4672 100644
--- a/java/bench/pom.xml
+++ b/java/bench/pom.xml
@@ -43,7 +43,7 @@
<orc.version>${project.version}</orc.version>
<parquet.version>1.8.3</parquet.version>
<slf4j.version>1.7.25</slf4j.version>
- <spark.version>2.4.6</spark.version>
+ <spark.version>3.1.0</spark.version>
<storage-api.version>2.7.2</storage-api.version>
<zookeeper.version>3.4.6</zookeeper.version>
</properties>
@@ -358,12 +358,12 @@
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
- <artifactId>spark-catalyst_2.11</artifactId>
+ <artifactId>spark-catalyst_2.12</artifactId>
<version>${spark.version}</version>
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
- <artifactId>spark-core_2.11</artifactId>
+ <artifactId>spark-core_2.12</artifactId>
<version>${spark.version}</version>
<exclusions>
<exclusion>
@@ -386,7 +386,7 @@
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
- <artifactId>spark-sql_2.11</artifactId>
+ <artifactId>spark-sql_2.12</artifactId>
<version>${spark.version}</version>
<exclusions>
<exclusion>
@@ -401,7 +401,7 @@
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
- <artifactId>spark-avro_2.11</artifactId>
+ <artifactId>spark-avro_2.12</artifactId>
<version>${spark.version}</version>
</dependency>
<dependency>
@@ -435,7 +435,7 @@
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
- <version>2.11.8</version>
+ <version>2.12.10</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/java/bench/spark/pom.xml b/java/bench/spark/pom.xml
index 88c0710..e84630f 100644
--- a/java/bench/spark/pom.xml
+++ b/java/bench/spark/pom.xml
@@ -36,6 +36,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.useIncrementalCompilation>false</maven.compiler.useIncrementalCompilation>
+ <jackson.version>2.10.0</jackson.version>
</properties>
<dependencies>
@@ -90,17 +91,16 @@
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
- <artifactId>spark-catalyst_2.11</artifactId>
+ <artifactId>spark-catalyst_2.12</artifactId>
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
- <artifactId>spark-core_2.11</artifactId>
+ <artifactId>spark-core_2.12</artifactId>
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
- <artifactId>spark-sql_2.11</artifactId>
+ <artifactId>spark-sql_2.12</artifactId>
</dependency>
- <!-- Spark 2.4.6 uses Parquet 1.10.1 -->
<dependency>
<groupId>org.apache.parquet</groupId>
<artifactId>parquet-hadoop</artifactId>
@@ -109,7 +109,7 @@
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
- <artifactId>spark-avro_2.11</artifactId>
+ <artifactId>spark-avro_2.12</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.janino</groupId>
@@ -135,6 +135,21 @@
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
</dependencies>
<build>