From 3f6a8b7989e7fd6528c5f6af4359e0ef0b0c1560 Mon Sep 17 00:00:00 2001
From: David Jencks <djencks@apache.org>
Date: Sun, 25 Apr 2010 17:22:23 +0000
Subject: [PATCH] AMQ-2637 port osgi version range fixes from trunk

git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@937831 13f79535-47bb-0310-9956-ffa450edef68
---
 activemq-core/pom.xml | 13 -------------
 pom.xml               |  9 +++++----
 2 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/activemq-core/pom.xml b/activemq-core/pom.xml
index fe3dfbc33f..7aab1e4c0d 100755
--- a/activemq-core/pom.xml
+++ b/activemq-core/pom.xml
@@ -32,7 +32,6 @@
 
   <properties>
     <activemq.osgi.import.pkg>
-      org.osgi.framework;version="[1.3,2)",
       com.thoughtworks.xstream*;resolution:=optional,
       org.apache.activeio*;resolution:=optional,
       org.apache.camel*;resolution:=optional,
@@ -390,21 +389,9 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>${felix-version}</version>
-        <extensions>true</extensions>
         <configuration>
           <instructions>
             <Bundle-Activator>org.apache.activemq.util.osgi.Activator</Bundle-Activator>
-            <Bundle-Name>${artifactId}</Bundle-Name>
-            <Bundle-SymbolicName>${activemq.osgi.symbolic.name}</Bundle-SymbolicName>
-            <Export-Package>${activemq.osgi.export}</Export-Package>
-            <Import-Package>${activemq.osgi.import}</Import-Package>
-            <DynamicImport-Package>${activemq.osgi.dynamic.import}</DynamicImport-Package>
-            <Private-Package>${activemq.osgi.private.pkg}</Private-Package>
-            <Implementation-Title>Apache ActiveMQ</Implementation-Title>
-            <Implementation-Version>${project.version}</Implementation-Version>
-            <_versionpolicy>[$(version;==;$(@)),$(version;=+;$(@)))</_versionpolicy>
-            <_failok>${servicemix.osgi.failok}</_failok>
           </instructions>
         </configuration>
       </plugin>
diff --git a/pom.xml b/pom.xml
index 2cbfa60968..5b71fa9679 100755
--- a/pom.xml
+++ b/pom.xml
@@ -80,7 +80,7 @@
     <xstream-version>1.3.1</xstream-version>
     <xbean-version>3.6</xbean-version>
     <velocity-version>1.6.2</velocity-version>
-    <felix-version>2.0.1</felix-version>
+    <maven-bundle-plugin-version>2.0.1</maven-bundle-plugin-version>
     <commons-net-version>2.0</commons-net-version>
     <ftpserver-version>1.0.0</ftpserver-version>
     <site-repo-url>scpexe://people.apache.org/www/activemq.apache.org/maven/</site-repo-url>
@@ -1005,7 +1005,7 @@
         <plugin>
           <groupId>org.apache.felix</groupId>
           <artifactId>maven-bundle-plugin</artifactId>
-          <version>${felix-version}</version>
+          <version>${maven-bundle-plugin-version}</version>
         </plugin>
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
@@ -1094,7 +1094,6 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>${felix-version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
@@ -1106,7 +1105,9 @@
             <Private-Package>${activemq.osgi.private.pkg}</Private-Package>
             <Implementation-Title>Apache ActiveMQ</Implementation-Title>
             <Implementation-Version>${project.version}</Implementation-Version>
-            <_versionpolicy>[$(version;==;$(@)),$(version;=+;$(@)))</_versionpolicy>   
+            <_versionpolicy-impl>[$(version;==;$(@)),$(version;=+;$(@)))</_versionpolicy-impl>
+            <_versionpolicy-uses>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy-uses>
+            <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
             <_failok>${servicemix.osgi.failok}</_failok>
           </instructions>
         </configuration>