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 2015/06/09 20:33:26 UTC
[1/5] incubator-tinkerpop git commit: TinkerPop-713: use specific
groovy dependencies, remove cc license on groovy console
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master 4cd492af7 -> ba0789cc2
TinkerPop-713: use specific groovy dependencies, remove cc license on groovy console
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/30a93e0c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/30a93e0c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/30a93e0c
Branch: refs/heads/master
Commit: 30a93e0c55f9190ab7f49ae1c444ff11b4cbf6c2
Parents: f01f3c2
Author: David Robinson <dr...@gmail.com>
Authored: Tue Jun 9 13:07:11 2015 -0400
Committer: David Robinson <dr...@gmail.com>
Committed: Tue Jun 9 13:07:11 2015 -0400
----------------------------------------------------------------------
gremlin-driver/pom.xml | 14 +++++++++++++-
gremlin-groovy/pom.xml | 21 +++++++++++++++++----
2 files changed, 30 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/30a93e0c/gremlin-driver/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-driver/pom.xml b/gremlin-driver/pom.xml
index e89e8cd..aad4d0a 100644
--- a/gremlin-driver/pom.xml
+++ b/gremlin-driver/pom.xml
@@ -41,7 +41,19 @@ limitations under the License.
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all</artifactId>
+ <artifactId>groovy</artifactId>
+ <version>${groovy.version}</version>
+ <classifier>indy</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-json</artifactId>
+ <version>${groovy.version}</version>
+ <classifier>indy</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-sql</artifactId>
<version>${groovy.version}</version>
<classifier>indy</classifier>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/30a93e0c/gremlin-groovy/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-groovy/pom.xml b/gremlin-groovy/pom.xml
index 9f01527..2baa511 100644
--- a/gremlin-groovy/pom.xml
+++ b/gremlin-groovy/pom.xml
@@ -38,14 +38,27 @@ limitations under the License.
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all</artifactId>
+ <artifactId>groovy</artifactId>
<version>${groovy.version}</version>
<classifier>indy</classifier>
</dependency>
<dependency>
- <groupId>jline</groupId>
- <artifactId>jline</artifactId>
- <version>2.11</version>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-groovysh</artifactId>
+ <version>${groovy.version}</version>
+ <classifier>indy</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-json</artifactId>
+ <version>${groovy.version}</version>
+ <classifier>indy</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-jsr223</artifactId>
+ <version>${groovy.version}</version>
+ <classifier>indy</classifier>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
[2/5] incubator-tinkerpop git commit: Merge branch 'tinkerpop-713' of
https://github.com/graben1437/incubator-tinkerpop
Posted by sp...@apache.org.
Merge branch 'tinkerpop-713' of https://github.com/graben1437/incubator-tinkerpop
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/374276bd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/374276bd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/374276bd
Branch: refs/heads/master
Commit: 374276bdd90f43afa16234241cda11b34455b6e2
Parents: 1c2efee 30a93e0
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Jun 9 14:16:49 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Jun 9 14:16:49 2015 -0400
----------------------------------------------------------------------
gremlin-driver/pom.xml | 14 +++++++++++++-
gremlin-groovy/pom.xml | 21 +++++++++++++++++----
2 files changed, 30 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
[5/5] incubator-tinkerpop git commit: Update README.
Posted by sp...@apache.org.
Update README.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/ba0789cc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/ba0789cc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/ba0789cc
Branch: refs/heads/master
Commit: ba0789cc238c937f16c63666383c8052c0159332
Parents: 8a26af5
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Jun 9 14:33:11 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Jun 9 14:33:11 2015 -0400
----------------------------------------------------------------------
README.asciidoc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/ba0789cc/README.asciidoc
----------------------------------------------------------------------
diff --git a/README.asciidoc b/README.asciidoc
index 47b552a..77be81f 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -45,8 +45,8 @@ mvn -Dmaven.javadoc.skip=true --projects tinkergraph-gremlin test
* Regenerate test data (only necessary given changes to IO classes): `mvn clean install -Dio` from `tinkergraph-gremlin` directory
** If there are changes to the Gryo format, it may be necessary to generate the Grateful Dead dataset from GraphSON (see `IoDataGenerationTest.shouldWriteGratefulDead`)
* Check license headers are present: `mvn apache-rat:check`
-* Process a single AsciiDoc file: +pass:[docs/preprocessor/preprocess-file.sh `pwd`/gremlin-console/target/apache-gremlin-console-*-standalone `pwd`/docs/src/xyz.asciidoc]+
-* Build AsciiDocs: `bin/process-docs.sh`
+* Build AsciiDocs (Hadoop must be running): `bin/process-docs.sh`
+** Process a single AsciiDoc file: +pass:[docs/preprocessor/preprocess-file.sh `pwd`/gremlin-console/target/apache-gremlin-console-*-standalone `pwd`/docs/src/xyz.asciidoc]+
* Build JavaDocs: `mvn process-resources -Djavadoc`
* Check for Apache License headers: `mvn apache-rat:check`
* Check for newer dependencies: `mvn versions:display-dependency-updates` or `mvn versions:display-plugin-updates`
[3/5] incubator-tinkerpop git commit: Merge remote-tracking branch
'origin/master'
Posted by sp...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/a0150501
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/a0150501
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/a0150501
Branch: refs/heads/master
Commit: a01505017b9dd8d7ee256f934111d67467d42755
Parents: 374276b 4cd492a
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Jun 9 14:29:32 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Jun 9 14:29:32 2015 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../traversal/step/filter/WhereStep.java | 113 +++++++------------
.../optimization/MatchWhereStrategy.java | 15 +++
.../process/traversal/util/TraversalP.java | 2 -
.../process/traversal/util/TraversalUtil.java | 37 ------
.../traversal/step/filter/WhereStepTest.java | 18 +--
.../step/filter/GroovyWhereTest.groovy | 4 +-
.../traversal/step/filter/WhereTest.java | 10 +-
.../tinkergraph/structure/TinkerGraphTest.java | 5 +-
9 files changed, 71 insertions(+), 134 deletions(-)
----------------------------------------------------------------------
[4/5] incubator-tinkerpop git commit: Update changelog.
Posted by sp...@apache.org.
Update changelog.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/8a26af5b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/8a26af5b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/8a26af5b
Branch: refs/heads/master
Commit: 8a26af5b0e5a2cf3cb3f30d10a1e345582246ac2
Parents: a015050
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Jun 9 14:30:17 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Jun 9 14:30:17 2015 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/8a26af5b/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 4e61785..533417b 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -25,6 +25,7 @@ image::http://www.tinkerpop.com/docs/current/images/gremlin-hindu.png[width=225]
TinkerPop 3.0.0.GA (NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* Replaced dependency on `groovy-all` with individual Groovy dependencies as needed.
* `WhereStep` now uses a `SelectOneStep` for `as('a').out()...` forms as this ensures `Traverser` (and metadata) propagation.
* Renamed `KeyStep` to `PropertyKeyStep` to be consistent with `PropertyValueStep`.
* Added `Gremlin-Lib-Paths` to modify paths in plugin `lib` directory.