commit b778a9bd038b727e4ede569e1d96a4ac398fbceb
author Karl Pauls <pauls@apache.org> Wed Sep 12 18:09:23 2007 +0000
committer Karl Pauls <pauls@apache.org> Wed Sep 12 18:09:23 2007 +0000
tree 169a596272dca87d2611ff163c53cb4acf720e39
parent 786d60e6211ab141db7af17c1f204aa0400bc855

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.

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@575029 13f79535-47bb-0310-9956-ffa450edef68

main/pom.xml

diff --git a/main/pom.xml b/main/pom.xml
index 253d071..5e631fe 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -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>
@@ -111,23 +111,6 @@
         <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>
             <goals>