You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by GitBox <gi...@apache.org> on 2018/12/04 12:12:18 UTC
[GitHub] spmallette closed pull request #1002: TINKERPOP-2101 Upgrade Spark
to Spark 2.4
spmallette closed pull request #1002: TINKERPOP-2101 Upgrade Spark to Spark 2.4
URL: https://github.com/apache/tinkerpop/pull/1002
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/hadoop-gremlin/pom.xml b/hadoop-gremlin/pom.xml
index f62b70bf31..d0000715be 100644
--- a/hadoop-gremlin/pom.xml
+++ b/hadoop-gremlin/pom.xml
@@ -67,6 +67,10 @@ limitations under the License.
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId>
+ </exclusion>
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
@@ -105,6 +109,11 @@ limitations under the License.
<artifactId>commons-logging</artifactId>
<version>1.1.3</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId>
+ <version>1.8.1</version>
+ </dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
@@ -206,4 +215,4 @@ limitations under the License.
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/pom.xml b/pom.xml
index f63d8c95b9..91e309ae5a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -162,7 +162,7 @@ limitations under the License.
<netty.version>4.1.25.Final</netty.version>
<slf4j.version>1.7.21</slf4j.version>
<snakeyaml.version>1.15</snakeyaml.version>
- <spark.version>2.3.1</spark.version>
+ <spark.version>2.4.0</spark.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services