From 412e2d91e38ec9ca8ae8a7f422f9eaff911e205b Mon Sep 17 00:00:00 2001
From: Jean-Pierre Bergamin <james@ractive.ch>
Date: Wed, 5 Oct 2011 09:48:18 +0200
Subject: [PATCH 1/4] added required spaces after the header names in the
 template.mf files

---
 spring-data-neo4j-aspects/template.mf     | 2 +-
 spring-data-neo4j-cross-store/template.mf | 2 +-
 spring-data-neo4j-rest/template.mf        | 2 +-
 spring-data-neo4j/template.mf             | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/spring-data-neo4j-aspects/template.mf b/spring-data-neo4j-aspects/template.mf
index f712f19cfe..a79d79d9c9 100644
--- a/spring-data-neo4j-aspects/template.mf
+++ b/spring-data-neo4j-aspects/template.mf
@@ -2,7 +2,7 @@ Bundle-SymbolicName: org.springframework.data.neo4j.aspects
 Bundle-Name: Spring Data Neo4j Aspects
 Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
-Import-Package:
+Import-Package: 
  sun.reflect;version="0";resolution:=optional
 Import-Template:
  org.springframework.beans.*;version="[3.0.0, 4.0.0)",
diff --git a/spring-data-neo4j-cross-store/template.mf b/spring-data-neo4j-cross-store/template.mf
index ca973cf554..ff87b06f76 100644
--- a/spring-data-neo4j-cross-store/template.mf
+++ b/spring-data-neo4j-cross-store/template.mf
@@ -2,7 +2,7 @@ Bundle-SymbolicName: org.springframework.data.neo4j.cross_store
 Bundle-Name: Spring Data Neo4J Cross-Store
 Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
-Import-Package:
+Import-Package: 
  sun.reflect;version="0";resolution:=optional
 Import-Template:
  org.springframework.beans.*;version="[3.0.0, 4.0.0)",
diff --git a/spring-data-neo4j-rest/template.mf b/spring-data-neo4j-rest/template.mf
index a9bddb77cb..7d1587be82 100644
--- a/spring-data-neo4j-rest/template.mf
+++ b/spring-data-neo4j-rest/template.mf
@@ -2,7 +2,7 @@ Bundle-SymbolicName: org.springframework.data.neo4j.rest
 Bundle-Name: Spring Data Neo4J REST
 Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
-Import-Package:
+Import-Package: 
  sun.reflect;version="0";resolution:=optional
 Import-Template:
  org.springframework.data.core.*;version="[1.0.0, 2.0.0)",
diff --git a/spring-data-neo4j/template.mf b/spring-data-neo4j/template.mf
index 9252af0ce0..f19e2f898b 100644
--- a/spring-data-neo4j/template.mf
+++ b/spring-data-neo4j/template.mf
@@ -2,7 +2,7 @@ Bundle-SymbolicName: org.springframework.data.neo4j
 Bundle-Name: Spring Data Neo4J
 Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
-Import-Package:
+Import-Package: 
  sun.reflect;version="0";resolution:=optional
 Import-Template:
  org.springframework.beans.*;version="[3.0.0, 4.0.0)",

From 162f6a7a3aa0a22722ae9a9c042f6c2f927b02c0 Mon Sep 17 00:00:00 2001
From: Jean-Pierre Bergamin <james@ractive.ch>
Date: Wed, 5 Oct 2011 09:52:51 +0200
Subject: [PATCH 2/4] added required spaces after the header names in the
 template.mf files

---
 spring-data-neo4j-aspects/template.mf     | 4 ++--
 spring-data-neo4j-cross-store/template.mf | 2 +-
 spring-data-neo4j-rest/template.mf        | 2 +-
 spring-data-neo4j/template.mf             | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/spring-data-neo4j-aspects/template.mf b/spring-data-neo4j-aspects/template.mf
