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/07/11 20:29:40 UTC
svn commit: r555357 [1/2] - in /felix/trunk: ./ bundleplugin/
bundleplugin/doc/ bundleplugin/doc/maven-bundle-plugin-bnd_files/
bundlerepository/
bundlerepository/doc/apache-felix-osgi-bundle-repository-obr_files/
commons/ configadmin/ dependencymanage...
Author: pauls
Date: Wed Jul 11 11:29:29 2007
New Revision: 555357
URL: http://svn.apache.org/viewvc?view=rev&rev=555357
Log:
Move the parent pom.xml into it's own subproject and fix some minor issues
Added:
felix/trunk/pom/
felix/trunk/pom/pom.xml
- copied, changed from r555256, felix/trunk/pom.xml
Removed:
felix/trunk/bundleplugin/doc/maven-bundle-plugin-bnd_files/print.html
felix/trunk/bundlerepository/doc/apache-felix-osgi-bundle-repository-obr_files/print.css
felix/trunk/org.osgi.core/doc/apache-felix-osgi-core_files/print.css
felix/trunk/pom.xml
felix/trunk/shell.tui/doc/apache-felix-shell-tui_files/print.css
felix/trunk/shell/doc/apache-felix-shell-service_files/print.css
Modified:
felix/trunk/build.xml
felix/trunk/bundleplugin/doc/changelog.txt
felix/trunk/bundleplugin/pom.xml
felix/trunk/bundlerepository/pom.xml
felix/trunk/commons/pom.xml
felix/trunk/configadmin/pom.xml
felix/trunk/dependencymanager/pom.xml
felix/trunk/eventadmin/bridge.configuration/pom.xml
felix/trunk/eventadmin/bridge.upnp/pom.xml
felix/trunk/eventadmin/bridge.useradmin/pom.xml
felix/trunk/eventadmin/bridge.wireadmin/pom.xml
felix/trunk/eventadmin/impl/pom.xml
felix/trunk/eventadmin/pom.xml
felix/trunk/examples/dictionaryclient/pom.xml
felix/trunk/examples/dictionaryclient2/pom.xml
felix/trunk/examples/dictionaryservice.itest/pom.xml
felix/trunk/examples/dictionaryservice/pom.xml
felix/trunk/examples/eventlistener/pom.xml
felix/trunk/examples/frenchdictionary/pom.xml
felix/trunk/examples/pom.xml
felix/trunk/examples/spellcheckbinder/pom.xml
felix/trunk/examples/spellcheckclient/pom.xml
felix/trunk/examples/spellcheckscr/pom.xml
felix/trunk/examples/spellcheckservice/pom.xml
felix/trunk/framework/pom.xml
felix/trunk/http.jetty/pom.xml
felix/trunk/installers/pom.xml
felix/trunk/ipojo/arch/pom.xml
felix/trunk/ipojo/core/pom.xml
felix/trunk/ipojo/manipulator/pom.xml
felix/trunk/ipojo/metadata/pom.xml
felix/trunk/ipojo/plugin/pom.xml
felix/trunk/javax.servlet/pom.xml
felix/trunk/jmood/pom.xml
felix/trunk/jmxintrospector/pom.xml
felix/trunk/log/pom.xml
felix/trunk/main/pom.xml
felix/trunk/metatype/pom.xml
felix/trunk/mishell/pom.xml
felix/trunk/mosgi/console.component/pom.xml
felix/trunk/mosgi/console.gui/pom.xml
felix/trunk/mosgi/console.ifc/pom.xml
felix/trunk/mosgi/jmx.agent/pom.xml
felix/trunk/mosgi/jmx.httpconnector/pom.xml
felix/trunk/mosgi/jmx.registry/pom.xml
felix/trunk/mosgi/jmx.remotelogger/pom.xml
felix/trunk/mosgi/jmx.rmiconnector/pom.xml
felix/trunk/mosgi/managedelements.bundlesprobes.tab/pom.xml
felix/trunk/mosgi/managedelements.bundlesprobes/pom.xml
felix/trunk/mosgi/managedelements.memoryprobe/pom.xml
felix/trunk/mosgi/managedelements.obrprobe.tab/pom.xml
felix/trunk/mosgi/managedelements.obrprobe/pom.xml
felix/trunk/mosgi/managedelements.osgiprobes.tab/pom.xml
felix/trunk/mosgi/managedelements.osgiprobes/pom.xml
felix/trunk/mosgi/pom.xml
felix/trunk/org.apache.felix.daemon/pom.xml
felix/trunk/org.osgi.compendium/pom.xml
felix/trunk/org.osgi.core/pom.xml
felix/trunk/org.osgi.foundation/pom.xml
felix/trunk/scr/pom.xml
felix/trunk/servicebinder/pom.xml
felix/trunk/shell.gui.plugin/pom.xml
felix/trunk/shell.gui/pom.xml
felix/trunk/shell.tui/pom.xml
felix/trunk/shell/pom.xml
felix/trunk/tools/mangen/pom.xml
felix/trunk/tools/maven2/maven-felix-plugin/pom.xml
felix/trunk/tools/maven2/maven-osgi-plugin/pom.xml
felix/trunk/upnp.basedriver/pom.xml
felix/trunk/upnp.extra/pom.xml
felix/trunk/upnp.sample.binaryLight/pom.xml
felix/trunk/upnp.sample.clock/pom.xml
felix/trunk/upnp.sample.tv/pom.xml
felix/trunk/upnp.tester/pom.xml
felix/trunk/wireadmin/pom.xml
Modified: felix/trunk/build.xml
URL: http://svn.apache.org/viewvc/felix/trunk/build.xml?view=diff&rev=555357&r1=555356&r2=555357
==============================================================================
--- felix/trunk/build.xml (original)
+++ felix/trunk/build.xml Wed Jul 11 11:29:29 2007
@@ -16,7 +16,7 @@
specific language governing permissions and limitations
under the License.
-->
-<project default="all">
+<project default="all" basedir="pom">
<target name="init">
<condition property="mvn" value="mvn.bat">
<os family="dos" />
Modified: felix/trunk/bundleplugin/doc/changelog.txt
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/doc/changelog.txt?view=diff&rev=555357&r1=555356&r2=555357
==============================================================================
--- felix/trunk/bundleplugin/doc/changelog.txt (original)
+++ felix/trunk/bundleplugin/doc/changelog.txt Wed Jul 11 11:29:29 2007
@@ -22,3 +22,5 @@
* [2007-06-14] Enable output folder to be configured. (FELIX-305)
* [2007-07-05] Added support for overriding project type. (FELIX-309)
* [2007-07-09] Updated to BND version 0.0.160.
+* [2007-07-11] Fix a possible NullPointerException in the manifest goal. (FELIX-326)
+
Modified: felix/trunk/bundleplugin/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/pom.xml?view=diff&rev=555357&r1=555356&r2=555357
==============================================================================
--- felix/trunk/bundleplugin/pom.xml (original)
+++ felix/trunk/bundleplugin/pom.xml Wed Jul 11 11:29:29 2007
@@ -24,6 +24,7 @@
<artifactId>felix</artifactId>
<groupId>org.apache.felix</groupId>
<version>0.9.0-incubator-SNAPSHOT</version>
+ <relativePath>../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: felix/trunk/bundlerepository/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/bundlerepository/pom.xml?view=diff&rev=555357&r1=555356&r2=555357
==============================================================================
--- felix/trunk/bundlerepository/pom.xml (original)
+++ felix/trunk/bundlerepository/pom.xml Wed Jul 11 11:29:29 2007
@@ -21,6 +21,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
<version>0.9.0-incubator-SNAPSHOT</version>
+ <relativePath>../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>bundle</packaging>
Modified: felix/trunk/commons/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/commons/pom.xml?view=diff&rev=555357&r1=555356&r2=555357
==============================================================================
--- felix/trunk/commons/pom.xml (original)
+++ felix/trunk/commons/pom.xml Wed Jul 11 11:29:29 2007
@@ -25,6 +25,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
<version>0.9.0-incubator-SNAPSHOT</version>
+ <relativePath>../pom/pom.xml</relativePath>
</parent>
<packaging>pom</packaging>
<name>Apache Felix Commons: Build</name>
Modified: felix/trunk/configadmin/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/configadmin/pom.xml?view=diff&rev=555357&r1=555356&r2=555357
==============================================================================
--- felix/trunk/configadmin/pom.xml (original)
+++ felix/trunk/configadmin/pom.xml Wed Jul 11 11:29:29 2007
@@ -23,6 +23,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
<version>0.9.0-incubator-SNAPSHOT</version>
+ <relativePath>../pom/pom.xml</relativePath>
</parent>
<artifactId>org.apache.felix.configadmin</artifactId>
Modified: felix/trunk/dependencymanager/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/pom.xml?view=diff&rev=555357&r1=555356&r2=555357
==============================================================================
--- felix/trunk/dependencymanager/pom.xml (original)
+++ felix/trunk/dependencymanager/pom.xml Wed Jul 11 11:29:29 2007
@@ -22,6 +22,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
<version>0.9.0-incubator-SNAPSHOT</version>
+ <relativePath>../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>bundle</packaging>
Modified: felix/trunk/eventadmin/bridge.configuration/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/eventadmin/bridge.configuration/pom.xml?view=diff&rev=555357&r1=555356&r2=555357
==============================================================================
--- felix/trunk/eventadmin/bridge.configuration/pom.xml (original)
+++ felix/trunk/eventadmin/bridge.configuration/pom.xml Wed Jul 11 11:29:29 2007
@@ -3,6 +3,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
<version>0.9.0-incubator-SNAPSHOT</version>
+ <relativePath>../../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>bundle</packaging>
Modified: felix/trunk/eventadmin/bridge.upnp/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/eventadmin/bridge.upnp/pom.xml?view=diff&rev=555357&r1=555356&r2=555357
==============================================================================
--- felix/trunk/eventadmin/bridge.upnp/pom.xml (original)
+++ felix/trunk/eventadmin/bridge.upnp/pom.xml Wed Jul 11 11:29:29 2007
@@ -3,6 +3,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
<version>0.9.0-incubator-SNAPSHOT</version>
+ <relativePath>../../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>bundle</packaging>
Modified: felix/trunk/eventadmin/bridge.useradmin/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/eventadmin/bridge.useradmin/pom.xml?view=diff&rev=555357&r1=555356&r2=555357
==============================================================================
--- felix/trunk/eventadmin/bridge.useradmin/pom.xml (original)
+++ felix/trunk/eventadmin/bridge.useradmin/pom.xml Wed Jul 11 11:29:29 2007
@@ -3,6 +3,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
<version>0.9.0-incubator-SNAPSHOT</version>
+ <relativePath>../../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>bundle</packaging>
Modified: felix/trunk/eventadmin/bridge.wireadmin/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/eventadmin/bridge.wireadmin/pom.xml?view=diff&rev=555357&r1=555356&r2=555357
==============================================================================
--- felix/trunk/eventadmin/bridge.wireadmin/pom.xml (original)
+++ felix/trunk/eventadmin/bridge.wireadmin/pom.xml Wed Jul 11 11:29:29 2007
@@ -3,6 +3,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
<version>0.9.0-incubator-SNAPSHOT</version>
+ <relativePath>../../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>bundle</packaging>
Modified: felix/trunk/eventadmin/impl/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/eventadmin/impl/pom.xml?view=diff&rev=555357&r1=555356&r2=555357
==============================================================================
--- felix/trunk/eventadmin/impl/pom.xml (original)
+++ felix/trunk/eventadmin/impl/pom.xml Wed Jul 11 11:29:29 2007
@@ -3,6 +3,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
<version>0.9.0-incubator-SNAPSHOT</version>
+ <relativePath>../../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>bundle</packaging>
Modified: felix/trunk/eventadmin/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/eventadmin/pom.xml?view=diff&rev=555357&r1=555356&r2=555357
==============================================================================
--- felix/trunk/eventadmin/pom.xml (original)
+++ felix/trunk/eventadmin/pom.xml Wed Jul 11 11:29:29 2007
@@ -27,6 +27,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
<version>0.9.0-incubator-SNAPSHOT</version>
+<relativePath>../pom/pom.xml</relativePath>
</parent>
<name>Apache Felix EventAdmin Projects</name>
Modified: felix/trunk/examples/dictionaryclient/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/examples/dictionaryclient/pom.xml?view=diff&rev=555357&r1=555356&r2=555357
==============================================================================
--- felix/trunk/examples/dictionaryclient/pom.xml (original)
+++ felix/trunk/examples/dictionaryclient/pom.xml Wed Jul 11 11:29:29 2007
@@ -3,6 +3,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
<version>0.9.0-incubator-SNAPSHOT</version>
+ <relativePath>../../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>osgi-bundle</packaging>
Modified: felix/trunk/examples/dictionaryclient2/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/examples/dictionaryclient2/pom.xml?view=diff&rev=555357&r1=555356&r2=555357
==============================================================================
--- felix/trunk/examples/dictionaryclient2/pom.xml (original)
+++ felix/trunk/examples/dictionaryclient2/pom.xml Wed Jul 11 11:29:29 2007
@@ -3,6 +3,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
<version>0.9.0-incubator-SNAPSHOT</version>
+ <relativePath>../../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>osgi-bundle</packaging>
Modified: felix/trunk/examples/dictionaryservice.itest/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/examples/dictionaryservice.itest/pom.xml?view=diff&rev=555357&r1=555356&r2=555357
==============================================================================
--- felix/trunk/examples/dictionaryservice.itest/pom.xml (original)
+++ felix/trunk/examples/dictionaryservice.itest/pom.xml Wed Jul 11 11:29:29 2007
@@ -3,6 +3,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
<version>0.9.0-incubator-SNAPSHOT</version>
+ <relativePath>../../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>osgi-bundle</packaging>
Modified: felix/trunk/examples/dictionaryservice/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/examples/dictionaryservice/pom.xml?view=diff&rev=555357&r1=555356&r2=555357
==============================================================================
--- felix/trunk/examples/dictionaryservice/pom.xml (original)
+++ felix/trunk/examples/dictionaryservice/pom.xml Wed Jul 11 11:29:29 2007
@@ -3,6 +3,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
<version>0.9.0-incubator-SNAPSHOT</version>
+ <relativePath>../../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>osgi-bundle</packaging>
Modified: felix/trunk/examples/eventlistener/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/examples/eventlistener/pom.xml?view=diff&rev=555357&r1=555356&r2=555357
==============================================================================
--- felix/trunk/examples/eventlistener/pom.xml (original)
+++ felix/trunk/examples/eventlistener/pom.xml Wed Jul 11 11:29:29 2007
@@ -3,6 +3,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
<version>0.9.0-incubator-SNAPSHOT</version>
+ <relativePath>../../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>osgi-bundle</packaging>
Modified: felix/trunk/examples/frenchdictionary/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/examples/frenchdictionary/pom.xml?view=diff&rev=555357&r1=555356&r2=555357
==============================================================================
--- felix/trunk/examples/frenchdictionary/pom.xml (original)
+++ felix/trunk/examples/frenchdictionary/pom.xml Wed Jul 11 11:29:29 2007
@@ -3,6 +3,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
<version>0.9.0-incubator-SNAPSHOT</version>
+ <relativePath>../../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>osgi-bundle</packaging>
Modified: felix/trunk/examples/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/examples/pom.xml?view=diff&rev=555357&r1=555356&r2=555357
==============================================================================
--- felix/trunk/examples/pom.xml (original)
+++ felix/trunk/examples/pom.xml Wed Jul 11 11:29:29 2007
@@ -3,6 +3,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
<version>0.9.0-incubator-SNAPSHOT</version>
+ <relativePath>../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
Modified: felix/trunk/examples/spellcheckbinder/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/examples/spellcheckbinder/pom.xml?view=diff&rev=555357&r1=555356&r2=555357
==============================================================================
--- felix/trunk/examples/spellcheckbinder/pom.xml (original)
+++ felix/trunk/examples/spellcheckbinder/pom.xml Wed Jul 11 11:29:29 2007
@@ -3,6 +3,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
<version>0.9.0-incubator-SNAPSHOT</version>
+ <relativePath>../../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>osgi-bundle</packaging>
Modified: felix/trunk/examples/spellcheckclient/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/examples/spellcheckclient/pom.xml?view=diff&rev=555357&r1=555356&r2=555357
==============================================================================
--- felix/trunk/examples/spellcheckclient/pom.xml (original)
+++ felix/trunk/examples/spellcheckclient/pom.xml Wed Jul 11 11:29:29 2007
@@ -3,6 +3,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
<version>0.9.0-incubator-SNAPSHOT</version>
+ <relativePath>../../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>osgi-bundle</packaging>
Modified: felix/trunk/examples/spellcheckscr/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/examples/spellcheckscr/pom.xml?view=diff&rev=555357&r1=555356&r2=555357
==============================================================================
--- felix/trunk/examples/spellcheckscr/pom.xml (original)
+++ felix/trunk/examples/spellcheckscr/pom.xml Wed Jul 11 11:29:29 2007
@@ -25,6 +25,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
<version>0.9.0-incubator-SNAPSHOT</version>
+ <relativePath>../../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: felix/trunk/examples/spellcheckservice/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/examples/spellcheckservice/pom.xml?view=diff&rev=555357&r1=555356&r2=555357
==============================================================================
--- felix/trunk/examples/spellcheckservice/pom.xml (original)
+++ felix/trunk/examples/spellcheckservice/pom.xml Wed Jul 11 11:29:29 2007
@@ -3,6 +3,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
<version>0.9.0-incubator-SNAPSHOT</version>
+ <relativePath>../../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>osgi-bundle</packaging>
Modified: felix/trunk/framework/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/framework/pom.xml?view=diff&rev=555357&r1=555356&r2=555357
==============================================================================
--- felix/trunk/framework/pom.xml (original)
+++ felix/trunk/framework/pom.xml Wed Jul 11 11:29:29 2007
@@ -21,6 +21,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
<version>0.9.0-incubator-SNAPSHOT</version>
+ <relativePath>../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>bundle</packaging>
Modified: felix/trunk/http.jetty/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/http.jetty/pom.xml?view=diff&rev=555357&r1=555356&r2=555357
==============================================================================
--- felix/trunk/http.jetty/pom.xml (original)
+++ felix/trunk/http.jetty/pom.xml Wed Jul 11 11:29:29 2007
@@ -3,6 +3,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
<version>0.9.0-incubator-SNAPSHOT</version>
+ <relativePath>../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>bundle</packaging>
Modified: felix/trunk/installers/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/installers/pom.xml?view=diff&rev=555357&r1=555356&r2=555357
==============================================================================
--- felix/trunk/installers/pom.xml (original)
+++ felix/trunk/installers/pom.xml Wed Jul 11 11:29:29 2007
@@ -5,6 +5,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
<version>0.9.0-incubator-SNAPSHOT</version>
+ <relativePath>../pom/pom.xml</relativePath>
</parent>
<packaging>jar</packaging>
<name>Apache Felix Installers</name>
Modified: felix/trunk/ipojo/arch/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/arch/pom.xml?view=diff&rev=555357&r1=555356&r2=555357
==============================================================================
--- felix/trunk/ipojo/arch/pom.xml (original)
+++ felix/trunk/ipojo/arch/pom.xml Wed Jul 11 11:29:29 2007
@@ -3,6 +3,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
<version>0.9.0-incubator-SNAPSHOT</version>
+ <relativePath>../../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>bundle</packaging>
Modified: felix/trunk/ipojo/core/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/core/pom.xml?view=diff&rev=555357&r1=555356&r2=555357
==============================================================================
--- felix/trunk/ipojo/core/pom.xml (original)
+++ felix/trunk/ipojo/core/pom.xml Wed Jul 11 11:29:29 2007
@@ -3,6 +3,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
<version>0.9.0-incubator-SNAPSHOT</version>
+ <relativePath>../../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>bundle</packaging>
Modified: felix/trunk/ipojo/manipulator/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/pom.xml?view=diff&rev=555357&r1=555356&r2=555357
==============================================================================
--- felix/trunk/ipojo/manipulator/pom.xml (original)
+++ felix/trunk/ipojo/manipulator/pom.xml Wed Jul 11 11:29:29 2007
@@ -1,60 +1,61 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <groupId>org.apache.felix</groupId>
- <artifactId>felix</artifactId>
- <version>0.9.0-incubator-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <packaging>bundle</packaging>
- <artifactId>org.apache.felix.ipojo.manipulator</artifactId>
- <version>0.7.3-incubator-SNAPSHOT</version>
- <name>Apache Felix iPOJO Manipulator</name>
- <dependencies>
- <dependency>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
- <version>3.0</version>
- </dependency>
- <dependency>
- <groupId>asm</groupId>
- <artifactId>asm-commons</artifactId>
- <version>3.0</version>
- </dependency>
- <!-- to remove -->
- <dependency>
- <groupId>asm</groupId>
- <artifactId>asm-tree</artifactId>
- <version>3.0</version>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>org.apache.felix.ipojo.metadata</artifactId>
- <version>0.7.3-incubator-SNAPSHOT</version>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-Name>iPOJO Manipulator</Bundle-Name>
- <Bundle-Vendor>Clement ESCOFFIER</Bundle-Vendor>
- <Bundle-Description> iPOJO Manipulator </Bundle-Description>
- <Private-Package>
- org.apache.felix.ipojo.manipulation,
- org.apache.felix.ipojo.manipulator,
- org.apache.felix.ipojo.xml.parser,
- org.objectweb.asm,
- org.objectweb.asm.commons,
- org.objectweb.asm.tree <!-- to remove -->
- </Private-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
\ No newline at end of file
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>felix</artifactId>
+ <version>0.9.0-incubator-SNAPSHOT</version>
+ <relativePath>../../pom/pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <packaging>bundle</packaging>
+ <artifactId>org.apache.felix.ipojo.manipulator</artifactId>
+ <version>0.7.3-incubator-SNAPSHOT</version>
+ <name>Apache Felix iPOJO Manipulator</name>
+ <dependencies>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>3.0</version>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm-commons</artifactId>
+ <version>3.0</version>
+ </dependency>
+ <!-- to remove -->
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm-tree</artifactId>
+ <version>3.0</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>org.apache.felix.ipojo.metadata</artifactId>
+ <version>0.7.3-incubator-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-Name>iPOJO Manipulator</Bundle-Name>
+ <Bundle-Vendor>Clement ESCOFFIER</Bundle-Vendor>
+ <Bundle-Description> iPOJO Manipulator </Bundle-Description>
+ <Private-Package>
+ org.apache.felix.ipojo.manipulation,
+ org.apache.felix.ipojo.manipulator,
+ org.apache.felix.ipojo.xml.parser,
+ org.objectweb.asm,
+ org.objectweb.asm.commons,
+ org.objectweb.asm.tree <!-- to remove -->
+ </Private-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Modified: felix/trunk/ipojo/metadata/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/metadata/pom.xml?view=diff&rev=555357&r1=555356&r2=555357
==============================================================================
--- felix/trunk/ipojo/metadata/pom.xml (original)
+++ felix/trunk/ipojo/metadata/pom.xml Wed Jul 11 11:29:29 2007
@@ -3,6 +3,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
<version>0.9.0-incubator-SNAPSHOT</version>
+ <relativePath>../../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>org.apache.felix.ipojo.metadata</artifactId>
Modified: felix/trunk/ipojo/plugin/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/plugin/pom.xml?view=diff&rev=555357&r1=555356&r2=555357
==============================================================================
--- felix/trunk/ipojo/plugin/pom.xml (original)
+++ felix/trunk/ipojo/plugin/pom.xml Wed Jul 11 11:29:29 2007
@@ -3,6 +3,7 @@
<artifactId>felix</artifactId>
<groupId>org.apache.felix</groupId>
<version>0.9.0-incubator-SNAPSHOT</version>
+ <relativePath>../../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>org.apache.felix.ipojo.plugin</artifactId>
Modified: felix/trunk/javax.servlet/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/javax.servlet/pom.xml?view=diff&rev=555357&r1=555356&r2=555357
==============================================================================
--- felix/trunk/javax.servlet/pom.xml (original)
+++ felix/trunk/javax.servlet/pom.xml Wed Jul 11 11:29:29 2007
@@ -3,6 +3,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
<version>0.9.0-incubator-SNAPSHOT</version>
+ <relativePath>../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<name>Servlet 2.1 API</name>
Modified: felix/trunk/jmood/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/jmood/pom.xml?view=diff&rev=555357&r1=555356&r2=555357
==============================================================================
--- felix/trunk/jmood/pom.xml (original)
+++ felix/trunk/jmood/pom.xml Wed Jul 11 11:29:29 2007
@@ -1,90 +1,91 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.apache.felix</groupId>
- <artifactId>felix</artifactId>
- <version>0.9.0-incubator-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <packaging>osgi-bundle</packaging>
- <name>JMood JMX Management Agent</name>
- <artifactId>${groupId}.jmood</artifactId>
- <dependencies>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>org.apache.felix.framework</artifactId>
- <version>${pom.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>${pom.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>${pom.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.apache.felix.plugins</groupId>
- <artifactId>maven-osgi-plugin</artifactId>
- <version>${pom.version}</version>
- <extensions>true</extensions>
- <configuration>
- <osgiManifest >
- <bundleName>${name}</bundleName>
- <bundleActivator>${artifactId}.Activator</bundleActivator>
- <bundleDescription>JMood management agent</bundleDescription>
- <bundleSymbolicName>${artifactId}</bundleSymbolicName>
- <exportPackage>
- <!-- TODO -->
- </exportPackage>
- <!--Automatic resolution includes not available, unused, mx4j stuff-->
- <importPackage>
- org.osgi.framework, org.osgi.util.tracker, org.osgi.service.log, org.osgi.service.packageadmin, org.osgi.service.startlevel, org.osgi.service.permissionadmin, org.osgi.service.useradmin, org.osgi.service.cm, javax.management, javax.management.remote
- </importPackage>
- </osgiManifest>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <!--
- Current tests are (unfinished) integration tests, and need
- to have the bundle available, so there's a chicken-egg problem there. Temporal workaround: omit tests in pom
- -->
-
- <skip>true</skip>
- </configuration>
- </plugin>
-
- </plugins>
- </build>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- </plugin>
- </plugins>
- </reporting>
-</project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>felix</artifactId>
+ <version>0.9.0-incubator-SNAPSHOT</version>
+ <relativePath>../pom/pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <packaging>osgi-bundle</packaging>
+ <name>JMood JMX Management Agent</name>
+ <artifactId>${groupId}.jmood</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>org.apache.felix.framework</artifactId>
+ <version>${pom.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>${pom.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>${pom.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix.plugins</groupId>
+ <artifactId>maven-osgi-plugin</artifactId>
+ <version>${pom.version}</version>
+ <extensions>true</extensions>
+ <configuration>
+ <osgiManifest >
+ <bundleName>${name}</bundleName>
+ <bundleActivator>${artifactId}.Activator</bundleActivator>
+ <bundleDescription>JMood management agent</bundleDescription>
+ <bundleSymbolicName>${artifactId}</bundleSymbolicName>
+ <exportPackage>
+ <!-- TODO -->
+ </exportPackage>
+ <!--Automatic resolution includes not available, unused, mx4j stuff-->
+ <importPackage>
+ org.osgi.framework, org.osgi.util.tracker, org.osgi.service.log, org.osgi.service.packageadmin, org.osgi.service.startlevel, org.osgi.service.permissionadmin, org.osgi.service.useradmin, org.osgi.service.cm, javax.management, javax.management.remote
+ </importPackage>
+ </osgiManifest>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <!--
+ Current tests are (unfinished) integration tests, and need
+ to have the bundle available, so there's a chicken-egg problem there. Temporal workaround: omit tests in pom
+ -->
+
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+
+ </plugins>
+ </build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </reporting>
+</project>
Modified: felix/trunk/jmxintrospector/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/jmxintrospector/pom.xml?view=diff&rev=555357&r1=555356&r2=555357
==============================================================================
--- felix/trunk/jmxintrospector/pom.xml (original)
+++ felix/trunk/jmxintrospector/pom.xml Wed Jul 11 11:29:29 2007
@@ -1,62 +1,63 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.apache.felix</groupId>
- <artifactId>felix</artifactId>
- <version>0.9.0-incubator-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <name>JMXIntrospector</name>
- <packaging>osgi-bundle</packaging>
- <artifactId>${groupId}.jmxintrospector</artifactId>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
- <version>2.1_3</version>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix.plugins</groupId>
- <artifactId>maven-osgi-plugin</artifactId>
- <version>${pom.version}</version>
- <extensions>true</extensions>
- <configuration>
- <inlinedArtifacts>
- <inlinedArtifact>cglib</inlinedArtifact>
- </inlinedArtifacts>
- <osgiManifest>
- <bundleName>${name}</bundleName>
- <bundleSymbolicName>${artifactId}</bundleSymbolicName>
- <exportPackage>
- org.apache.felix.jmxintrospector
- </exportPackage>
- </osgiManifest>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>5</source><!--should fail if not java6-->
- <target>5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>felix</artifactId>
+ <version>0.9.0-incubator-SNAPSHOT</version>
+ <relativePath>../pom/pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <name>JMXIntrospector</name>
+ <packaging>osgi-bundle</packaging>
+ <artifactId>${groupId}.jmxintrospector</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ <version>2.1_3</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix.plugins</groupId>
+ <artifactId>maven-osgi-plugin</artifactId>
+ <version>${pom.version}</version>
+ <extensions>true</extensions>
+ <configuration>
+ <inlinedArtifacts>
+ <inlinedArtifact>cglib</inlinedArtifact>
+ </inlinedArtifacts>
+ <osgiManifest>
+ <bundleName>${name}</bundleName>
+ <bundleSymbolicName>${artifactId}</bundleSymbolicName>
+ <exportPackage>
+ org.apache.felix.jmxintrospector
+ </exportPackage>
+ </osgiManifest>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>5</source><!--should fail if not java6-->
+ <target>5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Modified: felix/trunk/log/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/log/pom.xml?view=diff&rev=555357&r1=555356&r2=555357
==============================================================================
--- felix/trunk/log/pom.xml (original)
+++ felix/trunk/log/pom.xml Wed Jul 11 11:29:29 2007
@@ -3,6 +3,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
<version>0.9.0-incubator-SNAPSHOT</version>
+ <relativePath>../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>bundle</packaging>
Modified: felix/trunk/main/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/main/pom.xml?view=diff&rev=555357&r1=555356&r2=555357
==============================================================================
--- felix/trunk/main/pom.xml (original)
+++ felix/trunk/main/pom.xml Wed Jul 11 11:29:29 2007
@@ -21,6 +21,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
<version>0.9.0-incubator-SNAPSHOT</version>
+ <relativePath>../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>bundle</packaging>
Modified: felix/trunk/metatype/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/metatype/pom.xml?view=diff&rev=555357&r1=555356&r2=555357
==============================================================================
--- felix/trunk/metatype/pom.xml (original)
+++ felix/trunk/metatype/pom.xml Wed Jul 11 11:29:29 2007
@@ -5,6 +5,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
<version>0.9.0-incubator-SNAPSHOT</version>
+ <relativePath>../pom/pom.xml</relativePath>
</parent>
<artifactId>org.apache.felix.metatype</artifactId>
Modified: felix/trunk/mishell/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/mishell/pom.xml?view=diff&rev=555357&r1=555356&r2=555357
==============================================================================
--- felix/trunk/mishell/pom.xml (original)
+++ felix/trunk/mishell/pom.xml Wed Jul 11 11:29:29 2007
@@ -1,93 +1,94 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-<parent>
- <groupId>org.apache.felix</groupId>
- <artifactId>felix</artifactId>
- <version>0.9.0-incubator-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <name>Management Interactive Shell</name>
- <packaging>osgi-bundle</packaging>
- <artifactId>${groupId}.mishell</artifactId>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>${groupId}.jmxintrospector</artifactId>
- <version>${pom.version}</version>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>${pom.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>${pom.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>org.apache.felix.framework</artifactId>
- <version>${pom.version}</version>
- <scope>provided</scope>
- </dependency>
-
- </dependencies>
- <build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.apache.felix.plugins</groupId>
- <artifactId>maven-osgi-plugin</artifactId>
- <version>${pom.version}</version>
- <extensions>true</extensions>
- <configuration>
- <!--
- We're inlining a lot here. This is nasty for a bundle, nice for an executable jar.
- It should be simple to change afterwards
- -->
- <inlinedArtifacts>
- <inlinedArtifact>org.apache.felix.jmxintrospector</inlinedArtifact>
- </inlinedArtifacts>
- <osgiManifest>
- <bundleActivator>${artifactId}.Activator</bundleActivator>
- <bundleName>${name}</bundleName>
- <bundleDescription>Management Interactive Shell</bundleDescription>
- <bundleSymbolicName>${artifactId}</bundleSymbolicName>
- <dynamicImportPackage>
- *
- </dynamicImportPackage>
- <importPackage>
- <!--Note that we explicitly do not import jmood classes as they we use
- dynamically generated interfaces and proxies instead-->
- org.osgi.framework, javax.management, javax.management.remote, javax.script
- </importPackage>
-
- </osgiManifest>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source><!--should fail if not java6-->
- <target>1.6</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<parent>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>felix</artifactId>
+ <version>0.9.0-incubator-SNAPSHOT</version>
+ <relativePath>../pom/pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <name>Management Interactive Shell</name>
+ <packaging>osgi-bundle</packaging>
+ <artifactId>${groupId}.mishell</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>${groupId}.jmxintrospector</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>${pom.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>${pom.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>org.apache.felix.framework</artifactId>
+ <version>${pom.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ </dependencies>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix.plugins</groupId>
+ <artifactId>maven-osgi-plugin</artifactId>
+ <version>${pom.version}</version>
+ <extensions>true</extensions>
+ <configuration>
+ <!--
+ We're inlining a lot here. This is nasty for a bundle, nice for an executable jar.
+ It should be simple to change afterwards
+ -->
+ <inlinedArtifacts>
+ <inlinedArtifact>org.apache.felix.jmxintrospector</inlinedArtifact>
+ </inlinedArtifacts>
+ <osgiManifest>
+ <bundleActivator>${artifactId}.Activator</bundleActivator>
+ <bundleName>${name}</bundleName>
+ <bundleDescription>Management Interactive Shell</bundleDescription>
+ <bundleSymbolicName>${artifactId}</bundleSymbolicName>
+ <dynamicImportPackage>
+ *
+ </dynamicImportPackage>
+ <importPackage>
+ <!--Note that we explicitly do not import jmood classes as they we use
+ dynamically generated interfaces and proxies instead-->
+ org.osgi.framework, javax.management, javax.management.remote, javax.script
+ </importPackage>
+
+ </osgiManifest>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.6</source><!--should fail if not java6-->
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Modified: felix/trunk/mosgi/console.component/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/mosgi/console.component/pom.xml?view=diff&rev=555357&r1=555356&r2=555357
==============================================================================
--- felix/trunk/mosgi/console.component/pom.xml (original)
+++ felix/trunk/mosgi/console.component/pom.xml Wed Jul 11 11:29:29 2007
@@ -4,6 +4,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
<version>0.9.0-incubator-SNAPSHOT</version>
+ <relativePath>../../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: felix/trunk/mosgi/console.gui/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/mosgi/console.gui/pom.xml?view=diff&rev=555357&r1=555356&r2=555357
==============================================================================
--- felix/trunk/mosgi/console.gui/pom.xml (original)
+++ felix/trunk/mosgi/console.gui/pom.xml Wed Jul 11 11:29:29 2007
@@ -4,6 +4,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
<version>0.9.0-incubator-SNAPSHOT</version>
+ <relativePath>../../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: felix/trunk/mosgi/console.ifc/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/mosgi/console.ifc/pom.xml?view=diff&rev=555357&r1=555356&r2=555357
==============================================================================
--- felix/trunk/mosgi/console.ifc/pom.xml (original)
+++ felix/trunk/mosgi/console.ifc/pom.xml Wed Jul 11 11:29:29 2007
@@ -4,6 +4,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
<version>0.9.0-incubator-SNAPSHOT</version>
+ <relativePath>../../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: felix/trunk/mosgi/jmx.agent/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/mosgi/jmx.agent/pom.xml?view=diff&rev=555357&r1=555356&r2=555357
==============================================================================
--- felix/trunk/mosgi/jmx.agent/pom.xml (original)
+++ felix/trunk/mosgi/jmx.agent/pom.xml Wed Jul 11 11:29:29 2007
@@ -4,6 +4,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
<version>0.9.0-incubator-SNAPSHOT</version>
+ <relativePath>../../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: felix/trunk/mosgi/jmx.httpconnector/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/mosgi/jmx.httpconnector/pom.xml?view=diff&rev=555357&r1=555356&r2=555357
==============================================================================
--- felix/trunk/mosgi/jmx.httpconnector/pom.xml (original)
+++ felix/trunk/mosgi/jmx.httpconnector/pom.xml Wed Jul 11 11:29:29 2007
@@ -4,6 +4,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
<version>0.9.0-incubator-SNAPSHOT</version>
+ <relativePath>../../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: felix/trunk/mosgi/jmx.registry/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/mosgi/jmx.registry/pom.xml?view=diff&rev=555357&r1=555356&r2=555357
==============================================================================
--- felix/trunk/mosgi/jmx.registry/pom.xml (original)
+++ felix/trunk/mosgi/jmx.registry/pom.xml Wed Jul 11 11:29:29 2007
@@ -4,6 +4,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
<version>0.9.0-incubator-SNAPSHOT</version>
+ <relativePath>../../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: felix/trunk/mosgi/jmx.remotelogger/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/mosgi/jmx.remotelogger/pom.xml?view=diff&rev=555357&r1=555356&r2=555357
==============================================================================
--- felix/trunk/mosgi/jmx.remotelogger/pom.xml (original)
+++ felix/trunk/mosgi/jmx.remotelogger/pom.xml Wed Jul 11 11:29:29 2007
@@ -4,6 +4,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
<version>0.9.0-incubator-SNAPSHOT</version>
+ <relativePath>../../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: felix/trunk/mosgi/jmx.rmiconnector/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/mosgi/jmx.rmiconnector/pom.xml?view=diff&rev=555357&r1=555356&r2=555357
==============================================================================
--- felix/trunk/mosgi/jmx.rmiconnector/pom.xml (original)
+++ felix/trunk/mosgi/jmx.rmiconnector/pom.xml Wed Jul 11 11:29:29 2007
@@ -4,6 +4,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
<version>0.9.0-incubator-SNAPSHOT</version>
+ <relativePath>../../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: felix/trunk/mosgi/managedelements.bundlesprobes.tab/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/mosgi/managedelements.bundlesprobes.tab/pom.xml?view=diff&rev=555357&r1=555356&r2=555357
==============================================================================
--- felix/trunk/mosgi/managedelements.bundlesprobes.tab/pom.xml (original)
+++ felix/trunk/mosgi/managedelements.bundlesprobes.tab/pom.xml Wed Jul 11 11:29:29 2007
@@ -4,6 +4,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
<version>0.9.0-incubator-SNAPSHOT</version>
+ <relativePath>../../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: felix/trunk/mosgi/managedelements.bundlesprobes/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/mosgi/managedelements.bundlesprobes/pom.xml?view=diff&rev=555357&r1=555356&r2=555357
==============================================================================
--- felix/trunk/mosgi/managedelements.bundlesprobes/pom.xml (original)
+++ felix/trunk/mosgi/managedelements.bundlesprobes/pom.xml Wed Jul 11 11:29:29 2007
@@ -4,6 +4,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
<version>0.9.0-incubator-SNAPSHOT</version>
+ <relativePath>../../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: felix/trunk/mosgi/managedelements.memoryprobe/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/mosgi/managedelements.memoryprobe/pom.xml?view=diff&rev=555357&r1=555356&r2=555357
==============================================================================
--- felix/trunk/mosgi/managedelements.memoryprobe/pom.xml (original)
+++ felix/trunk/mosgi/managedelements.memoryprobe/pom.xml Wed Jul 11 11:29:29 2007
@@ -4,6 +4,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
<version>0.9.0-incubator-SNAPSHOT</version>
+ <relativePath>../../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: felix/trunk/mosgi/managedelements.obrprobe.tab/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/mosgi/managedelements.obrprobe.tab/pom.xml?view=diff&rev=555357&r1=555356&r2=555357
==============================================================================
--- felix/trunk/mosgi/managedelements.obrprobe.tab/pom.xml (original)
+++ felix/trunk/mosgi/managedelements.obrprobe.tab/pom.xml Wed Jul 11 11:29:29 2007
@@ -4,6 +4,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
<version>0.9.0-incubator-SNAPSHOT</version>
+ <relativePath>../../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: felix/trunk/mosgi/managedelements.obrprobe/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/mosgi/managedelements.obrprobe/pom.xml?view=diff&rev=555357&r1=555356&r2=555357
==============================================================================
--- felix/trunk/mosgi/managedelements.obrprobe/pom.xml (original)
+++ felix/trunk/mosgi/managedelements.obrprobe/pom.xml Wed Jul 11 11:29:29 2007
@@ -4,6 +4,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
<version>0.9.0-incubator-SNAPSHOT</version>
+ <relativePath>../../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: felix/trunk/mosgi/managedelements.osgiprobes.tab/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/mosgi/managedelements.osgiprobes.tab/pom.xml?view=diff&rev=555357&r1=555356&r2=555357
==============================================================================
--- felix/trunk/mosgi/managedelements.osgiprobes.tab/pom.xml (original)
+++ felix/trunk/mosgi/managedelements.osgiprobes.tab/pom.xml Wed Jul 11 11:29:29 2007
@@ -4,6 +4,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
<version>0.9.0-incubator-SNAPSHOT</version>
+ <relativePath>../../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: felix/trunk/mosgi/managedelements.osgiprobes/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/mosgi/managedelements.osgiprobes/pom.xml?view=diff&rev=555357&r1=555356&r2=555357
==============================================================================
--- felix/trunk/mosgi/managedelements.osgiprobes/pom.xml (original)
+++ felix/trunk/mosgi/managedelements.osgiprobes/pom.xml Wed Jul 11 11:29:29 2007
@@ -4,6 +4,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
<version>0.9.0-incubator-SNAPSHOT</version>
+ <relativePath>../../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: felix/trunk/mosgi/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/mosgi/pom.xml?view=diff&rev=555357&r1=555356&r2=555357
==============================================================================
--- felix/trunk/mosgi/pom.xml (original)
+++ felix/trunk/mosgi/pom.xml Wed Jul 11 11:29:29 2007
@@ -4,6 +4,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
<version>0.9.0-incubator-SNAPSHOT</version>
+ <relativePath>../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: felix/trunk/org.apache.felix.daemon/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/org.apache.felix.daemon/pom.xml?view=diff&rev=555357&r1=555356&r2=555357
==============================================================================
--- felix/trunk/org.apache.felix.daemon/pom.xml (original)
+++ felix/trunk/org.apache.felix.daemon/pom.xml Wed Jul 11 11:29:29 2007
@@ -3,6 +3,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
<version>0.9.0-incubator-SNAPSHOT</version>
+ <relativePath>../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
Modified: felix/trunk/org.osgi.compendium/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/org.osgi.compendium/pom.xml?view=diff&rev=555357&r1=555356&r2=555357
==============================================================================
--- felix/trunk/org.osgi.compendium/pom.xml (original)
+++ felix/trunk/org.osgi.compendium/pom.xml Wed Jul 11 11:29:29 2007
@@ -20,6 +20,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
<version>0.9.0-incubator-SNAPSHOT</version>
+ <relativePath>../pom/pom.xml</relativePath>
</parent>
<organization>
<name>OSGi Alliance</name>
Modified: felix/trunk/org.osgi.core/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/org.osgi.core/pom.xml?view=diff&rev=555357&r1=555356&r2=555357
==============================================================================
--- felix/trunk/org.osgi.core/pom.xml (original)
+++ felix/trunk/org.osgi.core/pom.xml Wed Jul 11 11:29:29 2007
@@ -21,6 +21,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
<version>0.9.0-incubator-SNAPSHOT</version>
+ <relativePath>../pom/pom.xml</relativePath>
</parent>
<organization>
<name>OSGi Alliance</name>
Modified: felix/trunk/org.osgi.foundation/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/org.osgi.foundation/pom.xml?view=diff&rev=555357&r1=555356&r2=555357
==============================================================================
--- felix/trunk/org.osgi.foundation/pom.xml (original)
+++ felix/trunk/org.osgi.foundation/pom.xml Wed Jul 11 11:29:29 2007
@@ -20,6 +20,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
<version>0.9.0-incubator-SNAPSHOT</version>
+ <relativePath>../pom/pom.xml</relativePath>
</parent>
<organization>
<name>OSGi Alliance</name>
Copied: felix/trunk/pom/pom.xml (from r555256, felix/trunk/pom.xml)
URL: http://svn.apache.org/viewvc/felix/trunk/pom/pom.xml?view=diff&rev=555357&p1=felix/trunk/pom.xml&r1=555256&p2=felix/trunk/pom/pom.xml&r2=555357
==============================================================================
--- felix/trunk/pom.xml (original)
+++ felix/trunk/pom/pom.xml Wed Jul 11 11:29:29 2007
@@ -33,6 +33,7 @@
<name>Apache Felix</name>
<version>0.9.0-incubator-SNAPSHOT</version>
<url>http://felix.apache.org/</url>
+ <inceptionYear>2006</inceptionYear>
<description>Apache felix is an OSGi implementation.</description>
<issueManagement>
@@ -95,11 +96,11 @@
</property>
</activation>
<modules>
- <module>bundleplugin</module>
- <module>tools/maven2/maven-osgi-plugin</module>
- <module>ipojo/metadata</module>
- <module>ipojo/manipulator</module>
- <module>ipojo/plugin</module>
+ <module>../bundleplugin</module>
+ <module>../tools/maven2/maven-osgi-plugin</module>
+ <module>../ipojo/metadata</module>
+ <module>../ipojo/manipulator</module>
+ <module>../ipojo/plugin</module>
</modules>
</profile>
@@ -125,31 +126,31 @@
</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>bundlerepository</module>
- <module>log</module>
- <module>eventadmin</module>
- <module>http.jetty</module>
- <module>scr</module>
- <module>configadmin</module>
- <module>metatype</module>
- <module>dependencymanager</module>
- <module>servicebinder</module>
- <module>wireadmin</module>
+ <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>../bundlerepository</module>
+ <module>../log</module>
+ <module>../eventadmin</module>
+ <module>../http.jetty</module>
+ <module>../scr</module>
+ <module>../configadmin</module>
+ <module>../metatype</module>
+ <module>../dependencymanager</module>
+ <module>../servicebinder</module>
+ <module>../wireadmin</module>
- <module>ipojo/core</module>
- <module>ipojo/arch</module>
+ <module>../ipojo/core</module>
+ <module>../ipojo/arch</module>
- <module>mosgi</module>
+ <module>../mosgi</module>
</modules>
</profile>
@@ -162,16 +163,16 @@
</property>
</activation>
<modules>
- <module>org.apache.felix.daemon</module>
+ <module>../org.apache.felix.daemon</module>
- <module>examples</module>
+ <module>../examples</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>../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>tools/mangen</module> -->
@@ -327,6 +328,11 @@
<artifactId>maven-bundle-plugin</artifactId>
<version>0.9.0-incubator-SNAPSHOT</version>
</plugin>
+<!-- <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <version>1.0-alpha-5</version>
+ </plugin> -->
</plugins>
</pluginManagement>
<plugins>
@@ -345,6 +351,23 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
</plugin -->
+ <!-- We want to package up license resources in the JARs produced
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <resourceBundles>
+ <resourceBundle>org.apache:apache-jar-resource-bundle:1.0</resourceBundle>
+ </resourceBundles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>-->
</plugins>
</build>
<reporting>
Modified: felix/trunk/scr/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/scr/pom.xml?view=diff&rev=555357&r1=555356&r2=555357
==============================================================================
--- felix/trunk/scr/pom.xml (original)
+++ felix/trunk/scr/pom.xml Wed Jul 11 11:29:29 2007
@@ -1,65 +1,66 @@
-<project>
- <parent>
- <groupId>org.apache.felix</groupId>
- <artifactId>felix</artifactId>
- <version>0.9.0-incubator-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <packaging>bundle</packaging>
- <name>Apache Felix Declarative Services</name>
- <description>
- Implementation of the Declarative Services specification 1.0
- </description>
- <artifactId>org.apache.felix.scr</artifactId>
- <dependencies>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>${pom.version}</version>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>${pom.version}</version>
- </dependency>
- <dependency>
- <groupId>net.sf.kxml</groupId>
- <artifactId>kxml2</artifactId>
- <version>2.2.2</version>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>0.9.0-incubator-SNAPSHOT</version>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>
- ${artifactId}
- </Bundle-SymbolicName>
- <Bundle-Vendor>
- Apache Software Foundation
- </Bundle-Vendor>
- <Bundle-Activator>
- org.apache.felix.scr.Activator
- </Bundle-Activator>
- <Export-Package>
- org.osgi.service.cm, org.osgi.service.component
- </Export-Package>
- <Private-Package>
- org.apache.felix.scr.*, org.kxml2.io,
- org.osgi.util.tracker,
- org.xmlpull.v1
- </Private-Package>
- <DynamicImport-Package>
- org.osgi.service.log
- </DynamicImport-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
+<project>
+ <parent>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>felix</artifactId>
+ <version>0.9.0-incubator-SNAPSHOT</version>
+ <relativePath>../pom/pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <packaging>bundle</packaging>
+ <name>Apache Felix Declarative Services</name>
+ <description>
+ Implementation of the Declarative Services specification 1.0
+ </description>
+ <artifactId>org.apache.felix.scr</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.kxml</groupId>
+ <artifactId>kxml2</artifactId>
+ <version>2.2.2</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>0.9.0-incubator-SNAPSHOT</version>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>
+ ${artifactId}
+ </Bundle-SymbolicName>
+ <Bundle-Vendor>
+ Apache Software Foundation
+ </Bundle-Vendor>
+ <Bundle-Activator>
+ org.apache.felix.scr.Activator
+ </Bundle-Activator>
+ <Export-Package>
+ org.osgi.service.cm, org.osgi.service.component
+ </Export-Package>
+ <Private-Package>
+ org.apache.felix.scr.*, org.kxml2.io,
+ org.osgi.util.tracker,
+ org.xmlpull.v1
+ </Private-Package>
+ <DynamicImport-Package>
+ org.osgi.service.log
+ </DynamicImport-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Modified: felix/trunk/servicebinder/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/servicebinder/pom.xml?view=diff&rev=555357&r1=555356&r2=555357
==============================================================================
--- felix/trunk/servicebinder/pom.xml (original)
+++ felix/trunk/servicebinder/pom.xml Wed Jul 11 11:29:29 2007
@@ -3,6 +3,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
<version>0.9.0-incubator-SNAPSHOT</version>
+ <relativePath>../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>bundle</packaging>
Modified: felix/trunk/shell.gui.plugin/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/shell.gui.plugin/pom.xml?view=diff&rev=555357&r1=555356&r2=555357
==============================================================================
--- felix/trunk/shell.gui.plugin/pom.xml (original)
+++ felix/trunk/shell.gui.plugin/pom.xml Wed Jul 11 11:29:29 2007
@@ -3,6 +3,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
<version>0.9.0-incubator-SNAPSHOT</version>
+ <relativePath>../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>bundle</packaging>
Modified: felix/trunk/shell.gui/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/shell.gui/pom.xml?view=diff&rev=555357&r1=555356&r2=555357
==============================================================================
--- felix/trunk/shell.gui/pom.xml (original)
+++ felix/trunk/shell.gui/pom.xml Wed Jul 11 11:29:29 2007
@@ -3,6 +3,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
<version>0.9.0-incubator-SNAPSHOT</version>
+ <relativePath>../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>bundle</packaging>
Modified: felix/trunk/shell.tui/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/shell.tui/pom.xml?view=diff&rev=555357&r1=555356&r2=555357
==============================================================================
--- felix/trunk/shell.tui/pom.xml (original)
+++ felix/trunk/shell.tui/pom.xml Wed Jul 11 11:29:29 2007
@@ -21,6 +21,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
<version>0.9.0-incubator-SNAPSHOT</version>
+ <relativePath>../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>bundle</packaging>
Modified: felix/trunk/shell/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/shell/pom.xml?view=diff&rev=555357&r1=555356&r2=555357
==============================================================================
--- felix/trunk/shell/pom.xml (original)
+++ felix/trunk/shell/pom.xml Wed Jul 11 11:29:29 2007
@@ -21,6 +21,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
<version>0.9.0-incubator-SNAPSHOT</version>
+ <relativePath>../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>bundle</packaging>
Modified: felix/trunk/tools/mangen/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/tools/mangen/pom.xml?view=diff&rev=555357&r1=555356&r2=555357
==============================================================================
--- felix/trunk/tools/mangen/pom.xml (original)
+++ felix/trunk/tools/mangen/pom.xml Wed Jul 11 11:29:29 2007
@@ -1,57 +1,58 @@
-<project>
- <parent>
- <groupId>org.apache.felix</groupId>
- <artifactId>felix</artifactId>
- <version>0.9.0-incubator-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <packaging>jar</packaging>
- <name>Apache Felix Bundle Manifest Generator (mangen)</name>
- <artifactId>org.apache.felix.tool.mangen</artifactId>
- <version>1.0.1</version>
- <dependencies>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>org.apache.felix.framework</artifactId>
- <version>0.9.0-incubator-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>0.9.0-incubator-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
- <version>2.2.1</version>
- </dependency>
- <dependency>
- <groupId>bcel</groupId>
- <artifactId>bcel</artifactId>
- <version>5.1</version>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <mainClass>org.apache.felix.tool.mangen.MangenMain</mainClass>
- <addClasspath>true</addClasspath>
- </manifest>
- <manifestEntries/>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
- </build>
-</project>
+<project>
+ <parent>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>felix</artifactId>
+ <version>0.9.0-incubator-SNAPSHOT</version>
+ <relativePath>../../pom/pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <packaging>jar</packaging>
+ <name>Apache Felix Bundle Manifest Generator (mangen)</name>
+ <artifactId>org.apache.felix.tool.mangen</artifactId>
+ <version>1.0.1</version>
+ <dependencies>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>org.apache.felix.framework</artifactId>
+ <version>0.9.0-incubator-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>0.9.0-incubator-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>2.2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>bcel</groupId>
+ <artifactId>bcel</artifactId>
+ <version>5.1</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <mainClass>org.apache.felix.tool.mangen.MangenMain</mainClass>
+ <addClasspath>true</addClasspath>
+ </manifest>
+ <manifestEntries/>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ </build>
+</project>
Modified: felix/trunk/tools/maven2/maven-felix-plugin/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/tools/maven2/maven-felix-plugin/pom.xml?view=diff&rev=555357&r1=555356&r2=555357
==============================================================================
--- felix/trunk/tools/maven2/maven-felix-plugin/pom.xml (original)
+++ felix/trunk/tools/maven2/maven-felix-plugin/pom.xml Wed Jul 11 11:29:29 2007
@@ -4,6 +4,7 @@
<artifactId>felix</artifactId>
<groupId>org.apache.felix</groupId>
<version>0.9.0-incubator-SNAPSHOT</version>
+ <relativePath>../../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.felix.plugins</groupId>
Modified: felix/trunk/tools/maven2/maven-osgi-plugin/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/tools/maven2/maven-osgi-plugin/pom.xml?view=diff&rev=555357&r1=555356&r2=555357
==============================================================================
--- felix/trunk/tools/maven2/maven-osgi-plugin/pom.xml (original)
+++ felix/trunk/tools/maven2/maven-osgi-plugin/pom.xml Wed Jul 11 11:29:29 2007
@@ -21,6 +21,7 @@
<artifactId>felix</artifactId>
<groupId>org.apache.felix</groupId>
<version>0.9.0-incubator-SNAPSHOT</version>
+ <relativePath>../../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.felix.plugins</groupId>
Modified: felix/trunk/upnp.basedriver/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/upnp.basedriver/pom.xml?view=diff&rev=555357&r1=555356&r2=555357
==============================================================================
--- felix/trunk/upnp.basedriver/pom.xml (original)
+++ felix/trunk/upnp.basedriver/pom.xml Wed Jul 11 11:29:29 2007
@@ -1,76 +1,77 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.apache.felix</groupId>
- <artifactId>felix</artifactId>
- <version>0.9.0-incubator-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <packaging>osgi-bundle</packaging>
- <groupId>org.apache.felix</groupId>
- <name>Apache Felix UPnP Base Driver</name>
- <artifactId>org.apache.felix.upnp.basedriver</artifactId>
- <version>0.1.0-incubator-SNAPSHOT</version>
- <repositories>
- <!-- For snapshots (no release jars or non-apache jars) -->
- <repository>
- <id>domoware.isti.cnr.it</id>
- <name>DomoWare Repository for Missing Artifacts</name>
- <url>http://domoware.isti.cnr.it/maven2</url>
- </repository>
- </repositories> <!-- <url>http://maven.apache.org</url> -->
- <dependencies>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>0.9.0-incubator-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>0.9.0-incubator-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.upnp.extra</artifactId>
- <version>0.1.0-incubator-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org-cybergarage</groupId>
- <artifactId>cyberlink-upnp-patched</artifactId>
- <version>1.7.2</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix.plugins</groupId>
- <artifactId>maven-osgi-plugin</artifactId>
- <!-- <version>${pom.version}</version> -->
- <extensions>true</extensions>
- <configuration>
- <osgiManifest>
- <bundleName>UPnPBaseDriver</bundleName>
- <bundleVendor>Apache Software Foundation</bundleVendor>
- <bundleVersion>0.1.0</bundleVersion>
- <bundleDescription>
- A Bundle implementation of the UPnP Service Specification R4
- </bundleDescription>
- <bundleSymbolicName>org.apache.felix.upnp.basedriver</bundleSymbolicName>
- <bundleActivator>org.apache.felix.upnp.basedriver.Activator</bundleActivator>
- </osgiManifest>
- <manifestFile>src/main/resources/release/META-INF/Manifest.mf</manifestFile>
- </configuration>
- </plugin>
- </plugins>
- <resources>
- <resource>
- <directory>src/main/resources/release</directory>
- </resource>
- </resources>
- </build>
-</project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>felix</artifactId>
+ <version>0.9.0-incubator-SNAPSHOT</version>
+ <relativePath>../pom/pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <packaging>osgi-bundle</packaging>
+ <groupId>org.apache.felix</groupId>
+ <name>Apache Felix UPnP Base Driver</name>
+ <artifactId>org.apache.felix.upnp.basedriver</artifactId>
+ <version>0.1.0-incubator-SNAPSHOT</version>
+ <repositories>
+ <!-- For snapshots (no release jars or non-apache jars) -->
+ <repository>
+ <id>domoware.isti.cnr.it</id>
+ <name>DomoWare Repository for Missing Artifacts</name>
+ <url>http://domoware.isti.cnr.it/maven2</url>
+ </repository>
+ </repositories> <!-- <url>http://maven.apache.org</url> -->
+ <dependencies>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>0.9.0-incubator-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>0.9.0-incubator-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.upnp.extra</artifactId>
+ <version>0.1.0-incubator-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org-cybergarage</groupId>
+ <artifactId>cyberlink-upnp-patched</artifactId>
+ <version>1.7.2</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix.plugins</groupId>
+ <artifactId>maven-osgi-plugin</artifactId>
+ <!-- <version>${pom.version}</version> -->
+ <extensions>true</extensions>
+ <configuration>
+ <osgiManifest>
+ <bundleName>UPnPBaseDriver</bundleName>
+ <bundleVendor>Apache Software Foundation</bundleVendor>
+ <bundleVersion>0.1.0</bundleVersion>
+ <bundleDescription>
+ A Bundle implementation of the UPnP Service Specification R4
+ </bundleDescription>
+ <bundleSymbolicName>org.apache.felix.upnp.basedriver</bundleSymbolicName>
+ <bundleActivator>org.apache.felix.upnp.basedriver.Activator</bundleActivator>
+ </osgiManifest>
+ <manifestFile>src/main/resources/release/META-INF/Manifest.mf</manifestFile>
+ </configuration>
+ </plugin>
+ </plugins>
+ <resources>
+ <resource>
+ <directory>src/main/resources/release</directory>
+ </resource>
+ </resources>
+ </build>
+</project>