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 2019/07/16 21:05:13 UTC

[tinkerpop] branch master updated: Fixed conflict dependencies in neo4j after commons-config2 update 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 c7e1962  Fixed conflict dependencies in neo4j after commons-config2 update CTR
c7e1962 is described below

commit c7e19626f663fe69feb3ba24f278dfc06f8ddf14
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Tue Jul 16 17:04:41 2019 -0400

    Fixed conflict dependencies in neo4j after commons-config2 update CTR
---
 neo4j-gremlin/pom.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/neo4j-gremlin/pom.xml b/neo4j-gremlin/pom.xml
index 8a0f4af..ceecedc 100644
--- a/neo4j-gremlin/pom.xml
+++ b/neo4j-gremlin/pom.xml
@@ -129,6 +129,10 @@ limitations under the License.
                             <artifactId>commons-lang3</artifactId>
                         </exclusion>
                         <exclusion>
+                            <groupId>org.apache.commons</groupId>
+                            <artifactId>commons-text</artifactId>
+                        </exclusion>
+                        <exclusion>
                             <groupId>com.github.ben-manes.caffeine</groupId>
                             <artifactId>caffeine</artifactId>
                         </exclusion>
@@ -159,6 +163,12 @@ limitations under the License.
                     </exclusions>
                 </dependency>
                 <dependency>
+                    <groupId>org.apache.commons</groupId>
+                    <artifactId>commons-text</artifactId>
+                    <version>1.6</version>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
                     <groupId>org.scala-lang</groupId>
                     <artifactId>scala-library</artifactId>
                     <version>2.11.8</version>