Due to the Maven bug related to having multiple packaging plugins, I had
to separate our pom into two different ones (one for the old plugin and
one for the new). A new ant file can be used to build the two pom files.
git-svn-id: https://svn.apache.org/repos/asf/incubator/felix/trunk@470536 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/build.xml b/build.xml
new file mode 100644
index 0000000..d48ae0e
--- /dev/null
+++ b/build.xml
@@ -0,0 +1,26 @@
+<project default="all">
+ <target name="clean">
+ <exec executable="mvn" failonerror="true">
+ <arg line="-f pom-new-plugin.xml clean" />
+ </exec>
+ <exec executable="mvn" failonerror="true">
+ <arg line="-f pom-old-plugin.xml clean" />
+ </exec>
+ </target>
+ <target name="install">
+ <exec executable="mvn" failonerror="true">
+ <arg line="-f pom-new-plugin.xml install" />
+ </exec>
+ <exec executable="mvn" failonerror="true">
+ <arg line="-f pom-old-plugin.xml install" />
+ </exec>
+ </target>
+ <target name="all">
+ <exec executable="mvn" failonerror="true">
+ <arg line="-f pom-new-plugin.xml clean install" />
+ </exec>
+ <exec executable="mvn" failonerror="true">
+ <arg line="-f pom-old-plugin.xml clean install" />
+ </exec>
+ </target>
+</project>
diff --git a/pom.xml b/pom-new-plugin.xml
similarity index 78%
copy from pom.xml
copy to pom-new-plugin.xml
index 5296599..869c82c 100644
--- a/pom.xml
+++ b/pom-new-plugin.xml
@@ -63,85 +63,19 @@
</scm>
<modules>
- <module>tools/maven2/maven-osgi-plugin</module>
+ <module>org.osgi.foundation</module>
+ <module>tools/maven2/maven-bundle-plugin</module>
<module>javax.servlet</module>
<module>org.osgi.core</module>
<module>org.osgi.compendium</module>
- <module>org.osgi.foundation</module>
<module>framework</module>
+ <module>main</module>
<module>shell</module>
<module>shell.tui</module>
- <module>shell.gui</module>
- <module>shell.gui.plugin</module>
<module>bundlerepository</module>
- <module>org.apache.felix.daemon</module>
- <module>org.apache.felix.dependencymanager</module>
- <module>main</module>
-
- <module>examples</module>
-
- <module>servicebinder</module>
- <module>wireadmin</module>
- <module>upnp.extra</module>
- <module>upnp.basedriver</module>
- <module>upnp.tester</module>
- <module>upnp.sample.tv</module>
- <module>upnp.sample.clock</module>
- <module>upnp.sample.binaryLight</module>
- <module>http.jetty</module>
- <module>scr</module>
- <module>eventadmin</module>
- <module>eventadmin.bridge.upnp</module>
- <module>eventadmin.bridge.configuration</module>
- <module>eventadmin.bridge.useradmin</module>
- <module>eventadmin.bridge.wireadmin</module>
<module>log</module>
-
- <module>tools/mangen</module>
-
- <module>ipojo</module>
- <module>ipojo.metadata</module>
-
</modules>
- <profiles>
- <profile>
- <id>jdk1.5</id>
- <activation>
- <jdk>1.5</jdk>
- </activation>
- <modules>
- <module>mosgi.console.ifc</module>
- <module>mosgi.console.component</module>
- <module>mosgi.console.gui</module>
- <module>mosgi.jmx.agent</module>
- <module>mosgi.jmx.httpconnector</module>
- <module>mosgi.jmx.registry</module>
- <module>mosgi.jmx.remotelogger</module>
- <module>mosgi.jmx.rmiconnector</module>
- <module>mosgi.managedelements.osgiprobes</module>
- <module>mosgi.managedelements.osgiprobes.tab</module>
- <module>mosgi.managedelements.bundlesprobes</module>
- <module>mosgi.managedelements.bundlesprobes.tab</module>
- <module>mosgi.managedelements.obrprobe</module>
- <module>mosgi.managedelements.obrprobe.tab</module>
- <module>mosgi.managedelements.memoryprobe</module>
- <module>ipojo.plugin</module>
- <module>ipojo.arch</module>
- </modules>
- </profile>
- <profile>
- <id>jdk1.4</id>
- <activation>
- <jdk>1.4</jdk>
- </activation>
- <modules>
- <module>ipojo.plugin</module>
- <module>ipojo.arch</module>
- </modules>
- </profile>
- </profiles>
-
<!-- Specify a default version number for dependencies -->
<dependencyManagement>
<dependencies>
diff --git a/pom.xml b/pom-old-plugin.xml
similarity index 96%
rename from pom.xml
rename to pom-old-plugin.xml
index 5296599..ab6567b 100644
--- a/pom.xml
+++ b/pom-old-plugin.xml
@@ -64,19 +64,10 @@
<modules>
<module>tools/maven2/maven-osgi-plugin</module>
- <module>javax.servlet</module>
- <module>org.osgi.core</module>
- <module>org.osgi.compendium</module>
- <module>org.osgi.foundation</module>
- <module>framework</module>
- <module>shell</module>
- <module>shell.tui</module>
<module>shell.gui</module>
<module>shell.gui.plugin</module>
- <module>bundlerepository</module>
<module>org.apache.felix.daemon</module>
<module>org.apache.felix.dependencymanager</module>
- <module>main</module>
<module>examples</module>
@@ -95,7 +86,6 @@
<module>eventadmin.bridge.configuration</module>
<module>eventadmin.bridge.useradmin</module>
<module>eventadmin.bridge.wireadmin</module>
- <module>log</module>
<module>tools/mangen</module>