Generate manifest by maven-bundle-plugin, switch back to packaging=bundle
diff --git a/mavibot/pom.xml b/mavibot/pom.xml
index aa16341..fd0a621 100644
--- a/mavibot/pom.xml
+++ b/mavibot/pom.xml
@@ -28,7 +28,7 @@
<artifactId>mavibot</artifactId>
<name>ApacheDS MVCC BTree implementation</name>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<description>A MVCC BTree Implementation</description>
@@ -65,6 +65,44 @@
<artifactId>slf4j-log4j12</artifactId>
<version>${slf4j.log4j12.version}</version>
</dependency>
- </dependencies>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile>META-INF/MANIFEST.MF</manifestFile>
+ <addMavenDescriptor>false</addMavenDescriptor>
+ </archive>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <inherited>true</inherited>
+ <extensions>true</extensions>
+ <configuration>
+ <manifestLocation>META-INF</manifestLocation>
+ <instructions>
+ <Bundle-SymbolicName>${project.groupId}.mavibot</Bundle-SymbolicName>
+ <Export-Package>
+ org.apache.directory.mavibot.btree;version=${project.version};-noimport:=true,
+ org.apache.directory.mavibot.btree.comparator;version=${project.version};-noimport:=true,
+ org.apache.directory.mavibot.btree.exception;version=${project.version};-noimport:=true,
+ org.apache.directory.mavibot.btree.memory;version=${project.version};-noimport:=true,
+ org.apache.directory.mavibot.btree.persisted;version=${project.version};-noimport:=true,
+ org.apache.directory.mavibot.btree.serializer;version=${project.version};-noimport:=true,
+ org.apache.directory.mavibot.btree.util;version=${project.version};-noimport:=true
+ </Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+
+ </plugins>
+ </build>
</project>
diff --git a/pom.xml b/pom.xml
index 331839b..05fcfbc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -202,21 +202,6 @@
</plugin>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <inherited>true</inherited>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>${project.groupId}</Bundle-SymbolicName>
- <Export-Package>
- {local-packages};version=${project.version};-noimport:=true
- </Export-Package>
- </instructions>
- </configuration>
- </plugin>
-
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<configuration>
