From 7e5561bfb513428317057f22a2233af6c4e973c0 Mon Sep 17 00:00:00 2001
From: Costin Leau <cleau@vmware.com>
Date: Tue, 26 Jun 2012 20:54:57 +0300
Subject: [PATCH] re-add bundlor plugin

---
 build.gradle      | 10 +++++++---
 gradle.properties |  9 ---------
 template.mf       | 28 +++++++++++++---------------
 3 files changed, 20 insertions(+), 27 deletions(-)

diff --git a/build.gradle b/build.gradle
index 6cc2c8e5d..3f676b445 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,7 +13,7 @@ group = 'org.springframework.data'
 
 repositories {
   maven { url "http://repo.springsource.org/libs-snapshot" }
-  maven { url "http://repo.springsource.org/ext-release-local" }
+  maven { url "http://repo.springsource.org/plugins-release" }
 }
 
 apply plugin: "java"
@@ -21,9 +21,8 @@ apply plugin: 'eclipse'
 apply plugin: 'idea'
 apply from: "$rootDir/maven.gradle"
 apply plugin: 'docbook-reference'
-//apply plugin: 'bundlor'
+apply plugin: 'bundlor'
 
-//bundlor.ext.useProjectProps = true
 [compileJava, compileTestJava]*.options*.compilerArgs = ["-Xlint:-serial"]
 
 // Common dependencies
@@ -91,6 +90,11 @@ javadoc {
   title = "${rootProject.description} ${version} API"
 }
 
+bundlor {
+   manifestTemplate = file("${projectDir}/template.mf").text
+}
+
+
 jar {
     manifest.attributes['Implementation-Title'] = 'spring-data-redis'
     manifest.attributes['Implementation-Version'] = project.version
diff --git a/gradle.properties b/gradle.properties
index 5e0f545bf..9cda9e8d3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -18,15 +18,6 @@ jredisVersion = 03122010
 rjcVersion = 0.6.4
 srpVersion = 0.2
 
-# Manifest properties
-
-## OSGi ranges
-spring.range = "[3.1.0, 4.0.0)"
-jedis.range = "[2.1.0, 2.1.0]"
-jackson.range = "[1.6, 2.0.0)"
-rjc.range = "[0.6.4, 0.6.4]"
-srp.range = "[0.2, 1.0)"
-
 # --------------------
 # Project wide version
 # --------------------
diff --git a/template.mf b/template.mf
index 50e6df982..ddf9bb1a1 100644
--- a/template.mf
+++ b/template.mf
@@ -2,30 +2,28 @@ Bundle-SymbolicName: org.springframework.data.redis
 Bundle-Name: Spring Data Redis Support
 Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
-Export-Template: org.springframework.data.redis.*;version=${version}
 Import-Package: 
  sun.reflect;version="0";resolution:=optional
 Import-Template: 
- org.springframework.beans.*;version=${spring.range},
- org.springframework.cache.*;version=${spring.range},
- org.springframework.context.*;version=${spring.range},
- org.springframework.core.*;version=${spring.range},
- org.springframework.dao.*;version=${spring.range},
- org.springframework.scheduling.*;resolution:="optional";version=${spring.range},
- org.springframework.util.*;version=${spring.range},
- org.springframework.oxm.*;resolution:="optional";version=${spring.range},
- org.springframework.transaction.support.*;version=${spring.range},
+ org.springframework.beans.*;version="[3.1.0, 4.0.0)",
+ org.springframework.cache.*;version="[3.1.0, 4.0.0)",
+ org.springframework.context.*;version="[3.1.0, 4.0.0)",
+ org.springframework.core.*;version="[3.1.0, 4.0.0)",
+ org.springframework.dao.*;version="[3.1.0, 4.0.0)",
+ org.springframework.scheduling.*;resolution:="optional";version="[3.1.0, 4.0.0)",
+ org.springframework.util.*;version="[3.1.0, 4.0.0)",
+ org.springframework.oxm.*;resolution:="optional";version="[3.1.0, 4.0.0)",
+ org.springframework.transaction.support.*;version="[3.1.0, 4.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",
  javax.xml.transform.*;resolution:="optional";version="0",
  org.jredis.*;resolution:="optional";version="[1.0.0, 2.0.0)",
  org.jredis.ri.alphazero.*;resolution:="optional";version="[1.0.0, 2.0.0)",
- redis.clients.jedis.*;version=${jedis.range},
- redis.clients.util.*;version=${jedis.range},
- org.idevlab.rjc.*;resolution:="optional";version=${rjc.range},
+ redis.clients.*;resolution:="optional";version="[2.1.0, 2.1.0]",
+ org.idevlab.rjc.*;resolution:="optional";version="[0.6.4, 0.6.4]",
  org.apache.commons.pool.impl.*;resolution:="optional";version="[1.0.0, 3.0.0)",
- org.codehaus.jackson.*;resolution:="optional";version=${jackson.range},
+ org.codehaus.jackson.*;resolution:="optional";version="[1.6, 2.0.0)",
  org.apache.commons.beanutils.*;resolution:="optional";version=1.8.5,
- redis.*;resolution:="optional";version=${srp.range},
+ redis.*;resolution:="optional";version="[0.2, 1.0)",
  com.google.common.*;resolution:="optional";version="[11.0.0, 20.0.0)"
\ No newline at end of file