You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by mc...@apache.org on 2009/04/18 02:58:07 UTC
svn commit: r766191 - in /felix/trunk: pom.xml pom/pom.xml
Author: mcculls
Date: Sat Apr 18 00:58:07 2009
New Revision: 766191
URL: http://svn.apache.org/viewvc?rev=766191&view=rev
Log:
Remove duplicate list of modules, as it is getting out-of-sync
Modified:
felix/trunk/pom.xml
felix/trunk/pom/pom.xml
Modified: felix/trunk/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/pom.xml?rev=766191&r1=766190&r2=766191&view=diff
==============================================================================
--- felix/trunk/pom.xml (original)
+++ felix/trunk/pom.xml Sat Apr 18 00:58:07 2009
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>4</version>
+ <version>5</version>
</parent>
<groupId>org.apache.felix</groupId>
Modified: felix/trunk/pom/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/pom/pom.xml?rev=766191&r1=766190&r2=766191&view=diff
==============================================================================
--- felix/trunk/pom/pom.xml (original)
+++ felix/trunk/pom/pom.xml Sat Apr 18 00:58:07 2009
@@ -62,121 +62,7 @@
<url>http://svn.apache.org/viewvc/felix/trunk/?root=Apache-SVN</url>
</scm>
- <!--
- Felix contains 3 custom maven packaging plugins. Each creates a jar file
- as an artifact.
-
- maven-bundle-plugin
- (bundle packaging - latest prefered plugin for generating OSGi bundles.)
- maven-osgi-plugin
- (osgi-bundle packaging - old plugin for generating OSGi bundles.)
- org.apache.felix.ipojo.plugin
- (plugin for generating iPOJO OSGi bundles.)
-
- But with maven bug https://issues.apache.org/jira/browse/FELIX-198 files
- are not always created with the correct extension in the repository.
-
- As a work around, this pom creates different profiles for building the
- different types of felix modules.
-
- Usage:
- mvn -Dpackaging=<type> clean install
- -->
-
<profiles>
-
- <profile>
- <id>packaging-plugins</id>
- <activation>
- <property>
- <name>packaging</name>
- <value>plugins</value>
- </property>
- </activation>
- <modules>
- <module>../maven-obr-plugin</module>
- <module>../bundleplugin</module>
- <module>../scrplugin</module>
- <module>../tools/maven2/maven-osgi-plugin</module>
-<!-- <module>../tools/maven2/maven-felix-plugin</module> -->
- </modules>
- </profile>
-
- <profile>
- <id>packaging-ipojo-bundle</id>
- <activation>
- <property>
- <name>packaging</name>
- <value>ipojo-bundle</value>
- </property>
- </activation>
- <modules>
- <!--<module>ipojo/arch</module>-->
- </modules>
- </profile>
-
- <profile>
- <id>packaging-bundle</id>
- <activation>
- <property>
- <name>packaging</name>
- <value>bundle</value>
- </property>
- </activation>
- <modules>
- <module>../org.osgi.foundation</module>
- <module>../javax.servlet</module>
- <module>../org.osgi.core</module>
- <module>../org.osgi.compendium</module>
- <module>../framework</module>
- <module>../main</module>
- <module>../shell</module>
- <module>../shell.tui</module>
- <module>../shell.gui</module>
- <module>../shell.gui.plugin</module>
- <module>../shell.remote</module>
- <module>../org.osgi.service.obr</module>
- <module>../bundlerepository</module>
- <module>../log</module>
- <module>../eventadmin</module>
- <module>../http.jetty</module>
- <module>../upnp</module>
- <module>../scr</module>
- <module>../configadmin</module>
- <module>../metatype</module>
- <module>../dependencymanager</module>
- <module>../dependencymanager.shell</module>
- <module>../deploymentadmin</module>
- <module>../servicebinder</module>
- <module>../wireadmin</module>
- <module>../prefs</module>
- <module>../webconsole</module>
-
- <module>../ipojo</module>
-
- <module>../mosgi</module>
- <module>../jmood</module>
-
- <module>../examples</module>
- </modules>
- </profile>
-
- <profile>
- <id>packaging-osgi-bundle</id>
- <activation>
- <property>
- <name>packaging</name>
- <value>osgi-bundle</value>
- </property>
- </activation>
- <modules>
- <module>../org.apache.felix.daemon</module>
-
- <!-- <module>tools/mangen</module> -->
-
-
- </modules>
- </profile>
<profile>
<id>release</id>
<build>