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 2020/05/21 18:16:31 UTC

[tinkerpop] 24/27: TINKERPOP-2076 Resolve commons-text conflict after rebase

This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch TINKERPOP-2076
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 229741dc89baf72789d58c61a4cd630ea11946d0
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Tue Mar 10 18:16:16 2020 -0400

    TINKERPOP-2076 Resolve commons-text conflict after rebase
    
    Spark 3.0 conflicted with gremlin-core
---
 spark-gremlin/pom.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/spark-gremlin/pom.xml b/spark-gremlin/pom.xml
index 6483a89..34efb78 100644
--- a/spark-gremlin/pom.xml
+++ b/spark-gremlin/pom.xml
@@ -115,6 +115,10 @@
                     <groupId>jakarta.annotation</groupId>
                     <artifactId>jakarta.annotation-api</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.apache.commons</groupId>
+                    <artifactId>commons-text</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <!-- spark self-conflict and hadoop conflict -->