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:35:48 UTC

[1/4] 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/tp31 9ad661326 -> 94a14cccc


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/tp31
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>


[4/4] 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/tp31
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>


[2/4] 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/tp31
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(-)
----------------------------------------------------------------------



[3/4] 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/tp31
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(-)
----------------------------------------------------------------------