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
This commit is contained in:
Jan Bartel 2009-04-02 01:53:56 +00:00
parent 47d1651b5b
commit da4c17cd1c
2 changed files with 10 additions and 4 deletions

View File

@ -10,6 +10,8 @@
<description>Jetty JavaEE style services</description> <description>Jetty JavaEE style services</description>
<build> <build>
<plugins> <plugins>
<!--
COMMENTED OUT UNTIL CORRECT CONFIG IS FOUND FOR Export uses clauses
<plugin> <plugin>
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId> <artifactId>maven-bundle-plugin</artifactId>
@ -20,13 +22,16 @@
<goals> <goals>
<goal>manifest</goal> <goal>manifest</goal>
</goals> </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> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin> <plugin>
<!--
Required for OSGI
-->
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<configuration> <configuration>
@ -35,6 +40,7 @@
</archive> </archive>
</configuration> </configuration>
</plugin> </plugin>
-->
<!-- always include sources since jetty-xbean makes use of them --> <!-- always include sources since jetty-xbean makes use of them -->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>

View File

@ -79,7 +79,7 @@
<Bundle-DocURL>${jetty.url}</Bundle-DocURL> <Bundle-DocURL>${jetty.url}</Bundle-DocURL>
<Bundle-Vendor>Eclipse.org - Jetty</Bundle-Vendor> <Bundle-Vendor>Eclipse.org - Jetty</Bundle-Vendor>
<Bundle-Copyright>Copyright (c) 2008-2009 Mort Bay Consulting Pty. Ltd.</Bundle-Copyright> <Bundle-Copyright>Copyright (c) 2008-2009 Mort Bay Consulting Pty. Ltd.</Bundle-Copyright>
<_versionpolicy>[$(version;==;$(@)),8.0)</_versionpolicy> <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
</instructions> </instructions>
</configuration> </configuration>
</plugin> </plugin>