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/org.osgi.compendium/pom.xml b/org.osgi.compendium/pom.xml
index 10eb4d8..6f9d728 100644
--- a/org.osgi.compendium/pom.xml
+++ b/org.osgi.compendium/pom.xml
@@ -6,48 +6,43 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<name>OSGi R4 Compendium Bundle</name>
+ <description>OSGi Service Platform Release 4 Compendium Interfaces and Classes.</description>
<artifactId>org.osgi.compendium</artifactId>
- <packaging>osgi-bundle</packaging>
+ <packaging>bundle</packaging>
<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>javax.servlet</artifactId>
<version>${pom.version}</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.foundation</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>osgi.compendium</bundleName>
- <bundleVendor>OSGi Alliance</bundleVendor>
- <bundleVersion>4</bundleVersion>
- <bundleSymbolicName>osgi.compendium</bundleSymbolicName>
- <bundleDescription>OSGi Service Platform Release 4 Compendium Interfaces and Classes.</bundleDescription>
- <bundleCopyright>Copyright (c) OSGi Alliance (2000, 2005). All Rights Reserved.</bundleCopyright>
- <bundleCategory>osgi</bundleCategory>
- <bundleDocUrl>http://www.osgi.org/</bundleDocUrl>
- <exportPackage>org.osgi.service.cm ;specification-version="1.2",org.osgi.service.component ;specification-version="1.0",org.osgi.service.device ;specification-version="1.1",org.osgi.service.event ;specification-version="1.1",org.osgi.service.http ;specification-version="1.2",org.osgi.service.io ;specification-version="1.0",org.osgi.service.log ;specification-version="1.3",org.osgi.service.metatype ;specification-version="1.1",org.osgi.service.prefs ;specification-version="1.1",org.osgi.service.provisioning ;specification-version="1.1",org.osgi.service.upnp ;specification-version="1.1",org.osgi.service.useradmin ;specification-version="1.1",org.osgi.service.wireadmin ;specification-version="1.0",org.osgi.util.measurement ;specification-version="1.0",org.osgi.util.position ;specification-version="1.0",org.osgi.util.tracker ;specification-version="1.3.2",org.osgi.util.xml ;specification-version="1.0"</exportPackage>
- <dynamicImportPackage>*</dynamicImportPackage>
- </osgiManifest>
+ <instructions>
+ <Export-Package>!org.osgi.framework,!org.osgi.service.condpermadmin,!org.osgi.service.packageadmin,!org.osgi.service.permissionadmin,!org.osgi.service.startlevel,!org.osgi.service.url,org.osgi.*</Export-Package>
+ <Import-Package>!org.osgi,*</Import-Package>
+ <Dynamic-ImportPackage>*</Dynamic-ImportPackage>
+ <Bundle-Version>4</Bundle-Version>
+ <Bundle-Vendor>OSGi Alliance</Bundle-Vendor>
+ <Bundle-Copyright>Copyright (c) OSGi Alliance (2000, 2005). All Rights Reserved.</Bundle-Copyright>
+ <Bundle-Category>osgi</Bundle-Category>
+ <Bundle-DocURL>http://www.osgi.org/</Bundle-DocURL>
+ </instructions>
</configuration>
</plugin>
</plugins>