You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ok...@apache.org on 2016/02/15 14:36:06 UTC

[01/10] incubator-tinkerpop git commit: update pom.xml dependencies to work with databases created by Neo4j 2.3.0 - 2.3.2

Repository: incubator-tinkerpop
Updated Branches:
  refs/heads/master c0b79c5c6 -> dac0f48ac


update pom.xml dependencies to work with databases created by Neo4j 2.3.0 - 2.3.2


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

Branch: refs/heads/master
Commit: d2531c10c0ff64dcb0b5452c09563a29cff097b0
Parents: 9aba328
Author: Lee Mitchell <mr...@gmail.com>
Authored: Fri Feb 12 20:16:59 2016 -0500
Committer: Lee Mitchell <mr...@gmail.com>
Committed: Fri Feb 12 20:16:59 2016 -0500

----------------------------------------------------------------------
 gremlin-server/pom.xml | 2 +-
 neo4j-gremlin/pom.xml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/d2531c10/gremlin-server/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml
index 62497ff..5223a2d 100644
--- a/gremlin-server/pom.xml
+++ b/gremlin-server/pom.xml
@@ -190,7 +190,7 @@ limitations under the License.
                 <dependency>
                     <groupId>org.neo4j</groupId>
                     <artifactId>neo4j-tinkerpop-api-impl</artifactId>
-                    <version>0.1-2.2</version>
+                    <version>0.3-2.3.2</version>
                     <scope>test</scope>
                 </dependency>
                 <!-- *** WARNING *** -->

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/d2531c10/neo4j-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/neo4j-gremlin/pom.xml b/neo4j-gremlin/pom.xml
index 262d78c..d6cf44a 100644
--- a/neo4j-gremlin/pom.xml
+++ b/neo4j-gremlin/pom.xml
@@ -114,7 +114,7 @@ limitations under the License.
                 <configuration>
                     <archive>
                         <manifestEntries>
-                            <Gremlin-Plugin-Dependencies>org.neo4j:neo4j-tinkerpop-api-impl:0.1-2.2
+                            <Gremlin-Plugin-Dependencies>org.neo4j:neo4j-tinkerpop-api-impl:0.3-2.3.2
                             </Gremlin-Plugin-Dependencies>
                         </manifestEntries>
                     </archive>


[08/10] incubator-tinkerpop git commit: Merge branch 'tp31' of https://github.com/leemit/incubator-tinkerpop into tp31

Posted by ok...@apache.org.
Merge branch 'tp31' of https://github.com/leemit/incubator-tinkerpop into tp31


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

Branch: refs/heads/master
Commit: 20bfc01ff73f73652821d83a2990a30486761311
Parents: 9ad6613 248bbc4
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Mon Feb 15 06:03:09 2016 -0700
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Mon Feb 15 06:03:09 2016 -0700

----------------------------------------------------------------------
 gremlin-server/pom.xml | 2 +-
 neo4j-gremlin/pom.xml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------



[03/10] incubator-tinkerpop git commit: Added a github gremlin

Posted by ok...@apache.org.
Added a github gremlin


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

Branch: refs/heads/master
Commit: d4fc99f1af149b9ee34339992d4815352dc1c6c0
Parents: 890131e
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Sat Feb 13 10:14:53 2016 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Sat Feb 13 10:14:53 2016 -0500

----------------------------------------------------------------------
 docs/static/images/gremlin-github.png | Bin 0 -> 25932 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/d4fc99f1/docs/static/images/gremlin-github.png
----------------------------------------------------------------------
diff --git a/docs/static/images/gremlin-github.png b/docs/static/images/gremlin-github.png
new file mode 100644
index 0000000..8328068
Binary files /dev/null and b/docs/static/images/gremlin-github.png differ


[10/10] incubator-tinkerpop git commit: Merge branch 'tp31'

Posted by ok...@apache.org.
Merge branch 'tp31'


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

