FELIX-258 Update pom to use new bundle plugin
git-svn-id: https://svn.apache.org/repos/asf/incubator/felix/trunk@523603 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/scr/pom.xml b/scr/pom.xml
index 42bf9c6..267b7c2 100644
--- a/scr/pom.xml
+++ b/scr/pom.xml
@@ -5,52 +5,49 @@
<version>0.9.0-incubator-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <packaging>osgi-bundle</packaging>
+ <packaging>bundle</packaging>
<name>Apache Felix Declarative Services</name>
+ <description>Implementation of the Declarative Services specification 1.0</description>
<artifactId>org.apache.felix.scr</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>
<dependency>
- <groupId>kxml2</groupId>
+ <groupId>net.sf.kxml</groupId>
<artifactId>kxml2</artifactId>
<version>2.2.2</version>
- </dependency> </dependencies>
+ </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>Service Component Runtime</bundleName>
- <bundleVendor>Apache Software Foundation</bundleVendor>
- <bundleDescription>
- Implementation of the Declarative Services specification.
- </bundleDescription>
- <bundleActivator>
+ <instructions>
+ <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
+ <Bundle-Vendor>Apache Software Foundation</Bundle-Vendor>
+ <Bundle-Activator>
org.apache.felix.scr.Activator
- </bundleActivator>
- <bundleSymbolicName>org.apache.felix.scr</bundleSymbolicName>
- <exportPackage>
- org.apache.felix.scr
- </exportPackage>
- <importPackage>
- org.osgi.service.log, org.osgi.service.component, org.osgi.framework
- </importPackage>
- </osgiManifest>
+ </Bundle-Activator>
+ <Export-Package>
+ org.osgi.service.component; version=1.0
+ </Export-Package>
+ <Private-Package>
+ org.apache.felix.scr.*,
+ org.kxml2.io,
+ org.xmlpull.v1
+ </Private-Package>
+ </instructions>
</configuration>
</plugin>
</plugins>