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/main/pom.xml b/main/pom.xml
index 67eb626..4dd6105 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -23,7 +23,7 @@
<version>0.8.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>Apache Felix Main</name>
<artifactId>org.apache.felix.main</artifactId>
<dependencies>
@@ -39,15 +39,18 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
<configuration>
- <archive>
- <manifestFile>src/main/manifest/Manifest.mf</manifestFile>
- <manifest>
- <mainClass>org.apache.felix.main.Main</mainClass>
- </manifest>
- </archive>
+ <instructions>
+ <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.*,org.osgi.*</Private-Package>
+ <Import-Package>!*</Import-Package>
+ <Include-Resource>{src/main/resources/}</Include-Resource>
+ </instructions>
</configuration>
</plugin>
<plugin>
@@ -59,8 +62,6 @@
<tasks>
<delete dir="${basedir}/bin"/>
<mkdir dir="${basedir}/bin"/>
- <delete dir="${basedir}/lib"/>
- <mkdir dir="${basedir}/lib"/>
<delete dir="${basedir}/conf"/>
<mkdir dir="${basedir}/conf"/>
<delete dir="${basedir}/bundle"/>
@@ -69,10 +70,6 @@
tofile="${basedir}/bin/felix.jar"/>
<copy file="${basedir}/target/classes/config.properties"
todir="${basedir}/conf"/>
-<copy file="${basedir}/../framework/target/org.apache.felix.framework-${pom.version}.jar"
- todir="${basedir}/lib"/>
-<copy file="${basedir}/../org.osgi.core/target/org.osgi.core-${pom.version}.jar"
- todir="${basedir}/lib"/>
<copy file="${basedir}/../shell/target/org.apache.felix.shell-${pom.version}.jar"
todir="${basedir}/bundle"/>
<copy file="${basedir}/../shell.tui/target/org.apache.felix.shell.tui-${pom.version}.jar"
@@ -93,6 +90,6 @@
<directory>src/main/resources</directory>
<filtering>true</filtering>
</resource>
- </resources>
+ </resources>
</build>
</project>