From 10d6fabae0d27846000ee7615de190f4b8638f19 Mon Sep 17 00:00:00 2001
From: John Blum <jblum@pivotal.io>
Date: Wed, 3 Sep 2014 17:22:47 -0700
Subject: [PATCH] SGF-315 - Re-activated Bundlor plugin to generate OSGi
 metadata. Re-enabled the plugin and pointed it to the already existing
 template.mf. Polished up the template and make sure it refers to matching
 versions. (cherry picked from commit
 f758faa881d8482a4f0412b978f49df96d791a1d)

Signed-off-by: John Blum <jblum@pivotal.io>
---
 build.gradle      |  7 +++++++
 gradle.properties |  5 ++---
 template.mf       | 24 +++++++++---------------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/build.gradle b/build.gradle
index a5f97a3b..1c31b911 100644
--- a/build.gradle
+++ b/build.gradle
@@ -135,6 +135,9 @@ javadoc {
 }
 
 jar {
+
+    dependsOn = [ 'bundlor' ]
+
     manifest.attributes['Implementation-Title'] = 'spring-data-gemfire'
     manifest.attributes['Implementation-Version'] = project.version
 
@@ -146,6 +149,10 @@ jar {
     }
 }
 
+bundlor {
+    manifestTemplate = file("template.mf").text
+}
+
 // Reference documentation
 
 reference {
diff --git a/gradle.properties b/gradle.properties
index bb2c5fc5..56d41346 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,5 @@
 antlrVersion=2.7.7
-aspectjVersion=1.7.4
-gemfire.range="[6.5, 8.0)"
+aspectjVersion=1.8.2
 gemfireVersion=7.0.2
 hamcrestVersion=1.3
 jacksonVersion=1.9.12
@@ -10,6 +9,6 @@ mockitoVersion=1.9.5
 slf4jVersion=1.7.6
 spring.range="[4.0.0, 5.0.0)"
 springVersion=4.0.6.RELEASE
-springDataCommonsVersion=1.9.0.BUILD-SNAPSHOT
 springDataBuildVersion=1.5.0.BUILD-SNAPSHOT
+springDataCommonsVersion=1.9.0.BUILD-SNAPSHOT
 version=1.5.0.BUILD-SNAPSHOT
diff --git a/template.mf b/template.mf
index 07224dde..a4ebbfc3 100644
--- a/template.mf
+++ b/template.mf
@@ -1,21 +1,15 @@
 Bundle-SymbolicName: org.springframework.data.gemfire
 Bundle-Name: Spring Data GemFire
-Bundle-Vendor: SpringSource
+Bundle-Vendor: Pivotal Software, Inc.
 Bundle-ManifestVersion: 2
-Import-Package: 
+Import-Package:
  sun.reflect;version="0";resolution:=optional
-Import-Template: 
- org.springframework.asm.*;version="[3.0.0, 4.0.0)",
- org.springframework.beans.*;version="[3.0.0, 4.0.0)",
- org.springframework.cache.*;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)",
- org.springframework.dao.*;version="[3.0.0, 4.0.0)",
- org.springframework.data.*;version="[1.2.0,2.0.0)",
- org.springframework.expression.*;version="[3.0.0, 4.0.0)",
- org.springframework.util.*;version="[3.0.0, 4.0.0)",
- org.springframework.transaction.*;version="[3.0.0, 4.0.0)",
- com.gemstone.*;version="[6.5, 8.0)",
+Import-Template:
+ com.fasterxml.jackson.*;version="[2.4.1,3.0.0)";resolution:=optional,
+ com.gemstone.*;version="[8.0.0,9.0.0)",
  org.aopalliance.*;version="[1.0.0, 2.0.0)";resolution:=optional,
  org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
- org.w3c.dom.*;version="0"
\ No newline at end of file
+ org.aspectj.*;version="[1.8.2, 2.0.0)";resolution:=optional,
+ org.springframework.*;version="[4.0.6, 5.0.0)",
+ org.springframework.data.*;version="[1.9.0,2.0.0)",
+ org.w3c.dom.*;version="0"