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 2017/07/24 15:58:01 UTC
[3/3] tinkerpop git commit: TINKERPOP-1692 Cleaned up enforcer for
neo4j
TINKERPOP-1692 Cleaned up enforcer for neo4j
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a692960c
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a692960c
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a692960c
Branch: refs/heads/TINKERPOP-1692
Commit: a692960c687c393e3089a5d66c829e91290d2b2f
Parents: a348a05
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Jul 24 11:56:56 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Jul 24 11:56:56 2017 -0400
----------------------------------------------------------------------
neo4j-gremlin/pom.xml | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a692960c/neo4j-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/neo4j-gremlin/pom.xml b/neo4j-gremlin/pom.xml
index 37bbad2..3a7012d 100644
--- a/neo4j-gremlin/pom.xml
+++ b/neo4j-gremlin/pom.xml
@@ -121,6 +121,10 @@ limitations under the License.
<scope>test</scope>
<exclusions>
<exclusion>
+ <groupId>org.neo4j</groupId>
+ <artifactId>neo4j-kernel</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</exclusion>
@@ -129,10 +133,6 @@ limitations under the License.
<artifactId>caffeine</artifactId>
</exclusion>
<exclusion>
- <groupId>org.neo4j</groupId>
- <artifactId>neo4j</artifactId>
- </exclusion>
- <exclusion>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
</exclusion>
@@ -164,9 +164,10 @@ limitations under the License.
<version>2.3.1</version>
<scope>test</scope>
</dependency>
+ <!-- self-conflict with neo4j-graph-matching -->
<dependency>
<groupId>org.neo4j</groupId>
- <artifactId>neo4j</artifactId>
+ <artifactId>neo4j-kernel</artifactId>
<version>3.2.2</version>
<scope>test</scope>
</dependency>