tinkerpop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rd...@apache.org
Subject tinkerpop git commit: TINKERPOP-2045 removed duplicate non-indy groovy core dep
Date Tue, 25 Sep 2018 11:41:16 GMT
Repository: tinkerpop
Updated Branches:
  refs/heads/TINKERPOP-2045 [created] 6e320daa5


TINKERPOP-2045 removed duplicate non-indy groovy core dep


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/6e320daa
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/6e320daa
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/6e320daa

Branch: refs/heads/TINKERPOP-2045
Commit: 6e320daa57a9ec9acb19a213f6dd2081e70e2e26
Parents: abfe968
Author: Robert Dale <robdale@gmail.com>
Authored: Tue Sep 25 07:40:50 2018 -0400
Committer: Robert Dale <robdale@gmail.com>
Committed: Tue Sep 25 07:40:50 2018 -0400

----------------------------------------------------------------------
 CHANGELOG.asciidoc     |  1 +
 gremlin-driver/pom.xml | 14 ++++++++++++++
 gremlin-groovy/pom.xml | 21 +++++++++++++++++++++
 3 files changed, 36 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6e320daa/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 6d9770f..e93c1c9 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -23,6 +23,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 [[release-3-2-10]]
 === TinkerPop 3.2.10 (Release Date: NOT OFFICIALLY RELEASED YET)
 
+* Removed conflicting non-indy groovy core dependency
 * Bumped jython-standalone 2.7.1
 * SSL security enhancements
 * Added Gremlin version to Gremlin Server startup logging output.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6e320daa/gremlin-driver/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-driver/pom.xml b/gremlin-driver/pom.xml
index a7835ab..3f891ba 100644
--- a/gremlin-driver/pom.xml
+++ b/gremlin-driver/pom.xml
@@ -47,12 +47,26 @@ limitations under the License.
             <artifactId>groovy-json</artifactId>
             <version>${groovy.version}</version>
             <classifier>indy</classifier>
+            <exclusions>
+                <!-- exclude non-indy type -->
+                <exclusion>
+                    <groupId>org.codehaus.groovy</groupId>
+                    <artifactId>groovy</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy-sql</artifactId>
             <version>${groovy.version}</version>
             <classifier>indy</classifier>
+            <exclusions>
+                <!-- exclude non-indy type -->
+                <exclusion>
+                    <groupId>org.codehaus.groovy</groupId>
+                    <artifactId>groovy</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6e320daa/gremlin-groovy/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-groovy/pom.xml b/gremlin-groovy/pom.xml
index 3c7a122..9653e93 100644
--- a/gremlin-groovy/pom.xml
+++ b/gremlin-groovy/pom.xml
@@ -47,18 +47,39 @@ limitations under the License.
             <artifactId>groovy-groovysh</artifactId>
             <version>${groovy.version}</version>
             <classifier>indy</classifier>
+            <exclusions>
+                <!-- exclude non-indy type -->
+                <exclusion>
+                    <groupId>org.codehaus.groovy</groupId>
+                    <artifactId>groovy</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy-json</artifactId>
             <version>${groovy.version}</version>
             <classifier>indy</classifier>
+            <exclusions>
+                <!-- exclude non-indy type -->
+                <exclusion>
+                    <groupId>org.codehaus.groovy</groupId>
+                    <artifactId>groovy</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy-jsr223</artifactId>
             <version>${groovy.version}</version>
             <classifier>indy</classifier>
+            <exclusions>
+                <!-- exclude non-indy type -->
+                <exclusion>
+                    <groupId>org.codehaus.groovy</groupId>
+                    <artifactId>groovy</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>


Mime
View raw message