You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2021/11/11 15:48:02 UTC
[tinkerpop] branch master updated: Bumped to spark 3.2.0 so that
the hadoop version would match. CTR
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
The following commit(s) were added to refs/heads/master by this push:
new 6070431 Bumped to spark 3.2.0 so that the hadoop version would match. CTR
6070431 is described below
commit 6070431f7ed88403c6ecd2a9f0c173c6090d0a71
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Thu Nov 11 10:45:54 2021 -0500
Bumped to spark 3.2.0 so that the hadoop version would match. CTR
---
CHANGELOG.asciidoc | 2 +-
gremlin-groovy/pom.xml | 2 +-
hadoop-gremlin/pom.xml | 29 +++++++++++++++++++++-----
pom.xml | 2 +-
spark-gremlin/pom.xml | 56 ++++++++++++++++++++++++++++++++++++--------------
5 files changed, 68 insertions(+), 23 deletions(-)
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index d3fc76a..341b8ba 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -35,7 +35,7 @@ limitations under the License.
* Exposed Gherkin tests as part of the provider test suite.
* Packaged Gherkin tests and data as standalone package as a convenience distribution.
* Bumped to Apache Hadoop 3.3.1.
-* Bumped to Apache Spark 3.1.2.
+* Bumped to Apache Spark 3.2.0.
* Changed `NumberHelper` to properly cast to `byte` and `short` rather than default coercing to `Integer`.
* Modified some driver defaults (maximum content length, pool size, maximum in process) to be more consistent with one another.
* Fixed a potential connection load balancing issue due to a race condition not updating the usage count.
diff --git a/gremlin-groovy/pom.xml b/gremlin-groovy/pom.xml
index b24969f..87ea685 100644
--- a/gremlin-groovy/pom.xml
+++ b/gremlin-groovy/pom.xml
@@ -40,7 +40,7 @@ limitations under the License.
<dependency>
<groupId>org.apache.ivy</groupId>
<artifactId>ivy</artifactId>
- <version>2.4.0</version>
+ <version>2.5.0</version>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
diff --git a/hadoop-gremlin/pom.xml b/hadoop-gremlin/pom.xml
index 64bb79e..992bb9d 100644
--- a/hadoop-gremlin/pom.xml
+++ b/hadoop-gremlin/pom.xml
@@ -65,9 +65,17 @@ limitations under the License.
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</exclusion>
<exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.xerial.snappy</groupId>
<artifactId>snappy-java</artifactId>
</exclusion>
@@ -109,11 +117,6 @@ limitations under the License.
<version>1.1.8.2</version>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- <version>2.10.5.1</version>
- </dependency>
- <dependency>
<groupId>com.nimbusds</groupId>
<artifactId>nimbus-jose-jwt</artifactId>
<version>9.8.1</version>
@@ -128,6 +131,22 @@ limitations under the License.
<artifactId>commons-logging</artifactId>
<version>1.2</version>
</dependency>
+ <!-- use jackson 2.12.3 to fit better with spark where Scala module 2.12.3 requires Jackson Databind version >= 2.12.0 and < 2.13.0 -->
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ <version>2.12.3</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>2.12.3</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>2.12.3</version>
+ </dependency>
<!-- log4j is required by hadoop -->
<dependency>
<groupId>log4j</groupId>
diff --git a/pom.xml b/pom.xml
index c08aee7..1e5b68e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -164,7 +164,7 @@ limitations under the License.
<netty.version>4.1.68.Final</netty.version>
<slf4j.version>1.7.25</slf4j.version>
<snakeyaml.version>1.27</snakeyaml.version>
- <spark.version>3.1.2</spark.version>
+ <spark.version>3.2.0</spark.version>
<powermock.version>2.0.9</powermock.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/spark-gremlin/pom.xml b/spark-gremlin/pom.xml
index 089e99a..4c26408 100644
--- a/spark-gremlin/pom.xml
+++ b/spark-gremlin/pom.xml
@@ -52,6 +52,16 @@ limitations under the License.
<groupId>org.apache.kerby</groupId>
<artifactId>kerb-simplekdc</artifactId>
</exclusion>
+ <!-- prefer spark snappy -->
+ <exclusion>
+ <groupId>org.xerial.snappy</groupId>
+ <artifactId>snappy-java</artifactId>
+ </exclusion>
+ <!-- prefer spark gson -->
+ <exclusion>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ </exclusion>
<exclusion>
<groupId>org.apache.kerby</groupId>
<artifactId>kerb-core</artifactId>
@@ -73,10 +83,6 @@ limitations under the License.
<artifactId>avro</artifactId>
</exclusion>
<exclusion>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </exclusion>
- <exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
@@ -88,20 +94,21 @@ limitations under the License.
<artifactId>spark-core_2.12</artifactId>
<version>${spark.version}</version>
<exclusions>
+ <!-- prefer hadoop protobuf -->
<exclusion>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client</artifactId>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
</exclusion>
- <!-- prefer hadoop-gremlins jackson databind -->
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- </exclusion>
- <!-- prefer hadoop-gremlin guava -->
+ <!-- prefer hadoop guava -->
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
+ <!-- prefer hadoop/gremlin-core commons-logging -->
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
@@ -111,6 +118,10 @@ limitations under the License.
<artifactId>jackson-core</artifactId>
</exclusion>
<exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
@@ -122,7 +133,12 @@ limitations under the License.
<groupId>org.apache.commons</groupId>
<artifactId>commons-math3</artifactId>
</exclusion>
- <!-- prefer hadoop-gremlin commons-net -->
+ <!-- prefer the hadoop findbugs -->
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </exclusion>
+ <!-- prefer hadoop commons-net -->
<exclusion>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
@@ -170,6 +186,11 @@ limitations under the License.
<groupId>com.thoughtworks.paranamer</groupId>
<artifactId>paranamer</artifactId>
</exclusion>
+ <!-- prefer sparks xz -->
+ <exclusion>
+ <groupId>org.tukaani</groupId>
+ <artifactId>xz</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -185,12 +206,17 @@ limitations under the License.
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
- <version>2.10.5</version>
+ <version>2.12.3</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
- <version>2.10.5</version>
+ <version>2.12.3</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>2.12.3</version>
</dependency>
<!-- TEST -->
<dependency>