upgrade to Neo4j 1.8.RC1, disable batch-transactions by default

neo4j-contrib · Sep 17, 2012 · 66bbd0e · 66bbd0e
1 parent fef4442
commit 66bbd0e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 21 deletions.
diff --git a/README.md b/README.md
@@ -68,7 +68,7 @@ _timeouts in seconds_
 
 * org.neo4j.rest.read_timeout=30
 * org.neo4j.rest.connect_timeout=30
-* org.neo4j.rest.driver="neo4j-rest-graphdb/1.8M07"
+* org.neo4j.rest.driver="neo4j-rest-graphdb/1.8.RC1"
 * org.neo4j.rest.stream=true
-* org.neo4j.rest.batch_transactions=true (convert transaction scope into batch-rest-operations)
+* org.neo4j.rest.batch_transactions=false (convert transaction scope into batch-rest-operations)
 * org.neo4j.rest.logging_filter=false (set to true if verbose request/response logging should be enabled)
diff --git a/pom.xml b/pom.xml
@@ -16,7 +16,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <slf4j.version>1.6.1</slf4j.version>
-        <neo4j.version>1.8.M07</neo4j.version>
+        <neo4j.version>1.8.RC1</neo4j.version>
         <jersey.version>1.4</jersey.version>
         <blueprints.version>1.2</blueprints.version>
         <gremlin.version>1.5</gremlin.version>
@@ -88,23 +88,6 @@ the relevant Commercial Agreement.
           <artifactId>jackson-jaxrs</artifactId>
           <version>1.8.5</version>
         </dependency>
-        <!--dependency>
-        	<groupId>com.sun.jersey.contribs</groupId>
-        	<artifactId>jersey-apache-client4</artifactId>
-        	<version>1.9-ea04</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-            <version>4.1.3</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpcore</artifactId>
-            <version>4.1.3</version>
-            <scope>compile</scope>
-        </dependency-->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

diff --git a/src/main/java/org/neo4j/rest/graphdb/util/Config.java b/src/main/java/org/neo4j/rest/graphdb/util/Config.java
@@ -40,7 +40,7 @@ public static boolean streamingIsEnabled() {
     }
 
     public static boolean useBatchTransactions() {
-        return System.getProperty(CONFIG_BATCH_TRANSACTION,"true").equalsIgnoreCase("true");
+        return System.getProperty(CONFIG_BATCH_TRANSACTION,"false").equalsIgnoreCase("true");
     }
 
     public static boolean useLoggingFilter() {