From da4c17cd1cf3dc1136b31494211fb010b51fefcb Mon Sep 17 00:00:00 2001
From: Jan Bartel <jan@webtide.com>
Date: Thu, 2 Apr 2009 01:53:56 +0000
Subject: [PATCH] Change versionpolicy to auto calculate the range ; exclude
 jetty-plus from osgi manifest generation until we can find a way to correctly
 generate the export uses clauses, which are all being generated at the
 default version level irrespective of package

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@85 7e9141cc-0065-0410-87d8-b60c137991c4
---
 jetty-plus/pom.xml | 12 +++++++++---
 pom.xml            |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/jetty-plus/pom.xml b/jetty-plus/pom.xml
index 2c77d2eac93..39cb65f25b4 100644
--- a/jetty-plus/pom.xml
+++ b/jetty-plus/pom.xml
@@ -10,6 +10,8 @@
   <description>Jetty JavaEE style services</description>
   <build>
     <plugins>
+<!-- 
+  COMMENTED OUT UNTIL CORRECT CONFIG IS FOUND FOR Export uses clauses
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
@@ -20,13 +22,16 @@
             <goals>
               <goal>manifest</goal>
             </goals>
+            <configuration>
+              <instructions>
+               <_versionpolicy> </_versionpolicy>
+               <Import-Package>javax.servlet.*;version="[2.5,3.0)",javax.transaction.*;version="[1.1,1.2)",*</Import-Package>
+              </instructions>
+            </configuration>
           </execution>
         </executions>
       </plugin>
       <plugin>
-        <!--
-        Required for OSGI
-        -->
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
         <configuration>
@@ -35,6 +40,7 @@
           </archive>
         </configuration>
       </plugin>
+-->
       <!-- always include sources since jetty-xbean makes use of them -->
       <plugin>
          <groupId>org.apache.maven.plugins</groupId>
diff --git a/pom.xml b/pom.xml
index 3e255d6981f..a5a39e683e7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,7 +79,7 @@
             <Bundle-DocURL>${jetty.url}</Bundle-DocURL>
             <Bundle-Vendor>Eclipse.org - Jetty</Bundle-Vendor>
             <Bundle-Copyright>Copyright (c) 2008-2009 Mort Bay Consulting Pty. Ltd.</Bundle-Copyright>
-            <_versionpolicy>[$(version;==;$(@)),8.0)</_versionpolicy>
+            <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
           </instructions>
         </configuration>
        </plugin>