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/e86d5f64
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/e86d5f64
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/e86d5f64

Branch: refs/heads/TINKERPOP-1692
Commit: e86d5f64b57b52f8eb80da02a0cc4af039864352
Parents: 9c12a32
Author: Stephen Mallette <[email protected]>
Authored: Mon Jul 24 11:56:56 2017 -0400
Committer: Robert Dale <[email protected]>
Committed: Sat Sep 2 20:31:17 2017 -0400

----------------------------------------------------------------------
 neo4j-gremlin/pom.xml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e86d5f64/neo4j-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/neo4j-gremlin/pom.xml b/neo4j-gremlin/pom.xml
index 8e50985..0e1f8c2 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>

Reply via email to