You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by gn...@apache.org on 2013/12/06 10:07:14 UTC
svn commit: r1548444 - /felix/trunk/fileinstall/pom.xml
Author: gnodet
Date: Fri Dec 6 09:07:13 2013
New Revision: 1548444
URL: http://svn.apache.org/r1548444
Log:
[FELIX-3686] Fix pom which did not include the generated manifest
Modified:
felix/trunk/fileinstall/pom.xml
Modified: felix/trunk/fileinstall/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/fileinstall/pom.xml?rev=1548444&r1=1548443&r2=1548444&view=diff
==============================================================================
--- felix/trunk/fileinstall/pom.xml (original)
+++ felix/trunk/fileinstall/pom.xml Fri Dec 6 09:07:13 2013
@@ -63,6 +63,14 @@
<build>
<plugins>
<plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>2.1.0</version>
@@ -81,6 +89,9 @@
<Import-Package>
org.osgi.service.log;resolution:=optional,
org.osgi.service.cm;resolution:=optional,
+ !org.apache.felix.fileinstall,
+ !org.apache.felix.cm.file,
+ !org.apache.felix.utils.*,
*
</Import-Package>
<Bundle-Activator>org.apache.felix.fileinstall.internal.FileInstall</Bundle-Activator>
@@ -147,7 +158,7 @@
<filter>
<artifact>org.apache.felix:org.apache.felix.utils</artifact>
<includes>
- <include>**/DictionaryAsMap.*</include>
+ <include>**/DictionaryAsMap*.*</include>
<include>org/apache/felix/utils/manifest/**</include>
<include>org/apache/felix/utils/properties/**</include>
<include>org/apache/felix/utils/version/**</include>