Branch: refs/heads/master
Commit: dac0f48ac2dfb9ba292bec1449c59cf6c08d44c9
Parents: c0b79c5 94a14cc
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Mon Feb 15 06:35:55 2016 -0700
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Mon Feb 15 06:35:55 2016 -0700

----------------------------------------------------------------------
 CHANGELOG.asciidoc                    |   1 +
 docs/static/images/gremlin-apache.png | Bin 0 -> 184276 bytes
 docs/static/images/gremlin-github.png | Bin 0 -> 25806 bytes
 gremlin-server/pom.xml                |  24 +++++++++++++++++++++++-
 neo4j-gremlin/pom.xml                 |   2 +-
 5 files changed, 25 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/dac0f48a/CHANGELOG.asciidoc
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/dac0f48a/gremlin-server/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/dac0f48a/neo4j-gremlin/pom.xml
----------------------------------------------------------------------


[07/10] incubator-tinkerpop git commit: Still cleaning up apache gremlin.

Posted by ok...@apache.org.
Still cleaning up apache gremlin.


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

Branch: refs/heads/master
Commit: 9ad6613265c5b50cfad77a452a26d503d09580bb
Parents: 6bb458e
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Sat Feb 13 11:28:25 2016 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Sat Feb 13 11:28:25 2016 -0500

----------------------------------------------------------------------
 docs/static/images/gremlin-apache.png | Bin 186957 -> 184276 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/9ad66132/docs/static/images/gremlin-apache.png
----------------------------------------------------------------------
diff --git a/docs/static/images/gremlin-apache.png b/docs/static/images/gremlin-apache.png
index 9e6f6cd..e2d3bce 100644
Binary files a/docs/static/images/gremlin-apache.png and b/docs/static/images/gremlin-apache.png differ


[02/10] incubator-tinkerpop git commit: Merge pull request #1 from leemit/tp31.fix-for-neo4j-2.3.2

Posted by ok...@apache.org.
Merge pull request #1 from leemit/tp31.fix-for-neo4j-2.3.2

update pom.xml dependencies to work with databases created by Neo4j 2…

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

Branch: refs/heads/master
Commit: 248bbc4bff011cac4e2aaaf4558bf36347b52f54
Parents: 890131e d2531c1
Author: leemit <mr...@gmail.com>
Authored: Fri Feb 12 20:30:06 2016 -0500
Committer: leemit <mr...@gmail.com>
Committed: Fri Feb 12 20:30:06 2016 -0500

----------------------------------------------------------------------
 gremlin-server/pom.xml | 2 +-
 neo4j-gremlin/pom.xml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------



[09/10] incubator-tinkerpop git commit: Added exclusions required for GremlinServer and Neo4j integration testing.

Posted by ok...@apache.org.
Added exclusions required for GremlinServer and Neo4j integration testing.


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

Branch: refs/heads/master
Commit: 94a14cccc0c031dbc87d1f403ab46eb952209d18
Parents: 20bfc01
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Mon Feb 15 06:35:42 2016 -0700
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Mon Feb 15 06:35:42 2016 -0700

----------------------------------------------------------------------
 CHANGELOG.asciidoc     |  1 +
 gremlin-server/pom.xml | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/94a14ccc/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index bf74b50..e6b013a 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,6 +26,7 @@ image::https://raw.githubusercontent.com/apache/incubator-tinkerpop/master/docs/
 TinkerPop 3.1.2 (NOT OFFICIALLY RELEASED YET)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+* Fixed a pom.xml bug where Gremlin Console/Server were not pulling the latest Neo4j 2.3.2.
 * Fixed bug in "round robin" load balancing in `gremlin-driver` where requests were wrongly being sent to the same host.
 * Prevented the spawning of unneeded reconnect tasks in `gremlin-driver` when a host goes offline.
 * Fixed bug preventing `gremlin-driver` from reconnecting to Gremlin Server when it was restarted.

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/94a14ccc/gremlin-server/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml
index 5223a2d..2c9c1f8 100644
--- a/gremlin-server/pom.xml
+++ b/gremlin-server/pom.xml
@@ -192,6 +192,28 @@ limitations under the License.
                     <artifactId>neo4j-tinkerpop-api-impl</artifactId>
                     <version>0.3-2.3.2</version>
                     <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>org.apache.commons</groupId>
