Convert the EventAdmin to the new maven plugin.
git-svn-id: https://svn.apache.org/repos/asf/incubator/felix/trunk@470734 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/eventadmin/pom.xml b/eventadmin/pom.xml
index c63c9bc..aa40a5d 100644
--- a/eventadmin/pom.xml
+++ b/eventadmin/pom.xml
@@ -5,54 +5,54 @@
<version>0.8.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <packaging>osgi-bundle</packaging>
+ <packaging>bundle</packaging>
<name>Apache Felix EventAdmin</name>
+ <description>
+ This bundle provides an implementation of the OSGi R4 EventAdmin service.
+ </description>
<artifactId>org.apache.felix.eventadmin</artifactId>
<dependencies>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>${pom.version}</version>
- <scope>provided</scope>
+ <version>0.8.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <version>${pom.version}</version>
- <scope>provided</scope>
+ <version>0.8.0-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix.plugins</groupId>
- <artifactId>maven-osgi-plugin</artifactId>
- <version>${pom.version}</version>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<configuration>
- <osgiManifest>
- <bundleName>EventAdmin</bundleName>
- <bundleVendor>Apache Software Foundation</bundleVendor>
- <bundleDescription>
- This bundle provides an implementation of the OSGi R4 EventAdmin service.
- </bundleDescription>
- <bundleSymbolicName>${pom.artifactId}</bundleSymbolicName>
- <bundleActivator>
- org.apache.felix.eventadmin.impl.Activator
- </bundleActivator>
- <importPackage>
- org.osgi.framework, org.osgi.service.event; version=1.0.1
- </importPackage>
- <dynamicImportPackage>
+ <instructions>
+ <Bundle-SymbolicName>
+ ${pom.artifactId}
+ </Bundle-SymbolicName>
+ <Bundle-Activator>
+ ${pom.artifactId}.impl.Activator
+ </Bundle-Activator>
+ <Dynamic-ImportPackage>
org.osgi.service.log
- </dynamicImportPackage>
- <importService>
+ </Dynamic-ImportPackage>
+ <Import-Package>!org.osgi.service.log,*</Import-Package>
+ <Export-Package>org.osgi.service.event</Export-Package>
+ <Private-Package>org.apache.felix.eventadmin.impl.*</Private-Package>
+ <Include-Resource>
+ src/main/resources
+ </Include-Resource>
+ <Import-Service>
org.osgi.service.event.EventHandler, org.osgi.service.log.LogService, org.osgi.service.log.LogReaderService
- </importService>
- <exportService>
+ </Import-Service>
+ <Export-Service>
org.osgi.service.event.EventAdmin
- </exportService>
- </osgiManifest>
+ </Export-Service>
+ </instructions>
</configuration>
</plugin>
</plugins>