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:51 UTC

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

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>