+                            <artifactId>commons-lang3</artifactId>
+                        </exclusion>
+                        <exclusion>
+                            <groupId>com.googlecode.concurrentlinkedhashmap</groupId>
+                            <artifactId>concurrentlinkedhashmap-lru</artifactId>
+                        </exclusion>
+                        <exclusion>
+                            <groupId>org.scala-lang</groupId>
+                            <artifactId>scala-library</artifactId>
+                        </exclusion>
+                        <exclusion>
+                            <groupId>org.slf4j</groupId>
+                            <artifactId>slf4j-api</artifactId>
+                        </exclusion>
+                        <exclusion>
+                            <groupId>info.ganglia.gmetric4j</groupId>
+                            <artifactId>gmetric4j</artifactId>
+                        </exclusion>
+                    </exclusions>
                 </dependency>
                 <!-- *** WARNING *** -->
             </dependencies>


[05/10] incubator-tinkerpop git commit: Added "Apache Gremlin"

Posted by ok...@apache.org.
Added "Apache Gremlin"


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

Branch: refs/heads/master
Commit: 4be2c363002780fe1bcf8575569480899f3e98ff
Parents: 27833b4
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Sat Feb 13 11:22:04 2016 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Sat Feb 13 11:22:04 2016 -0500

----------------------------------------------------------------------
 docs/static/images/gremlin-apache.png | Bin 0 -> 188726 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4be2c363/docs/static/images/gremlin-apache.png
----------------------------------------------------------------------
diff --git a/docs/static/images/gremlin-apache.png b/docs/static/images/gremlin-apache.png
new file mode 100644
index 0000000..ad3169d
Binary files /dev/null and b/docs/static/images/gremlin-apache.png differ


[06/10] incubator-tinkerpop git commit: Cleaned up the "apache gremlin" a little bit.

Posted by ok...@apache.org.
Cleaned up the "apache gremlin" a little bit.


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

Branch: refs/heads/master
Commit: 6bb458efd9fd976f48ce48ddf804b6392aa736ce
Parents: 4be2c36
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Sat Feb 13 11:25:21 2016 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Sat Feb 13 11:25:21 2016 -0500

----------------------------------------------------------------------
 docs/static/images/gremlin-apache.png | Bin 188726 -> 186957 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/6bb458ef/docs/static/images/gremlin-apache.png
----------------------------------------------------------------------
diff --git a/docs/static/images/gremlin-apache.png b/docs/static/images/gremlin-apache.png
index ad3169d..9e6f6cd 100644
Binary files a/docs/static/images/gremlin-apache.png and b/docs/static/images/gremlin-apache.png differ


[04/10] incubator-tinkerpop git commit: Cleaned up github gremlin a little bit.

Posted by ok...@apache.org.
Cleaned up github gremlin a little bit.


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

Branch: refs/heads/master
Commit: 27833b45711f7c77cb503ec2b82023177f2d665d
Parents: d4fc99f
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Sat Feb 13 10:23:02 2016 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Sat Feb 13 10:23:02 2016 -0500

----------------------------------------------------------------------
 docs/static/images/gremlin-github.png | Bin 25932 -> 25806 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/27833b45/docs/static/images/gremlin-github.png
----------------------------------------------------------------------
diff --git a/docs/static/images/gremlin-github.png b/docs/static/images/gremlin-github.png
index 8328068..923bf43 100644
Binary files a/docs/static/images/gremlin-github.png and b/docs/static/images/gremlin-github.png differ