Converted DM to use the bundle plugin and added symbolic name (FELIX-272).
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@543146 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/dependencymanager/pom.xml b/dependencymanager/pom.xml
index 73565f9..035b6fc 100644
--- a/dependencymanager/pom.xml
+++ b/dependencymanager/pom.xml
@@ -5,7 +5,7 @@
<version>0.9.0-incubator-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <packaging>osgi-bundle</packaging>
+ <packaging>bundle</packaging>
<name>Apache Felix Dependency Manager</name>
<artifactId>org.apache.felix.dependencymanager</artifactId>
<dependencies>
@@ -19,24 +19,19 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix.plugins</groupId>
- <artifactId>maven-osgi-plugin</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
<version>${pom.version}</version>
<extensions>true</extensions>
<configuration>
- <osgiManifest>
- <bundleName>Dependency Manager</bundleName>
- <bundleVendor>Apache Software Foundation</bundleVendor>
- <bundleDescription>
- A bundle that provides a run-time service dependency manager.
- </bundleDescription>
- <importPackage>
- org.osgi.framework
- </importPackage>
- <exportPackage>
- org.apache.felix.dependencymanager
- </exportPackage>
- </osgiManifest>
+ <instructions>
+ <Bundle-SymbolicName>org.apache.felix.dependencymanager</Bundle-SymbolicName>
+ <Bundle-Name>Apache Felix Dependency Manager</Bundle-Name>
+ <Bundle-Description>A bundle that provides a run-time service dependency manager.</Bundle-Description>
+ <Bundle-Vendor>Apache Software Foundation</Bundle-Vendor>
+ <Export-Package>org.apache.felix.dependencymanager</Export-Package>
+ <Import-Package>!org.apache.felix.dependencymanager,*</Import-Package>
+ </instructions>
</configuration>
</plugin>
</plugins>
diff --git a/pom.xml b/pom.xml
index fc725d0..9c3b93b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -138,6 +138,7 @@
<module>scr</module>
<module>configadmin</module>
<module>metatype</module>
+ <module>dependencymanager</module>
<module>ipojo/core</module>
<module>ipojo/metadata</module>
@@ -156,7 +157,6 @@
<module>shell.gui</module>
<module>shell.gui.plugin</module>
<module>org.apache.felix.daemon</module>
- <module>dependencymanager</module>
<module>examples</module>