Updated poms to include DEPENDENCIES file in META-INF and some other small cleanups.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1097647 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/dependencymanager/annotation/pom.xml b/dependencymanager/annotation/pom.xml
index 51b7c97..6de07e8 100644
--- a/dependencymanager/annotation/pom.xml
+++ b/dependencymanager/annotation/pom.xml
@@ -26,7 +26,7 @@
<osgi.version>4.2.0</osgi.version>
</properties>
<name>Apache Felix Dependency Manager Annotation</name>
- <description>DM annotation API, and corresponding scanner plugins</description>
+ <description>Dependency Manager Annotation API and corresponding scanner plugins</description>
<artifactId>org.apache.felix.dependencymanager.annotation</artifactId>
<version>3.0.0-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
diff --git a/dependencymanager/compat/pom.xml b/dependencymanager/compat/pom.xml
index e9a7e2e..b00d739 100644
--- a/dependencymanager/compat/pom.xml
+++ b/dependencymanager/compat/pom.xml
@@ -64,11 +64,12 @@
<instructions>
<Bundle-SymbolicName>org.apache.felix.dependencymanager.compat</Bundle-SymbolicName>
<Bundle-Name>Apache Felix Dependency Manager Compatibility</Bundle-Name>
- <Bundle-Description>A bundle that provides compatibility with old 2.x.x dependencymanager.</Bundle-Description>
+ <Bundle-Description>Provides compatibility with the dependency manager version 2.</Bundle-Description>
<Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
<Export-Package>org.apache.felix.dependencymanager"</Export-Package>
<Import-Package>!org.apache.felix.dependencymanager,org.apache.felix.dm;version="[3,4)",*</Import-Package>
<Private-Package>org.apache.felix.dependencymanager.impl</Private-Package>
+ <Include-Resource>{maven-resources}, META-INF/DEPENDENCIES=DEPENDENCIES</Include-Resource>
</instructions>
</configuration>
</plugin>
diff --git a/dependencymanager/core/pom.xml b/dependencymanager/core/pom.xml
index 2346d9f..4046155 100644
--- a/dependencymanager/core/pom.xml
+++ b/dependencymanager/core/pom.xml
@@ -71,11 +71,12 @@
<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-Description>Provides dynamic service and component dependency management.</Bundle-Description>
<Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
<Export-Package>org.apache.felix.dm;version="3.0.0";provide:=true,org.apache.felix.dm.tracker;version="3.0.0";provide:=true</Export-Package>
<Import-Package>*</Import-Package>
<Private-Package>org.apache.felix.dm.impl, org.apache.felix.dm.impl.*</Private-Package>
+ <Include-Resource>{maven-resources}, META-INF/DEPENDENCIES=DEPENDENCIES</Include-Resource>
<!-- Uncomment this next line to include source code in the bundle.
<Include-Resource>src/main/java</Include-Resource>
-->
diff --git a/dependencymanager/runtime/pom.xml b/dependencymanager/runtime/pom.xml
index 9c74419..b7213cf 100644
--- a/dependencymanager/runtime/pom.xml
+++ b/dependencymanager/runtime/pom.xml
@@ -79,13 +79,14 @@
<instructions>
<Bundle-SymbolicName>org.apache.felix.dependencymanager.runtime</Bundle-SymbolicName>
<Bundle-Name>Apache Felix Dependency Manager Runtime</Bundle-Name>
- <Bundle-Description>A bundle that loads components descriptors from started bundles</Bundle-Description>
+ <Bundle-Description>Loads component descriptors from active bundles.</Bundle-Description>
<Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
<Private-Package>org.apache.felix.dm.runtime</Private-Package>
<Import-Package>*</Import-Package>
<Export-Package/>
<Embed-Dependency>json</Embed-Dependency>
<Bundle-Activator>org.apache.felix.dm.runtime.Activator</Bundle-Activator>
+ <Include-Resource>{maven-resources}, META-INF/DEPENDENCIES=DEPENDENCIES</Include-Resource>
</instructions>
</configuration>
</plugin>
diff --git a/dependencymanager/shell/pom.xml b/dependencymanager/shell/pom.xml
index 9a38e88..099dbba 100644
--- a/dependencymanager/shell/pom.xml
+++ b/dependencymanager/shell/pom.xml
@@ -97,6 +97,7 @@
<Export-Package/>
<Private-Package>org.apache.felix.dm.shell</Private-Package>
<Import-Package>org.apache.felix.shell;resolution:=optional, org.eclipse.osgi.framework.console;resolution:=optional, org.apache.felix.service.command;resolution:=optional, *</Import-Package>
+ <Include-Resource>{maven-resources}, META-INF/DEPENDENCIES=DEPENDENCIES</Include-Resource>
</instructions>
</configuration>
</plugin>