From 82c6d4682c6142467ca2e5333ce9ad51d478daf3 Mon Sep 17 00:00:00 2001
From: Ben Butler-Cole <ben@bridesmere.com>
Date: Tue, 4 Oct 2016 15:18:56 +0100
Subject: [PATCH] Fix merge problems

---
 manual/backup/pom.xml                         |  6 +--
 .../java/org/neo4j/backup/TestBackup.java     | 43 ++++++++-----------
 manual/shell/pom.xml                          |  6 +--
 3 files changed, 25 insertions(+), 30 deletions(-)

diff --git a/manual/backup/pom.xml b/manual/backup/pom.xml
index 5628122a032b..d16ad738d2ba 100644
--- a/manual/backup/pom.xml
+++ b/manual/backup/pom.xml
@@ -5,14 +5,14 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>org.neo4j</groupId>
-        <version>3.0.7-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.neo4j.doc</groupId>
     <artifactId>neo4j-backup-docs</artifactId>
-    <version>3.0.7-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
 
     <name>Neo4j - Backup Docs</name>
     <description>Documentation build for Neo4j Backup.</description>
@@ -52,4 +52,4 @@
         </dependency>
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/manual/backup/src/test/java/org/neo4j/backup/TestBackup.java b/manual/backup/src/test/java/org/neo4j/backup/TestBackup.java
index 768f7cdd613b..73b34bf89eef 100644
--- a/manual/backup/src/test/java/org/neo4j/backup/TestBackup.java
+++ b/manual/backup/src/test/java/org/neo4j/backup/TestBackup.java
@@ -19,16 +19,16 @@
  */
 package org.neo4j.backup;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
 import org.neo4j.graphdb.GraphDatabaseService;
 import org.neo4j.graphdb.Label;
 import org.neo4j.graphdb.Node;
@@ -42,23 +42,21 @@
 import org.neo4j.kernel.configuration.Settings;
 import org.neo4j.kernel.impl.api.TransactionHeaderInformation;
 import org.neo4j.kernel.impl.factory.CommunityEditionModule;
-import org.neo4j.kernel.impl.factory.CommunityFacadeFactory;
-import org.neo4j.kernel.impl.factory.EditionModule;
+import org.neo4j.kernel.impl.factory.DatabaseInfo;
 import org.neo4j.kernel.impl.factory.GraphDatabaseFacadeFactory;
-import org.neo4j.kernel.impl.factory.PlatformModule;
 import org.neo4j.kernel.impl.store.format.standard.StandardV3_0;
 import org.neo4j.kernel.impl.transaction.TransactionHeaderInformationFactory;
 import org.neo4j.test.DbRepresentation;
-import org.neo4j.test.TargetDirectory;
 import org.neo4j.test.TestGraphDatabaseFactory;
+import org.neo4j.test.rule.TestDirectory;
 
-import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 public class TestBackup
 {
     @Rule
-    public TargetDirectory.TestDirectory testDir = TargetDirectory.testDirForTest( TestBackup.class );
+    public TestDirectory testDir = TestDirectory.testDirectory();
 
     private File serverPath;
     private File otherServerPath;
@@ -151,29 +149,26 @@ private GraphDatabaseService startGraphDatabase( File storeDir, boolean withOnli
             protected GraphDatabaseService newDatabase( File storeDir, Map<String,String> config,
                     GraphDatabaseFacadeFactory.Dependencies dependencies )
             {
-                return new CommunityFacadeFactory()
+                return new GraphDatabaseFacadeFactory( DatabaseInfo.COMMUNITY,
+                        ( platformModule) -> new CommunityEditionModule( platformModule )
                 {
 
                     @Override
-                    protected EditionModule createEdition( PlatformModule platformModule )
+                    protected TransactionHeaderInformationFactory createHeaderInformationFactory()
                     {
-                        return new CommunityEditionModule( platformModule )
+                        return new TransactionHeaderInformationFactory.WithRandomBytes()
                         {
-
                             @Override
-                            protected TransactionHeaderInformationFactory createHeaderInformationFactory()
+                            protected TransactionHeaderInformation createUsing( byte[] additionalHeader )
                             {
-                                return new TransactionHeaderInformationFactory.WithRandomBytes()
-                                {
-                                    @Override
-                                    protected TransactionHeaderInformation createUsing( byte[] additionalHeader )
-                                    {
-                                        return new TransactionHeaderInformation( 1, 2, additionalHeader );
-                                    }
-                                };
+                                return new TransactionHeaderInformation( 1, 2, additionalHeader );
                             }
                         };
                     }
+                })
+                {
+
+
                 }.newFacade( storeDir, config, dependencies );
             }
         };
diff --git a/manual/shell/pom.xml b/manual/shell/pom.xml
index d550c3dbefe8..1aac8fc278b1 100644
--- a/manual/shell/pom.xml
+++ b/manual/shell/pom.xml
@@ -5,14 +5,14 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>org.neo4j</groupId>
-        <version>3.0.7-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.neo4j.doc</groupId>
     <artifactId>neo4j-shell-docs</artifactId>
-    <version>3.0.7-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
 
     <name>Neo4j - Generic shell Docs</name>
     <description>Documentation build for Neo4j Shell.</description>
@@ -77,4 +77,4 @@
         </dependency>
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>