You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by rd...@apache.org on 2018/10/02 07:48:30 UTC
[1/3] tinkerpop git commit: TINKERPOP-2045 removed duplicate non-indy
groovy core dep
Repository: tinkerpop
Updated Branches:
refs/heads/tp33 8b4f86f0b -> 7148a4b46
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/tp33
Commit: 6e320daa57a9ec9acb19a213f6dd2081e70e2e26
Parents: abfe968
Author: Robert Dale <ro...@gmail.com>
Authored: Tue Sep 25 07:40:50 2018 -0400
Committer: Robert Dale <ro...@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>
[2/3] tinkerpop git commit: Merge branch 'TINKERPOP-2045' into tp32
Posted by rd...@apache.org.
Merge branch 'TINKERPOP-2045' into tp32
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/d0659bd4
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/d0659bd4
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/d0659bd4
Branch: refs/heads/tp33
Commit: d0659bd4334f69810cee20d05a6f329d3673220e
Parents: 0403156 6e320da
Author: Robert Dale <ro...@gmail.com>
Authored: Tue Oct 2 03:47:28 2018 -0400
Committer: Robert Dale <ro...@gmail.com>
Committed: Tue Oct 2 03:47:28 2018 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
gremlin-driver/pom.xml | 14 ++++++++++++++
gremlin-groovy/pom.xml | 21 +++++++++++++++++++++
3 files changed, 36 insertions(+)
----------------------------------------------------------------------
[3/3] tinkerpop git commit: Merge branch 'tp32' into tp33
Posted by rd...@apache.org.
Merge branch 'tp32' into tp33
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/7148a4b4
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/7148a4b4
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/7148a4b4
Branch: refs/heads/tp33
Commit: 7148a4b4635a7d338e895640afeac492f26ffb67
Parents: 8b4f86f d0659bd
Author: Robert Dale <ro...@gmail.com>
Authored: Tue Oct 2 03:47:48 2018 -0400
Committer: Robert Dale <ro...@gmail.com>
Committed: Tue Oct 2 03:47:48 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/7148a4b4/CHANGELOG.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7148a4b4/gremlin-driver/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7148a4b4/gremlin-groovy/pom.xml
----------------------------------------------------------------------