upgrade to Neo4j 2.2.0-RC01

sarmbruster · sarmbruster · commit 0676b834ba14 · 2015-03-21T12:03:03.000+01:00
diff --git a/build.xml b/build.xml
@@ -42,6 +42,8 @@
     <get src="http://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/3.0/plexus-utils-3.0.jar"                                            dest="${additional.jars.dir}/"/>
     <get src="http://repo1.maven.org/maven2/junit/junit/4.11/junit-4.11.jar" dest="${additional.jars.dir}/"/>
     <get src="http://repo1.maven.org/maven2/org/hamcrest/hamcrest-all/1.3/hamcrest-all-1.3.jar" dest="${additional.jars.dir}/"/>
+    <get src="http://central.maven.org/maven2/org/neo4j/test/neo4j-harness/${neo4j.version}/neo4j-harness-${neo4j.version}.jar" dest="${additional.jars.dir}/"/>
+    <get src="http://central.maven.org/maven2/org/neo4j/neo4j-kernel/${neo4j.version}/neo4j-kernel-${neo4j.version}-tests.jar" dest="${additional.jars.dir}/"/>
   </target>
 
   <target name="-download.and.unzip.neo4j.windows" if="isWindows" depends="-make.download.dirs"
@@ -208,4 +210,4 @@
     </replaceregexp>
   </target>
 
-</project>
+</project>
diff --git a/settings/path.xml b/settings/path.xml
@@ -3,7 +3,7 @@
 <project name="path" default="donothingToMakeAValidAntFile"
          basedir=".">
 
-  <property name="neo4j.version" value="2.1.7"/>
+  <property name="neo4j.version" value="2.2.0-RC01"/>
   
   <property name="download.dir" location="downloads"/>
   <property name="neo4j.download.dir" location="${download.dir}/neo4j"/>
diff --git a/src/main/java/org/neo4j/tutorial/server/ServerBuilder.java b/src/main/java/org/neo4j/tutorial/server/ServerBuilder.java
@@ -9,12 +9,9 @@
 
 import org.neo4j.helpers.collection.MapUtil;
 import org.neo4j.kernel.logging.ConsoleLogger;
-import org.neo4j.kernel.logging.DevNullLoggingService;
 import org.neo4j.server.CommunityNeoServer;
 import org.neo4j.server.configuration.Configurator;
 import org.neo4j.server.configuration.PropertyFileConfigurator;
-import org.neo4j.server.configuration.validation.DatabaseLocationMustBeSpecifiedRule;
-import org.neo4j.server.configuration.validation.Validator;
 
 public class ServerBuilder
 {
@@ -46,8 +43,7 @@ public CommunityNeoServer build() throws IOException
         File configFile = createPropertiesFiles();
 
         return new CommunityNeoServer(
-                new PropertyFileConfigurator( new Validator( new DatabaseLocationMustBeSpecifiedRule() ), configFile,
-                        ConsoleLogger.DEV_NULL ), new DevNullLoggingService()
+                new PropertyFileConfigurator( configFile, ConsoleLogger.DEV_NULL), null //new DevNullLoggingService()
         );
     }
 
