From 2eb4a393ebd772b6d354fc0618643e44f8818941 Mon Sep 17 00:00:00 2001
From: Jean-Pierre Bergamin <james@ractive.ch>
Date: Wed, 20 Jul 2011 13:51:56 +0200
Subject: [PATCH 1/5] Removed exclusion of impl packages

---
 spring-data-neo4j/template.mf | 2 --
 1 file changed, 2 deletions(-)

diff --git a/spring-data-neo4j/template.mf b/spring-data-neo4j/template.mf
index f7b029def..51c18555b 100644
--- a/spring-data-neo4j/template.mf
+++ b/spring-data-neo4j/template.mf
@@ -30,8 +30,6 @@ Import-Template:
  javax.persistence.*;version="[1.0.0, 3.0.0)";resolution:=optional,
  javax.persistence.spi.*;version="[1.0.0, 3.0.0)";resolution:=optional,
  javax.transaction.*;version="[1.0.1, 2.0.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)",

From cebb5ad3e5df677cff28ab13779437d906ca4498 Mon Sep 17 00:00:00 2001
From: Jean-Pierre Bergamin <james@ractive.ch>
Date: Tue, 2 Aug 2011 22:49:14 +0200
Subject: [PATCH 2/5] fixing scope definitions of dependencies and flagging
 them correctly as optional

---
 spring-data-graph-parent/pom.xml | 6 +++---
 spring-data-neo4j/pom.xml        | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/spring-data-graph-parent/pom.xml b/spring-data-graph-parent/pom.xml
index fc7bb1fed..33f6730a0 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>
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>

From 0d544d41f4840599ac922ac906e6ea1c10cdbe8d Mon Sep 17 00:00:00 2001
From: Jean-Pierre Bergamin <james@ractive.ch>
Date: Tue, 2 Aug 2011 22:50:33 +0200
Subject: [PATCH 3/5] adding version information for the maven-license-plugin
 to suppress maven warnings

---
 spring-data-graph-parent/pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/spring-data-graph-parent/pom.xml b/spring-data-graph-parent/pom.xml
index 33f6730a0..b8b061657 100644
--- a/spring-data-graph-parent/pom.xml
+++ b/spring-data-graph-parent/pom.xml
@@ -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>

From ea667215c618f688e4070b3ad573e409cfbecfba Mon Sep 17 00:00:00 2001
From: Jean-Pierre Bergamin <james@ractive.ch>
Date: Tue, 2 Aug 2011 22:52:50 +0200
Subject: [PATCH 4/5] use the DynamicImport-Package directive to have
 Class.forName() work in an OSGi environment

---
 spring-data-neo4j/template.mf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spring-data-neo4j/template.mf b/spring-data-neo4j/template.mf
index f486700ad..0d2ca503a 100644
--- a/spring-data-neo4j/template.mf
+++ b/spring-data-neo4j/template.mf
@@ -37,3 +37,4 @@ 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

From f18cd3355067e350b6ae6d4ea6ed8ad978548924 Mon Sep 17 00:00:00 2001
From: Jean-Pierre Bergamin <james@ractive.ch>
Date: Tue, 2 Aug 2011 22:54:09 +0200
Subject: [PATCH 5/5] mark the import packages org.neo4j.cypher.* as optional

---
 spring-data-neo4j/template.mf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spring-data-neo4j/template.mf b/spring-data-neo4j/template.mf
index 0d2ca503a..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)",