From commits-return-32289-archive-asf-public=cust-asf.ponee.io@tinkerpop.apache.org Tue Sep 25 13:41:17 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 6F48C18061A for ; Tue, 25 Sep 2018 13:41:17 +0200 (CEST) Received: (qmail 56915 invoked by uid 500); 25 Sep 2018 11:41:16 -0000 Mailing-List: contact commits-help@tinkerpop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tinkerpop.apache.org Delivered-To: mailing list commits@tinkerpop.apache.org Received: (qmail 56906 invoked by uid 99); 25 Sep 2018 11:41:16 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Sep 2018 11:41:16 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 73BA2DFF92; Tue, 25 Sep 2018 11:41:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: rdale@apache.org To: commits@tinkerpop.apache.org Message-Id: <9bc78b4df7c34df7a97484f392e038d5@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: tinkerpop git commit: TINKERPOP-2045 removed duplicate non-indy groovy core dep Date: Tue, 25 Sep 2018 11:41:16 +0000 (UTC) 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 Authored: Tue Sep 25 07:40:50 2018 -0400 Committer: Robert Dale 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. groovy-json ${groovy.version} indy + + + + org.codehaus.groovy + groovy + + org.codehaus.groovy groovy-sql ${groovy.version} indy + + + + org.codehaus.groovy + groovy + + org.apache.commons 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. groovy-groovysh ${groovy.version} indy + + + + org.codehaus.groovy + groovy + + org.codehaus.groovy groovy-json ${groovy.version} indy + + + + org.codehaus.groovy + groovy + + org.codehaus.groovy groovy-jsr223 ${groovy.version} indy + + + + org.codehaus.groovy + groovy + + org.apache.commons