index a79d79d9c9..995a1b8751 100644
--- a/spring-data-neo4j-aspects/template.mf
+++ b/spring-data-neo4j-aspects/template.mf
@@ -4,7 +4,7 @@ Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Import-Package: 
  sun.reflect;version="0";resolution:=optional
-Import-Template:
+Import-Template: 
  org.springframework.beans.*;version="[3.0.0, 4.0.0)",
  org.springframework.context.*;version="[3.0.0, 4.0.0)",
  org.springframework.core.*;version="[3.0.0, 4.0.0)",
@@ -32,7 +32,7 @@ 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
-Import-Package:
+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)"
diff --git a/spring-data-neo4j-cross-store/template.mf b/spring-data-neo4j-cross-store/template.mf
index ff87b06f76..fdf8f59cc9 100644
--- a/spring-data-neo4j-cross-store/template.mf
+++ b/spring-data-neo4j-cross-store/template.mf
@@ -4,7 +4,7 @@ Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Import-Package: 
  sun.reflect;version="0";resolution:=optional
-Import-Template:
+Import-Template: 
  org.springframework.beans.*;version="[3.0.0, 4.0.0)",
  org.springframework.context.*;version="[3.0.0, 4.0.0)",
  org.springframework.core.*;version="[3.0.0, 4.0.0)",
diff --git a/spring-data-neo4j-rest/template.mf b/spring-data-neo4j-rest/template.mf
index 7d1587be82..1a5d38574b 100644
--- a/spring-data-neo4j-rest/template.mf
+++ b/spring-data-neo4j-rest/template.mf
@@ -4,7 +4,7 @@ Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Import-Package: 
  sun.reflect;version="0";resolution:=optional
-Import-Template:
+Import-Template: 
  org.springframework.data.core.*;version="[1.0.0, 2.0.0)",
  org.springframework.data.neo4j.annotation.*;version="[1.0.0, 2.0.0)",
  org.springframework.*;version="[3.0.0, 4.0.0)",
diff --git a/spring-data-neo4j/template.mf b/spring-data-neo4j/template.mf
index f19e2f898b..f81ba106f4 100644
--- a/spring-data-neo4j/template.mf
+++ b/spring-data-neo4j/template.mf
@@ -4,7 +4,7 @@ Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Import-Package: 
  sun.reflect;version="0";resolution:=optional
-Import-Template:
+Import-Template: 
  org.springframework.beans.*;version="[3.0.0, 4.0.0)",
  org.springframework.context.*;version="[3.0.0, 4.0.0)",
  org.springframework.core.*;version="[3.0.0, 4.0.0)",

From 3899bd8c2fbbd575e0bd5d8e0cb5faf06444fecd Mon Sep 17 00:00:00 2001
From: Jean-Pierre Bergamin <james@ractive.ch>
Date: Wed, 5 Oct 2011 09:59:24 +0200
Subject: [PATCH 3/4] more template.mf fixes

---
 spring-data-neo4j-aspects/template.mf     | 3 +--
 spring-data-neo4j-cross-store/template.mf | 3 +--
 spring-data-neo4j-rest/template.mf        | 2 +-
 spring-data-neo4j/template.mf             | 3 +--
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/spring-data-neo4j-aspects/template.mf b/spring-data-neo4j-aspects/template.mf
index 995a1b8751..e59eed60e7 100644
--- a/spring-data-neo4j-aspects/template.mf
+++ b/spring-data-neo4j-aspects/template.mf
@@ -2,8 +2,6 @@ Bundle-SymbolicName: org.springframework.data.neo4j.aspects
 Bundle-Name: Spring Data Neo4j Aspects
 Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
-Import-Package: 
- sun.reflect;version="0";resolution:=optional
 Import-Template: 
  org.springframework.beans.*;version="[3.0.0, 4.0.0)",
  org.springframework.context.*;version="[3.0.0, 4.0.0)",
