You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by pa...@apache.org on 2007/09/12 20:09:24 UTC
svn commit: r575029 - /felix/trunk/main/pom.xml
Author: pauls
Date: Wed Sep 12 11:09:23 2007
New Revision: 575029
URL: http://svn.apache.org/viewvc?rev=575029&view=rev
Log:
Use the bnd merge directive and remove the unpack of the framework classes (not needed anymore because of the merge directive). Furthermore, use the 1.0.0 version of the maven bundle plugin.
Modified:
felix/trunk/main/pom.xml
Modified: felix/trunk/main/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/main/pom.xml?rev=575029&r1=575028&r2=575029&view=diff
==============================================================================
--- felix/trunk/main/pom.xml (original)
+++ felix/trunk/main/pom.xml Wed Sep 12 11:09:23 2007
@@ -92,7 +92,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -100,7 +100,7 @@
<Main-Class>org.apache.felix.main.Main</Main-Class>
<Bundle-Name>Apache Felix</Bundle-Name>
<Bundle-Description>OSGi R4 framework.</Bundle-Description>
- <Private-Package>org.apache.felix.main.*,org.apache.felix.moduleloader.*,org.apache.felix.framework.*,org.osgi.framework,org.osgi.service.packageadmin,org.osgi.service.startlevel,org.osgi.service.url,org.osgi.util.tracker</Private-Package>
+ <Private-Package>org.apache.felix.main.*,org.apache.felix.moduleloader.*,org.apache.felix.framework.*,org.osgi.framework;-split-package:=merge-last,org.osgi.service.packageadmin;-split-package:=merge-last,org.osgi.service.startlevel;-split-package:=merge-last,org.osgi.service.url;-split-package:=merge-last,org.osgi.util.tracker;-split-package:=merge-last</Private-Package>
<Import-Package>!*</Import-Package>
<Include-Resource>{src/main/resources/}</Include-Resource>
</instructions>
@@ -110,23 +110,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
- <execution>
- <id>unpack</id>
- <phase>validate</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <outputDirectory>${project.build.outputDirectory}</outputDirectory>
- <artifactItems>
- <artifactItem>
- <groupId>${pom.groupId}</groupId>
- <artifactId>org.apache.felix.framework</artifactId>
- <version>1.1.0-SNAPSHOT</version>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
<execution>
<id>copy</id>
<phase>install</phase>