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/05 18:03:14 UTC

[1/2] tinkerpop git commit: TINKERPOP-2037 removed groovy-sql

Repository: tinkerpop
Updated Branches:
  refs/heads/master 5756c0c84 -> f47b7d1d3


TINKERPOP-2037 removed groovy-sql


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

Branch: refs/heads/master
Commit: ee6802e76a4212dfba8e63cdf3eb4baa4b9dede8
Parents: 73444c3
Author: Robert Dale <ro...@gmail.com>
Authored: Tue Oct 2 12:24:31 2018 -0400
Committer: Robert Dale <ro...@gmail.com>
Committed: Fri Oct 5 07:36:44 2018 -0400

----------------------------------------------------------------------
 CHANGELOG.asciidoc                      |  1 +
 docs/src/upgrade/release-3.4.x.asciidoc | 19 +++++++++++++++++++
 gremlin-driver/pom.xml                  | 13 -------------
 3 files changed, 20 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ee6802e7/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 14d79aa..06ad72a 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,6 +26,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 This release also includes changes from <<release-3-3-3, 3.3.3>>.
 
 * Added text predicates.
+* Removed groovy-sql
 * Rewrote `ConnectiveStrategy` to support an arbitrary number of infix notations in a single traversal.
 * GraphSON `MessageSerializer`s will automatically register the GremlinServerModule to a provided GraphSONMapper.
 * Removed support for `-i` option in Gremlin Server which was previously deprecated.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ee6802e7/docs/src/upgrade/release-3.4.x.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/upgrade/release-3.4.x.asciidoc b/docs/src/upgrade/release-3.4.x.asciidoc
index 21e1899..d7780f3 100644
--- a/docs/src/upgrade/release-3.4.x.asciidoc
+++ b/docs/src/upgrade/release-3.4.x.asciidoc
@@ -44,6 +44,25 @@ gremlin> g.V().has("person","name", containing("o").and(gte("j").and(endingWith(
 
 See: link:https://issues.apache.org/jira/browse/TINKERPOP-2041[TINKERPOP-2041]
 
+==== Removed groovy-sql dependency
+
+Gremlin Console and Gremlin Server no longer include groovy-sql.  If you depend on groovy-sql,
+you can install it in Gremlin Console or Gremlin Server using the plugin system.
+
+Console:
+```
+:install org.codehaus.groovy groovy-sql 2.5.2
+```
+
+Server:
+```
+bin/gremlin-server.sh install org.codehaus.groovy groovy-sql 2.5.2
+```
+
+If your project depended on groovy-sql transitively, simply include it in your project's build file (e.g. maven: pom.xml).
+
+See: link:https://issues.apache.org/jira/browse/TINKERPOP-2037[TINKERPOP-2037]
+
 ==== Changed infix behavior
 
 The infix notation of `and()` and `or()` now supports an arbitrary number of traversals and `ConnectiveStrategy` produces a traversal with proper AND and OR semantics.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ee6802e7/gremlin-driver/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-driver/pom.xml b/gremlin-driver/pom.xml
index 9f1670c..724d415 100644
--- a/gremlin-driver/pom.xml
+++ b/gremlin-driver/pom.xml
@@ -56,19 +56,6 @@ limitations under the License.
             </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>
             <artifactId>commons-lang3</artifactId>
         </dependency>


[2/2] tinkerpop git commit: Merge branch 'TINKERPOP-2037'

Posted by rd...@apache.org.
Merge branch 'TINKERPOP-2037'


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

Branch: refs/heads/master
Commit: f47b7d1d38c0e0906a92f82b8b503d80799e11cb
Parents: 5756c0c ee6802e
Author: Robert Dale <ro...@gmail.com>
Authored: Fri Oct 5 14:02:47 2018 -0400
Committer: Robert Dale <ro...@gmail.com>
Committed: Fri Oct 5 14:02:47 2018 -0400

----------------------------------------------------------------------
 CHANGELOG.asciidoc                      |  1 +
 docs/src/upgrade/release-3.4.x.asciidoc | 19 +++++++++++++++++++
 gremlin-driver/pom.xml                  | 13 -------------
 3 files changed, 20 insertions(+), 13 deletions(-)
----------------------------------------------------------------------