diff --git a/pom.xml b/pom.xml
index 182044f4f..6f7e45a76 100644
--- a/pom.xml
+++ b/pom.xml
@@ -371,10 +371,15 @@
 	</build>
     <pluginRepositories>
         <pluginRepository>
-            <id>repository.source.maven.release</id>
+            <id>repository.springsource.maven.bundles.release</id>
             <name>SpringSource Maven Release Repository</name>
             <url>http://repository.springsource.com/maven/bundles/release</url>
         </pluginRepository>
+		<pluginRepository>
+			<id>repository.springframework.maven.release</id>
+			<name>Spring Framework Maven Release Repository</name>
+			<url>http://maven.springframework.org/release</url>
+		</pluginRepository>
         <pluginRepository>
             <id>jboss-legacy-repository</id>
             <name>Old JBoss Public Repository</name>
diff --git a/spring-data-graph-parent/pom.xml b/spring-data-graph-parent/pom.xml
index 0f226e868..b8b061657 100644
--- a/spring-data-graph-parent/pom.xml
+++ b/spring-data-graph-parent/pom.xml
@@ -191,20 +191,20 @@
               <groupId>com.tinkerpop.blueprints</groupId>
               <artifactId>blueprints-core</artifactId>
               <version>${blueprints.version}</version>
-              <scope>optional</scope>
+              <optional>true</optional>
             </dependency>
             <dependency>
               <groupId>com.tinkerpop.blueprints</groupId>
               <artifactId>blueprints-neo4j-graph</artifactId>
               <version>${blueprints.version}</version>
-              <scope>optional</scope>
+              <optional>true</optional>
             </dependency>
 
             <dependency>
               <groupId>com.tinkerpop</groupId>
               <artifactId>gremlin</artifactId>
               <version>${gremlin.version}</version>
-              <scope>optional</scope>
+              <optional>true</optional>
             </dependency>
 
 			<dependency>
@@ -388,7 +388,8 @@
 			</plugin>
             <plugin>
                 <groupId>com.mycila.maven-license-plugin</groupId>
-                <artifactId>maven-license-plugin</artifactId>                
+                <artifactId>maven-license-plugin</artifactId>
+                <version>1.9.0</version>                
                 <executions>
                   <execution>
                     <id>check-licenses</id>
@@ -452,7 +453,7 @@
 	<pluginRepositories>
 		<pluginRepository>
 			<!-- necessary for utils -->
-			<id>repository.plugin.springsource.release</id>
+            <id>repository.springsource.maven.bundles.release</id>
 			<name>SpringSource Maven Repository</name>
 			<url>http://repository.springsource.com/maven/bundles/release</url>
 		</pluginRepository>
diff --git a/spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/RequestResult.java b/spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/RequestResult.java
index e17350de5..a1a24e18c 100644
--- a/spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/RequestResult.java
+++ b/spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/RequestResult.java
@@ -39,7 +39,7 @@ public class RequestResult {
     public static RequestResult extractFrom(ClientResponse clientResponse) {
         final int status = clientResponse.getStatus();
         final URI location = clientResponse.getLocation();
-        final String data = status != Response.Status.NO_CONTENT.getStatusCode() ? clientResponse.getEntity(String.class) : null;
+		final String data = status != Response.Status.NO_CONTENT.getStatusCode() ? clientResponse.getEntity(String.class) : null;
         clientResponse.close();
         return new RequestResult(status, location, data);
     }
diff --git a/spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/RestRequest.java b/spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/RestRequest.java
index 395ee5a2a..0d9fa8d37 100644
--- a/spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/RestRequest.java
+++ b/spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/RestRequest.java
@@ -33,8 +33,8 @@ import java.util.concurrent.TimeUnit;
 
 public class RestRequest {
 
-    public static final int CONNECT_TIMEOUT = (int) TimeUnit.SECONDS.toMillis(30);
-    public static final int READ_TIMEOUT = (int) TimeUnit.SECONDS.toMillis(30);
+    public static final int CONNECT_TIMEOUT = (int) TimeUnit.SECONDS.toMillis(300);
+    public static final int READ_TIMEOUT = (int) TimeUnit.SECONDS.toMillis(300);
     private final URI baseUri;
     private final Client client;
 
diff --git a/spring-data-neo4j-rest/src/test/resources/test-db.properties b/spring-data-neo4j-rest/src/test/resources/test-db.properties
index 798affebe..64291a371 100644
--- a/spring-data-neo4j-rest/src/test/resources/test-db.properties
+++ b/spring-data-neo4j-rest/src/test/resources/test-db.properties
@@ -1,2 +1 @@
 org.neo4j.server.database.location=target/test-db
-#org.neo4j.server.webserver.maxthreads=2
diff --git a/spring-data-neo4j/pom.xml b/spring-data-neo4j/pom.xml
index e6119c143..50d5ffadb 100644
--- a/spring-data-neo4j/pom.xml
+++ b/spring-data-neo4j/pom.xml
@@ -129,24 +129,24 @@
 		<dependency>
 			<groupId>org.neo4j</groupId>
 			<artifactId>server-api</artifactId>
-		 <scope>optional</scope>
+		 <optional>true</optional>
 		</dependency>
 
         <dependency>
           <groupId>com.tinkerpop.blueprints</groupId>
           <artifactId>blueprints-core</artifactId>
-          <scope>optional</scope>
+          <optional>true</optional>
         </dependency>
         <dependency>
           <groupId>com.tinkerpop.blueprints</groupId>
           <artifactId>blueprints-neo4j-graph</artifactId>
-          <scope>optional</scope>
+          <optional>true</optional>
         </dependency>
 
         <dependency>
           <groupId>com.tinkerpop</groupId>
           <artifactId>gremlin</artifactId>
-          <scope>optional</scope>
+          <optional>true</optional>
         </dependency>
 
 		<dependency>
diff --git a/spring-data-neo4j/template.mf b/spring-data-neo4j/template.mf
index 5c7b70f63..ab4e5fc82 100644
--- a/spring-data-neo4j/template.mf
+++ b/spring-data-neo4j/template.mf
@@ -18,6 +18,7 @@ Import-Template:
  org.springframework.persistence.*;version="[1.0.0, 2.0.0)",
  org.springframework.data.neo4j.*;version="0",
  org.neo4j.*;version="0",
+ org.neo4j.cypher.*;version="0";resolution:=optional,
  org.w3c.dom.*;version="0",
  org.aspectj.*;version="[1.6.5, 2.0.0)",
  org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
@@ -33,9 +34,8 @@ Import-Template:
  javax.transaction.*;version="[1.0.1, 2.0.0)";resolution:=optional,
  com.tinkerpop.blueprints.*;version="[0.8,1.0)";resolution:=optional,
  com.tinkerpop.gremlin.*;version="[1.1,2.0)";resolution:=optional
-Excluded-Imports:
- org.neo4j.*.impl.*
 Import-Package: 
  net.sf.cglib.proxy;version="[2.2.0,3.0.0)",
  net.sf.cglib.core;version="[2.2.0,3.0.0)",
  net.sf.cglib.reflect;version="[2.2.0,3.0.0)"
+DynamicImport-Package: *
\ No newline at end of file