Move ExternalResource rule to common module

neo4j · Jan 2, 2017 · b757cd9 · b757cd9
1 parent c5e4ac0
commit b757cd9
Show file tree

Hide file tree

Showing 8 changed files with 50 additions and 3 deletions.
diff --git a/...org/neo4j/test/rule/ExternalResource.java → ...org/neo4j/test/rule/ExternalResource.java b/...org/neo4j/test/rule/ExternalResource.java → ...org/neo4j/test/rule/ExternalResource.java
@@ -24,7 +24,7 @@
 import org.junit.runners.model.Statement;
 
 /**
- * A better version of {@link org.junit.rules.ExternalResource} that properly handles exceptions in {@link #after()}.
+ * A better version of {@link org.junit.rules.ExternalResource} that properly handles exceptions in {@link #after(boolean)}.
  */
 public abstract class ExternalResource implements TestRule
 {

diff --git a/community/cypher/cypher/pom.xml b/community/cypher/cypher/pom.xml
@@ -144,10 +144,15 @@
 
     <!-- neo4j testing -->
 
+    <dependency>
+      <groupId>org.neo4j</groupId>
+      <artifactId>neo4j-common</artifactId>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.neo4j</groupId>
       <artifactId>neo4j-io</artifactId>
-      <version>${project.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>

diff --git a/community/cypher/pom.xml b/community/cypher/pom.xml
@@ -239,6 +239,13 @@
         <type>test-jar</type>
         <scope>test</scope>
       </dependency>
+      <dependency>
+        <groupId>org.neo4j</groupId>
+        <artifactId>neo4j-common</artifactId>
+        <version>${project.version}</version>
+        <type>test-jar</type>
+        <scope>test</scope>
+      </dependency>
       <dependency>
         <groupId>org.neo4j</groupId>
         <artifactId>neo4j-io</artifactId>

diff --git a/community/dbms/pom.xml b/community/dbms/pom.xml
@@ -85,6 +85,13 @@
       <artifactId>commons-compress</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>org.neo4j</groupId>
+      <artifactId>neo4j-common</artifactId>
+      <version>${project.version}</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.neo4j</groupId>
       <artifactId>neo4j-io</artifactId>

diff --git a/community/graphviz/pom.xml b/community/graphviz/pom.xml
@@ -58,7 +58,14 @@ the relevant Commercial Agreement.
       <groupId>org.neo4j</groupId>
       <artifactId>neo4j-kernel</artifactId>
       <version>${project.version}</version>
-      <classifier>tests</classifier>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.neo4j</groupId>
+      <artifactId>neo4j-common</artifactId>
+      <version>${project.version}</version>
+      <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/community/server/pom.xml b/community/server/pom.xml
@@ -300,6 +300,13 @@
       <scope>test</scope>
     </dependency>
 
+    <dependency>
+      <groupId>org.neo4j</groupId>
+      <artifactId>neo4j-common</artifactId>
+      <version>${project.version}</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.neo4j</groupId>
       <artifactId>neo4j-io</artifactId>

diff --git a/community/shell/pom.xml b/community/shell/pom.xml
@@ -92,6 +92,13 @@ the relevant Commercial Agreement.
       <scope>test</scope>
       <type>test-jar</type>
     </dependency>
+    <dependency>
+      <groupId>org.neo4j</groupId>
+      <artifactId>neo4j-common</artifactId>
+      <version>${project.version}</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.neo4j</groupId>
       <artifactId>neo4j-io</artifactId>

diff --git a/enterprise/management/pom.xml b/enterprise/management/pom.xml
@@ -103,6 +103,13 @@
       <scope>test</scope>
     </dependency>
 
+    <dependency>
+      <groupId>org.neo4j</groupId>
+      <artifactId>neo4j-common</artifactId>
+      <version>${project.version}</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.neo4j</groupId>
       <artifactId>neo4j-io</artifactId>