@@ -33,6 +31,7 @@ Import-Template:
  javax.persistence.spi.*;version="[1.0.0, 3.0.0)";resolution:=optional,
  javax.transaction.*;version="[1.0.1, 2.0.0)";resolution:=optional
 Import-Package: 
+ sun.reflect;version="0";resolution:=optional,
  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)"
diff --git a/spring-data-neo4j-cross-store/template.mf b/spring-data-neo4j-cross-store/template.mf
index fdf8f59cc9..a79297735e 100644
--- a/spring-data-neo4j-cross-store/template.mf
+++ b/spring-data-neo4j-cross-store/template.mf
@@ -2,8 +2,6 @@ Bundle-SymbolicName: org.springframework.data.neo4j.cross_store
 Bundle-Name: Spring Data Neo4J Cross-Store
 Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
-Import-Package: 
- sun.reflect;version="0";resolution:=optional
 Import-Template: 
  org.springframework.beans.*;version="[3.0.0, 4.0.0)",
  org.springframework.context.*;version="[3.0.0, 4.0.0)",
@@ -36,6 +34,7 @@ Import-Template:
  com.tinkerpop.gremlin.*;version="[1.1,2.0)";resolution:=optional,
  com.tinkerpop.pipes.util.*;version="[0.8,1.0)";resolution:=optional
 Import-Package: 
+ sun.reflect;version="0";resolution:=optional 
  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)"
diff --git a/spring-data-neo4j-rest/template.mf b/spring-data-neo4j-rest/template.mf
index 1a5d38574b..4b0d196eaa 100644
--- a/spring-data-neo4j-rest/template.mf
+++ b/spring-data-neo4j-rest/template.mf
@@ -18,5 +18,5 @@ Import-Template:
  com.sun.jersey.api.*;version="0",
  javax.ws.rs.core.*;version="0",
  org.codehaus.jackson.*;version="0"
-Excluded-Exports:
+Excluded-Exports: 
  org.neo4j.kernel
\ No newline at end of file
diff --git a/spring-data-neo4j/template.mf b/spring-data-neo4j/template.mf
index f81ba106f4..96b87788cc 100644
--- a/spring-data-neo4j/template.mf
+++ b/spring-data-neo4j/template.mf
@@ -2,8 +2,6 @@ Bundle-SymbolicName: org.springframework.data.neo4j
 Bundle-Name: Spring Data Neo4J
 Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
-Import-Package: 
- sun.reflect;version="0";resolution:=optional
 Import-Template: 
  org.springframework.beans.*;version="[3.0.0, 4.0.0)",
  org.springframework.context.*;version="[3.0.0, 4.0.0)",
@@ -36,6 +34,7 @@ Import-Template:
  com.tinkerpop.gremlin.*;version="[1.1,2.0)";resolution:=optional,
  com.tinkerpop.pipes.util.*;version="[0.8,1.0)";resolution:=optional
 Import-Package: 
+ sun.reflect;version="0";resolution:=optional, 
  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)"

From 99844ab483694b412d186d7c4cf612a493eddac6 Mon Sep 17 00:00:00 2001
From: Jean-Pierre Bergamin <james@ractive.ch>
Date: Wed, 5 Oct 2011 10:01:51 +0200
Subject: [PATCH 4/4] more template.mf fixes

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

diff --git a/spring-data-neo4j-cross-store/template.mf b/spring-data-neo4j-cross-store/template.mf
index a79297735e..4bb1733071 100644
--- a/spring-data-neo4j-cross-store/template.mf
+++ b/spring-data-neo4j-cross-store/template.mf
@@ -34,7 +34,7 @@ Import-Template:
  com.tinkerpop.gremlin.*;version="[1.1,2.0)";resolution:=optional,
  com.tinkerpop.pipes.util.*;version="[0.8,1.0)";resolution:=optional
 Import-Package: 
- sun.reflect;version="0";resolution:=optional 
+ sun.reflect;version="0";resolution:=optional,
  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)"