Modified these subprojects to use the new Maven bundle plugin.
git-svn-id: https://svn.apache.org/repos/asf/incubator/felix/trunk@470535 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/log/pom.xml b/log/pom.xml
index f858a68..510a567 100644
--- a/log/pom.xml
+++ b/log/pom.xml
@@ -5,48 +5,36 @@
<version>0.8.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <packaging>osgi-bundle</packaging>
+ <packaging>bundle</packaging>
<name>Apache Felix Log Service</name>
+ <description>
+ This bundle provides an implementation of the OSGi R4 Log service.
+ </description>
<artifactId>org.apache.felix.log</artifactId>
<dependencies>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>${pom.version}</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <version>${pom.version}</version>
- <scope>provided</scope>
</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>LogService</bundleName>
- <bundleSymbolicName>${pom.artifacfId}</bundleSymbolicName>
- <bundleVendor>Apache Software Foundation</bundleVendor>
- <bundleDescription>
- This bundle provides an implementation of the OSGi R4 Log service.
- </bundleDescription>
- <bundleActivator>
- org.apache.felix.log.impl.Activator
- </bundleActivator>
- <importPackage>
- org.osgi.framework, org.osgi.service.log; version=1.3
- </importPackage>
- <exportService>
- org.osgi.service.log.LogService, org.osgi.service.log.LogReaderService
- </exportService>
- </osgiManifest>
+ <instructions>
+ <Export-Package>org.osgi.service.log</Export-Package>
+ <Private-Package>org.apache.felix.log.impl</Private-Package>
+ <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Bundle-Activator>${pom.artifactId}.impl.Activator</Bundle-Activator>
+ <Export-Service>org.osgi.service.log.LogService,org.osgi.service.log.LogReaderService</Export-Service>
+ </instructions>
</configuration>
</plugin>
</plugins>