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/04/05 19:16:56 UTC

[tinkerpop] branch master updated: Resolved dependency issues with commons-text and neo4j 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 77a1312  Resolved dependency issues with commons-text and neo4j CTR
77a1312 is described below

commit 77a1312bad71ccd2075570e338bf2ebecca1f8e7
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Mon Apr 5 15:16:20 2021 -0400

    Resolved dependency issues with commons-text and neo4j CTR
---
 gremlin-core/pom.xml     |  4 ++++
 gremlin-language/pom.xml |  1 -
 neo4j-gremlin/pom.xml    |  1 -
 pom.xml                  | 14 +++++++++++++-
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/gremlin-core/pom.xml b/gremlin-core/pom.xml
index ce243ad..1b3a6df 100644
--- a/gremlin-core/pom.xml
+++ b/gremlin-core/pom.xml
@@ -47,6 +47,10 @@ limitations under the License.
             <artifactId>commons-lang3</artifactId>
         </dependency>
         <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-text</artifactId>
+        </dependency>
+        <dependency>
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>
             <version>${snakeyaml.version}</version>
diff --git a/gremlin-language/pom.xml b/gremlin-language/pom.xml
index f7b9f89..d60d889 100644
--- a/gremlin-language/pom.xml
+++ b/gremlin-language/pom.xml
@@ -46,7 +46,6 @@ limitations under the License.
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-text</artifactId>
-            <version>${commons.text.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/neo4j-gremlin/pom.xml b/neo4j-gremlin/pom.xml
index 7973577..a3d8b02 100644
--- a/neo4j-gremlin/pom.xml
+++ b/neo4j-gremlin/pom.xml
@@ -172,7 +172,6 @@ limitations under the License.
                 <dependency>
                     <groupId>org.apache.commons</groupId>
                     <artifactId>commons-text</artifactId>
-                    <version>${commons.text.version}</version>
                     <scope>test</scope>
                 </dependency>
                 <dependency>
diff --git a/pom.xml b/pom.xml
index 4179e3f..0218f2e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -147,7 +147,7 @@ limitations under the License.
         <url>https://github.com/apache/tinkerpop</url>
     </scm>
     <properties>
-        <commons.configuration.version>2.6</commons.configuration.version>
+        <commons.configuration.version>2.7</commons.configuration.version>
         <commons.lang.version>2.6</commons.lang.version>
         <commons.lang3.version>3.11</commons.lang3.version>
         <commons.text.version>1.9</commons.text.version>
@@ -609,6 +609,18 @@ limitations under the License.
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-configuration2</artifactId>
                 <version>${commons.configuration.version}</version>
+                <exclusions>
+                    <!-- still on 1.8 and we need 1.9 -->
+                    <exclusion>
+                        <groupId>org.apache.commons</groupId>
+                        <artifactId>commons-text</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-text</artifactId>
+                <version>${commons.text.version}</version>
             </dependency>
             <!-- commons-configuration2 requires beanutils because we rely on file loaders -->
             <dependency>