incubator-ace-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject svn commit: r1073691 - in /incubator/ace/trunk: ace-client-automation/ ace-client-repository-api/ ace-client-repository-helper-base/ ace-client-repository-helper-bundle/ ace-client-repository-helper-configuration/ ace-client-repository-helper-user/ ace...
Date Wed, 23 Feb 2011 10:51:13 GMT
Author: jbonofre
Date: Wed Feb 23 10:51:11 2011
New Revision: 1073691

URL: http://svn.apache.org/viewvc?rev=1073691&view=rev
Log:
[ACE-119] Proper plugin management and version dependencies.

Modified:
    incubator/ace/trunk/ace-client-automation/pom.xml
    incubator/ace/trunk/ace-client-repository-api/pom.xml
    incubator/ace/trunk/ace-client-repository-helper-base/pom.xml
    incubator/ace/trunk/ace-client-repository-helper-bundle/pom.xml
    incubator/ace/trunk/ace-client-repository-helper-configuration/pom.xml
    incubator/ace/trunk/ace-client-repository-helper-user/pom.xml
    incubator/ace/trunk/ace-client-repository-impl/pom.xml
    incubator/ace/trunk/ace-client-repository-useradmin/pom.xml
    incubator/ace/trunk/ace-configurator-serveruseradmin/pom.xml
    incubator/ace/trunk/ace-configurator-useradmin-task/pom.xml
    incubator/ace/trunk/ace-configurator/pom.xml
    incubator/ace/trunk/ace-consolelogger/pom.xml
    incubator/ace/trunk/ace-deployment-api/pom.xml
    incubator/ace/trunk/ace-deployment-deploymentadmin/pom.xml
    incubator/ace/trunk/ace-deployment-provider-api/pom.xml
    incubator/ace/trunk/ace-deployment-provider-base/pom.xml
    incubator/ace/trunk/ace-deployment-provider-filebased/pom.xml
    incubator/ace/trunk/ace-deployment-provider-repositorybased/pom.xml
    incubator/ace/trunk/ace-deployment-servlet/pom.xml
    incubator/ace/trunk/ace-deployment-streamgenerator/pom.xml
    incubator/ace/trunk/ace-deployment-task/pom.xml
    incubator/ace/trunk/ace-discovery-api/pom.xml
    incubator/ace/trunk/ace-discovery-property/pom.xml
    incubator/ace/trunk/ace-discovery-upnp/pom.xml
    incubator/ace/trunk/ace-gateway-log-store/pom.xml
    incubator/ace/trunk/ace-gateway-log/pom.xml
    incubator/ace/trunk/ace-httplistener/pom.xml
    incubator/ace/trunk/ace-identification-api/pom.xml
    incubator/ace/trunk/ace-identification-ifconfig/pom.xml
    incubator/ace/trunk/ace-identification-property/pom.xml
    incubator/ace/trunk/ace-integrationtests/pom.xml
    incubator/ace/trunk/ace-launcher/pom.xml
    incubator/ace/trunk/ace-location-upnp/pom.xml
    incubator/ace/trunk/ace-log-listener/pom.xml
    incubator/ace/trunk/ace-log-servlet/pom.xml
    incubator/ace/trunk/ace-log-task/pom.xml
    incubator/ace/trunk/ace-log/pom.xml
    incubator/ace/trunk/ace-managementagent/pom.xml
    incubator/ace/trunk/ace-obr-metadata/pom.xml
    incubator/ace/trunk/ace-obr-servlet/pom.xml
    incubator/ace/trunk/ace-obr-storage/pom.xml
    incubator/ace/trunk/ace-range-api/pom.xml
    incubator/ace/trunk/ace-repository-api/pom.xml
    incubator/ace/trunk/ace-repository-ext/pom.xml
    incubator/ace/trunk/ace-repository-impl/pom.xml
    incubator/ace/trunk/ace-repository-servlet/pom.xml
    incubator/ace/trunk/ace-repository-task/pom.xml
    incubator/ace/trunk/ace-resourceprocessor-useradmin/pom.xml
    incubator/ace/trunk/ace-scheduler-api/pom.xml
    incubator/ace/trunk/ace-scheduler/pom.xml
    incubator/ace/trunk/ace-server-action-popupmessage/pom.xml
    incubator/ace/trunk/ace-server-action/pom.xml
    incubator/ace/trunk/ace-server-log-store/pom.xml
    incubator/ace/trunk/ace-target-defaults/pom.xml
    incubator/ace/trunk/ace-target-devgateway/pom.xml
    incubator/ace/trunk/ace-target-devserver/pom.xml
    incubator/ace/trunk/ace-util/pom.xml
    incubator/ace/trunk/ace-webconsole-plugin/pom.xml
    incubator/ace/trunk/ace-webui-vaadin/pom.xml
    incubator/ace/trunk/ace-webui/pom.xml
    incubator/ace/trunk/pom/pom.xml

Modified: incubator/ace/trunk/ace-client-automation/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-client-automation/pom.xml?rev=1073691&r1=1073690&r2=1073691&view=diff
==============================================================================
--- incubator/ace/trunk/ace-client-automation/pom.xml (original)
+++ incubator/ace/trunk/ace-client-automation/pom.xml Wed Feb 23 10:51:11 2011
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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">
 
     <!--
 
@@ -25,35 +26,26 @@
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
         <version>0.8.0-SNAPSHOT</version>
-        <relativePath>../pom/</relativePath>        
+        <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
     <artifactId>ace-client-automation</artifactId>
     <packaging>bundle</packaging>
 
     <name>Apache ACE :: Client Automation</name>
-    
+
     <properties>
         <bundle.symbolicName>${namespace}.client.automation</bundle.symbolicName>
         <bundle.namespace>${namespace}.client.automation</bundle.namespace>
     </properties>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
-      <dependencies>
+    <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>ace-client-repository-api</artifactId>
             <version>${project.version}</version>
         </dependency>
-           <dependency>
+        <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>ace-scheduler-api</artifactId>
             <version>${project.version}</version>

Modified: incubator/ace/trunk/ace-client-repository-api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-client-repository-api/pom.xml?rev=1073691&r1=1073690&r2=1073691&view=diff
==============================================================================
--- incubator/ace/trunk/ace-client-repository-api/pom.xml (original)
+++ incubator/ace/trunk/ace-client-repository-api/pom.xml Wed Feb 23 10:51:11 2011
@@ -25,7 +25,7 @@
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
         <version>0.8.0-SNAPSHOT</version>
-        <relativePath>../pom/</relativePath>
+        <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
     <artifactId>ace-client-repository-api</artifactId>
@@ -38,15 +38,6 @@
         <bundle.namespace>${namespace}.client.repository</bundle.namespace>
     </properties>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -67,4 +58,5 @@
             <artifactId>org.osgi.compendium</artifactId>
         </dependency>
     </dependencies>
+
 </project>
\ No newline at end of file

Modified: incubator/ace/trunk/ace-client-repository-helper-base/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-client-repository-helper-base/pom.xml?rev=1073691&r1=1073690&r2=1073691&view=diff
==============================================================================
--- incubator/ace/trunk/ace-client-repository-helper-base/pom.xml (original)
+++ incubator/ace/trunk/ace-client-repository-helper-base/pom.xml Wed Feb 23 10:51:11 2011
@@ -25,7 +25,7 @@
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
         <version>0.8.0-SNAPSHOT</version>
-        <relativePath>../pom/</relativePath>
+        <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
     <artifactId>ace-client-repository-helper-base</artifactId>
@@ -38,15 +38,6 @@
         <bundle.namespace>${namespace}.client.repository.helper.base</bundle.namespace>
     </properties>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>

Modified: incubator/ace/trunk/ace-client-repository-helper-bundle/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-client-repository-helper-bundle/pom.xml?rev=1073691&r1=1073690&r2=1073691&view=diff
==============================================================================
--- incubator/ace/trunk/ace-client-repository-helper-bundle/pom.xml (original)
+++ incubator/ace/trunk/ace-client-repository-helper-bundle/pom.xml Wed Feb 23 10:51:11 2011
@@ -25,7 +25,7 @@
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
         <version>0.8.0-SNAPSHOT</version>
-        <relativePath>../pom/</relativePath>                
+        <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
     <artifactId>ace-client-repository-helper-bundle</artifactId>
@@ -38,15 +38,6 @@
         <bundle.namespace>${namespace}.client.repository.helper.bundle</bundle.namespace>
     </properties>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>

Modified: incubator/ace/trunk/ace-client-repository-helper-configuration/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-client-repository-helper-configuration/pom.xml?rev=1073691&r1=1073690&r2=1073691&view=diff
==============================================================================
--- incubator/ace/trunk/ace-client-repository-helper-configuration/pom.xml (original)
+++ incubator/ace/trunk/ace-client-repository-helper-configuration/pom.xml Wed Feb 23 10:51:11 2011
@@ -25,7 +25,7 @@
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
         <version>0.8.0-SNAPSHOT</version>
-        <relativePath>../pom/</relativePath>                
+        <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
     <artifactId>ace-client-repository-helper-configuration</artifactId>
@@ -38,15 +38,6 @@
         <bundle.namespace>${namespace}.client.repository.helper.configuration</bundle.namespace>
     </properties>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>

Modified: incubator/ace/trunk/ace-client-repository-helper-user/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-client-repository-helper-user/pom.xml?rev=1073691&r1=1073690&r2=1073691&view=diff
==============================================================================
--- incubator/ace/trunk/ace-client-repository-helper-user/pom.xml (original)
+++ incubator/ace/trunk/ace-client-repository-helper-user/pom.xml Wed Feb 23 10:51:11 2011
@@ -25,7 +25,7 @@
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
         <version>0.8.0-SNAPSHOT</version>
-        <relativePath>../pom/</relativePath>                
+        <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
     <artifactId>ace-client-repository-helper-user</artifactId>
@@ -38,15 +38,6 @@
         <bundle.namespace>${namespace}.client.repository.helper.user</bundle.namespace>
     </properties>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>

Modified: incubator/ace/trunk/ace-client-repository-impl/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-client-repository-impl/pom.xml?rev=1073691&r1=1073690&r2=1073691&view=diff
==============================================================================
--- incubator/ace/trunk/ace-client-repository-impl/pom.xml (original)
+++ incubator/ace/trunk/ace-client-repository-impl/pom.xml Wed Feb 23 10:51:11 2011
@@ -25,7 +25,7 @@
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
         <version>0.8.0-SNAPSHOT</version>
-        <relativePath>../pom/</relativePath>
+        <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
     <artifactId>ace-client-repository-impl</artifactId>
@@ -38,15 +38,6 @@
         <bundle.namespace>${namespace}.client.repository.impl</bundle.namespace>
     </properties>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>

Modified: incubator/ace/trunk/ace-client-repository-useradmin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-client-repository-useradmin/pom.xml?rev=1073691&r1=1073690&r2=1073691&view=diff
==============================================================================
--- incubator/ace/trunk/ace-client-repository-useradmin/pom.xml (original)
+++ incubator/ace/trunk/ace-client-repository-useradmin/pom.xml Wed Feb 23 10:51:11 2011
@@ -25,7 +25,7 @@
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
         <version>0.8.0-SNAPSHOT</version>
-        <relativePath>../pom/</relativePath>                
+        <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
     <artifactId>ace-client-repository-useradmin</artifactId>
@@ -38,15 +38,6 @@
         <bundle.namespace>${namespace}.client.repositoryuseradmin</bundle.namespace>
     </properties>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>

Modified: incubator/ace/trunk/ace-configurator-serveruseradmin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-configurator-serveruseradmin/pom.xml?rev=1073691&r1=1073690&r2=1073691&view=diff
==============================================================================
--- incubator/ace/trunk/ace-configurator-serveruseradmin/pom.xml (original)
+++ incubator/ace/trunk/ace-configurator-serveruseradmin/pom.xml Wed Feb 23 10:51:11 2011
@@ -25,7 +25,7 @@
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
         <version>0.8.0-SNAPSHOT</version>
-        <relativePath>../pom/</relativePath>       
+        <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
     <artifactId>ace-configurator-serveruseradmin</artifactId>
@@ -38,15 +38,6 @@
         <bundle.namespace>${namespace}.configurator.serveruseradmin</bundle.namespace>
     </properties>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
     <dependencies>
         <dependency>
             <groupId>org.osgi</groupId>

Modified: incubator/ace/trunk/ace-configurator-useradmin-task/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-configurator-useradmin-task/pom.xml?rev=1073691&r1=1073690&r2=1073691&view=diff
==============================================================================
--- incubator/ace/trunk/ace-configurator-useradmin-task/pom.xml (original)
+++ incubator/ace/trunk/ace-configurator-useradmin-task/pom.xml Wed Feb 23 10:51:11 2011
@@ -25,7 +25,7 @@
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
         <version>0.8.0-SNAPSHOT</version>
-        <relativePath>../pom/</relativePath>                
+        <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
     <artifactId>ace-configurator-useradmin-task</artifactId>
@@ -38,15 +38,6 @@
         <bundle.namespace>${namespace}.configurator.useradmin.task</bundle.namespace>
     </properties>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>

Modified: incubator/ace/trunk/ace-configurator/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-configurator/pom.xml?rev=1073691&r1=1073690&r2=1073691&view=diff
==============================================================================
--- incubator/ace/trunk/ace-configurator/pom.xml (original)
+++ incubator/ace/trunk/ace-configurator/pom.xml Wed Feb 23 10:51:11 2011
@@ -25,7 +25,7 @@
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
         <version>0.8.0-SNAPSHOT</version>
-        <relativePath>../pom/</relativePath>
+        <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
     <artifactId>ace-configurator</artifactId>
@@ -38,15 +38,6 @@
         <bundle.namespace>${namespace}.configurator</bundle.namespace>
     </properties>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
      <dependencies>
         <dependency>
             <groupId>org.osgi</groupId>

Modified: incubator/ace/trunk/ace-consolelogger/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-consolelogger/pom.xml?rev=1073691&r1=1073690&r2=1073691&view=diff
==============================================================================
--- incubator/ace/trunk/ace-consolelogger/pom.xml (original)
+++ incubator/ace/trunk/ace-consolelogger/pom.xml Wed Feb 23 10:51:11 2011
@@ -25,7 +25,7 @@
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
         <version>0.8.0-SNAPSHOT</version>
-        <relativePath>../pom/</relativePath>                
+        <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
     <artifactId>ace-consolelogger</artifactId>
@@ -38,15 +38,6 @@
         <bundle.namespace>${namespace}.consolelogger</bundle.namespace>
     </properties>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
     <dependencies>
         <dependency>
             <groupId>org.osgi</groupId>

Modified: incubator/ace/trunk/ace-deployment-api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-deployment-api/pom.xml?rev=1073691&r1=1073690&r2=1073691&view=diff
==============================================================================
--- incubator/ace/trunk/ace-deployment-api/pom.xml (original)
+++ incubator/ace/trunk/ace-deployment-api/pom.xml Wed Feb 23 10:51:11 2011
@@ -25,7 +25,7 @@
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
         <version>0.8.0-SNAPSHOT</version>
-        <relativePath>../pom/</relativePath>                
+        <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
     <artifactId>ace-deployment-api</artifactId>
@@ -38,15 +38,6 @@
         <bundle.namespace>${namespace}.deployment</bundle.namespace>
     </properties>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
     <dependencies>
         <dependency>
             <groupId>org.osgi</groupId>

Modified: incubator/ace/trunk/ace-deployment-deploymentadmin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-deployment-deploymentadmin/pom.xml?rev=1073691&r1=1073690&r2=1073691&view=diff
==============================================================================
--- incubator/ace/trunk/ace-deployment-deploymentadmin/pom.xml (original)
+++ incubator/ace/trunk/ace-deployment-deploymentadmin/pom.xml Wed Feb 23 10:51:11 2011
@@ -25,7 +25,7 @@
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
         <version>0.8.0-SNAPSHOT</version>
-        <relativePath>../pom/</relativePath>
+        <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
     <artifactId>ace-deployment-deploymentadmin</artifactId>
@@ -38,15 +38,6 @@
         <bundle.namespace>${namespace}.deployment.deploymentadmin</bundle.namespace>
     </properties>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
      <dependencies>
          <dependency>
             <groupId>${project.groupId}</groupId>

Modified: incubator/ace/trunk/ace-deployment-provider-api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-deployment-provider-api/pom.xml?rev=1073691&r1=1073690&r2=1073691&view=diff
==============================================================================
--- incubator/ace/trunk/ace-deployment-provider-api/pom.xml (original)
+++ incubator/ace/trunk/ace-deployment-provider-api/pom.xml Wed Feb 23 10:51:11 2011
@@ -25,7 +25,7 @@
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
         <version>0.8.0-SNAPSHOT</version>
-        <relativePath>../pom/</relativePath>                
+        <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
     <artifactId>ace-deployment-provider-api</artifactId>
@@ -38,13 +38,4 @@
         <bundle.namespace>${namespace}.deployment.provider</bundle.namespace>
     </properties>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>
\ No newline at end of file

Modified: incubator/ace/trunk/ace-deployment-provider-base/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-deployment-provider-base/pom.xml?rev=1073691&r1=1073690&r2=1073691&view=diff
==============================================================================
--- incubator/ace/trunk/ace-deployment-provider-base/pom.xml (original)
+++ incubator/ace/trunk/ace-deployment-provider-base/pom.xml Wed Feb 23 10:51:11 2011
@@ -25,7 +25,7 @@
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
         <version>0.8.0-SNAPSHOT</version>
-        <relativePath>../pom/</relativePath>
+        <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
     <artifactId>ace-deployment-provider-base</artifactId>

Modified: incubator/ace/trunk/ace-deployment-provider-filebased/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-deployment-provider-filebased/pom.xml?rev=1073691&r1=1073690&r2=1073691&view=diff
==============================================================================
--- incubator/ace/trunk/ace-deployment-provider-filebased/pom.xml (original)
+++ incubator/ace/trunk/ace-deployment-provider-filebased/pom.xml Wed Feb 23 10:51:11 2011
@@ -25,7 +25,7 @@
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
         <version>0.8.0-SNAPSHOT</version>
-        <relativePath>../pom/</relativePath>                
+        <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
     <artifactId>ace-deployment-provider-filebased</artifactId>
@@ -38,15 +38,6 @@
         <bundle.namespace>${namespace}.deployment.provider.filebased</bundle.namespace>
     </properties>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
     <dependencies>
         <!-- embed this -->
         <dependency>

Modified: incubator/ace/trunk/ace-deployment-provider-repositorybased/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-deployment-provider-repositorybased/pom.xml?rev=1073691&r1=1073690&r2=1073691&view=diff
==============================================================================
--- incubator/ace/trunk/ace-deployment-provider-repositorybased/pom.xml (original)
+++ incubator/ace/trunk/ace-deployment-provider-repositorybased/pom.xml Wed Feb 23 10:51:11 2011
@@ -25,7 +25,7 @@
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
         <version>0.8.0-SNAPSHOT</version>
-        <relativePath>../pom/</relativePath>                
+        <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
     <artifactId>ace-deployment-provider-repositorybased</artifactId>
@@ -38,15 +38,6 @@
         <bundle.namespace>${namespace}.deployment.provider.repositorybased</bundle.namespace>
     </properties>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>

Modified: incubator/ace/trunk/ace-deployment-servlet/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-deployment-servlet/pom.xml?rev=1073691&r1=1073690&r2=1073691&view=diff
==============================================================================
--- incubator/ace/trunk/ace-deployment-servlet/pom.xml (original)
+++ incubator/ace/trunk/ace-deployment-servlet/pom.xml Wed Feb 23 10:51:11 2011
@@ -25,7 +25,7 @@
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
         <version>0.8.0-SNAPSHOT</version>
-        <relativePath>../pom/</relativePath>
+        <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
     <artifactId>ace-deployment-servlet</artifactId>
@@ -38,15 +38,6 @@
         <bundle.namespace>${namespace}.deployment.servlet</bundle.namespace>
     </properties>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>

Modified: incubator/ace/trunk/ace-deployment-streamgenerator/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-deployment-streamgenerator/pom.xml?rev=1073691&r1=1073690&r2=1073691&view=diff
==============================================================================
--- incubator/ace/trunk/ace-deployment-streamgenerator/pom.xml (original)
+++ incubator/ace/trunk/ace-deployment-streamgenerator/pom.xml Wed Feb 23 10:51:11 2011
@@ -25,7 +25,7 @@
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
         <version>0.8.0-SNAPSHOT</version>
-        <relativePath>../pom/</relativePath>
+        <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
     <artifactId>ace-deployment-streamgenerator</artifactId>
@@ -38,15 +38,6 @@
         <bundle.namespace>${namespace}.deployment.streamgenerator</bundle.namespace>
     </properties>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>

Modified: incubator/ace/trunk/ace-deployment-task/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-deployment-task/pom.xml?rev=1073691&r1=1073690&r2=1073691&view=diff
==============================================================================
--- incubator/ace/trunk/ace-deployment-task/pom.xml (original)
+++ incubator/ace/trunk/ace-deployment-task/pom.xml Wed Feb 23 10:51:11 2011
@@ -25,7 +25,7 @@
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
         <version>0.8.0-SNAPSHOT</version>
-        <relativePath>../pom/</relativePath>
+        <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
     <artifactId>ace-deployment-task</artifactId>
@@ -38,15 +38,6 @@
         <bundle.namespace>${namespace}.deployment.task</bundle.namespace>
     </properties>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>

Modified: incubator/ace/trunk/ace-discovery-api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-discovery-api/pom.xml?rev=1073691&r1=1073690&r2=1073691&view=diff
==============================================================================
--- incubator/ace/trunk/ace-discovery-api/pom.xml (original)
+++ incubator/ace/trunk/ace-discovery-api/pom.xml Wed Feb 23 10:51:11 2011
@@ -25,7 +25,7 @@
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
         <version>0.8.0-SNAPSHOT</version>
-        <relativePath>../pom/</relativePath>                
+        <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
     <artifactId>ace-discovery-api</artifactId>
@@ -38,13 +38,4 @@
         <bundle.namespace>${namespace}.discovery</bundle.namespace>
     </properties>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>
\ No newline at end of file

Modified: incubator/ace/trunk/ace-discovery-property/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-discovery-property/pom.xml?rev=1073691&r1=1073690&r2=1073691&view=diff
==============================================================================
--- incubator/ace/trunk/ace-discovery-property/pom.xml (original)
+++ incubator/ace/trunk/ace-discovery-property/pom.xml Wed Feb 23 10:51:11 2011
@@ -25,7 +25,7 @@
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
         <version>0.8.0-SNAPSHOT</version>
-        <relativePath>../pom/</relativePath>
+        <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
     <artifactId>ace-discovery-property</artifactId>
@@ -38,15 +38,6 @@
         <bundle.namespace>${namespace}.discovery.property</bundle.namespace>
     </properties>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>

Modified: incubator/ace/trunk/ace-discovery-upnp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-discovery-upnp/pom.xml?rev=1073691&r1=1073690&r2=1073691&view=diff
==============================================================================
--- incubator/ace/trunk/ace-discovery-upnp/pom.xml (original)
+++ incubator/ace/trunk/ace-discovery-upnp/pom.xml Wed Feb 23 10:51:11 2011
@@ -25,7 +25,7 @@
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
         <version>0.8.0-SNAPSHOT</version>
-        <relativePath>../pom/</relativePath>
+        <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
     <artifactId>ace-discovery-upnp</artifactId>
@@ -38,15 +38,6 @@
         <bundle.namespace>${namespace}.discovery.upnp</bundle.namespace>
     </properties>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>

Modified: incubator/ace/trunk/ace-gateway-log-store/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-gateway-log-store/pom.xml?rev=1073691&r1=1073690&r2=1073691&view=diff
==============================================================================
--- incubator/ace/trunk/ace-gateway-log-store/pom.xml (original)
+++ incubator/ace/trunk/ace-gateway-log-store/pom.xml Wed Feb 23 10:51:11 2011
@@ -25,7 +25,7 @@
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
         <version>0.8.0-SNAPSHOT</version>
-        <relativePath>../pom/</relativePath>                
+        <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
     <artifactId>ace-gateway-log-store</artifactId>
@@ -38,15 +38,6 @@
         <bundle.namespace>${namespace}.gateway.log.store</bundle.namespace>
     </properties>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -58,7 +49,6 @@
             <artifactId>ace-identification-api</artifactId>
             <version>${project.version}</version>
         </dependency>
-
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>

Modified: incubator/ace/trunk/ace-gateway-log/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-gateway-log/pom.xml?rev=1073691&r1=1073690&r2=1073691&view=diff
==============================================================================
--- incubator/ace/trunk/ace-gateway-log/pom.xml (original)
+++ incubator/ace/trunk/ace-gateway-log/pom.xml Wed Feb 23 10:51:11 2011
@@ -25,7 +25,7 @@
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
         <version>0.8.0-SNAPSHOT</version>
-        <relativePath>../pom/</relativePath>                
+        <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
     <artifactId>ace-gateway-log</artifactId>
@@ -38,15 +38,6 @@
         <bundle.namespace>${namespace}.gateway.log</bundle.namespace>
     </properties>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>

Modified: incubator/ace/trunk/ace-httplistener/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-httplistener/pom.xml?rev=1073691&r1=1073690&r2=1073691&view=diff
==============================================================================
--- incubator/ace/trunk/ace-httplistener/pom.xml (original)
+++ incubator/ace/trunk/ace-httplistener/pom.xml Wed Feb 23 10:51:11 2011
@@ -25,7 +25,7 @@
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
         <version>0.8.0-SNAPSHOT</version>
-        <relativePath>../pom/</relativePath>                
+        <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
     <artifactId>ace-httplistener</artifactId>
@@ -38,15 +38,6 @@
         <bundle.namespace>${namespace}.http.listener</bundle.namespace>
     </properties>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
     <dependencies>
         <dependency>
             <groupId>org.osgi</groupId>

Modified: incubator/ace/trunk/ace-identification-api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-identification-api/pom.xml?rev=1073691&r1=1073690&r2=1073691&view=diff
==============================================================================
--- incubator/ace/trunk/ace-identification-api/pom.xml (original)
+++ incubator/ace/trunk/ace-identification-api/pom.xml Wed Feb 23 10:51:11 2011
@@ -25,7 +25,7 @@
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
         <version>0.8.0-SNAPSHOT</version>
-        <relativePath>../pom/</relativePath>                
+        <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
     <artifactId>ace-identification-api</artifactId>
@@ -38,13 +38,4 @@
         <bundle.namespace>${namespace}.identification</bundle.namespace>
     </properties>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>
\ No newline at end of file

Modified: incubator/ace/trunk/ace-identification-ifconfig/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-identification-ifconfig/pom.xml?rev=1073691&r1=1073690&r2=1073691&view=diff
==============================================================================
--- incubator/ace/trunk/ace-identification-ifconfig/pom.xml (original)
+++ incubator/ace/trunk/ace-identification-ifconfig/pom.xml Wed Feb 23 10:51:11 2011
@@ -25,7 +25,7 @@
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
         <version>0.8.0-SNAPSHOT</version>
-        <relativePath>../pom/</relativePath>
+        <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
     <artifactId>ace-identification-ifconfig</artifactId>
@@ -38,15 +38,6 @@
         <bundle.namespace>${namespace}.identification.ifconfig</bundle.namespace>
     </properties>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>

Modified: incubator/ace/trunk/ace-identification-property/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-identification-property/pom.xml?rev=1073691&r1=1073690&r2=1073691&view=diff
==============================================================================
--- incubator/ace/trunk/ace-identification-property/pom.xml (original)
+++ incubator/ace/trunk/ace-identification-property/pom.xml Wed Feb 23 10:51:11 2011
@@ -25,7 +25,7 @@
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
         <version>0.8.0-SNAPSHOT</version>
-        <relativePath>../pom/</relativePath>
+        <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
     <artifactId>ace-identification-property</artifactId>
@@ -38,15 +38,6 @@
         <bundle.namespace>${namespace}.identification.property</bundle.namespace>
     </properties>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>

Modified: incubator/ace/trunk/ace-integrationtests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-integrationtests/pom.xml?rev=1073691&r1=1073690&r2=1073691&view=diff
==============================================================================
--- incubator/ace/trunk/ace-integrationtests/pom.xml (original)
+++ incubator/ace/trunk/ace-integrationtests/pom.xml Wed Feb 23 10:51:11 2011
@@ -25,7 +25,7 @@
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
         <version>0.8.0-SNAPSHOT</version>
-        <relativePath>../pom/</relativePath>                
+        <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
     <artifactId>ace-integrationtests</artifactId>

Modified: incubator/ace/trunk/ace-launcher/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-launcher/pom.xml?rev=1073691&r1=1073690&r2=1073691&view=diff
==============================================================================
--- incubator/ace/trunk/ace-launcher/pom.xml (original)
+++ incubator/ace/trunk/ace-launcher/pom.xml Wed Feb 23 10:51:11 2011
@@ -25,14 +25,13 @@
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
         <version>0.8.0-SNAPSHOT</version>
-        <relativePath>../pom/</relativePath>
+        <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
     <artifactId>ace-launcher</artifactId>
 
     <name>Apache ACE :: Launcher</name>
 
-
     <build>
         <plugins>
             <plugin>

Modified: incubator/ace/trunk/ace-location-upnp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-location-upnp/pom.xml?rev=1073691&r1=1073690&r2=1073691&view=diff
==============================================================================
--- incubator/ace/trunk/ace-location-upnp/pom.xml (original)
+++ incubator/ace/trunk/ace-location-upnp/pom.xml Wed Feb 23 10:51:11 2011
@@ -25,7 +25,7 @@
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
         <version>0.8.0-SNAPSHOT</version>
-        <relativePath>../pom/</relativePath>                
+        <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
     <artifactId>ace-location-upnp</artifactId>
@@ -38,15 +38,6 @@
         <bundle.namespace>${namespace}.location.upnp</bundle.namespace>
     </properties>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
     <dependencies>
         <dependency>
             <groupId>org.osgi</groupId>

Modified: incubator/ace/trunk/ace-log-listener/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-log-listener/pom.xml?rev=1073691&r1=1073690&r2=1073691&view=diff
==============================================================================
--- incubator/ace/trunk/ace-log-listener/pom.xml (original)
+++ incubator/ace/trunk/ace-log-listener/pom.xml Wed Feb 23 10:51:11 2011
@@ -25,7 +25,7 @@
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
         <version>0.8.0-SNAPSHOT</version>
-        <relativePath>../pom/</relativePath>
+        <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
     <artifactId>ace-log-listener</artifactId>
@@ -38,15 +38,6 @@
         <bundle.namespace>${namespace}.log.listener</bundle.namespace>
     </properties>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
     <dependencies>
         <dependency>
             <groupId>org.osgi</groupId>

Modified: incubator/ace/trunk/ace-log-servlet/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-log-servlet/pom.xml?rev=1073691&r1=1073690&r2=1073691&view=diff
==============================================================================
--- incubator/ace/trunk/ace-log-servlet/pom.xml (original)
+++ incubator/ace/trunk/ace-log-servlet/pom.xml Wed Feb 23 10:51:11 2011
@@ -25,7 +25,7 @@
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
         <version>0.8.0-SNAPSHOT</version>
-        <relativePath>../pom/</relativePath>
+        <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
     <artifactId>ace-log-servlet</artifactId>
@@ -38,15 +38,6 @@
         <bundle.namespace>${namespace}.server.log.servlet</bundle.namespace>
     </properties>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>

Modified: incubator/ace/trunk/ace-log-task/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-log-task/pom.xml?rev=1073691&r1=1073690&r2=1073691&view=diff
==============================================================================
--- incubator/ace/trunk/ace-log-task/pom.xml (original)
+++ incubator/ace/trunk/ace-log-task/pom.xml Wed Feb 23 10:51:11 2011
@@ -25,7 +25,7 @@
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
         <version>0.8.0-SNAPSHOT</version>
-        <relativePath>../pom/</relativePath>
+        <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
     <artifactId>ace-log-task</artifactId>
@@ -38,15 +38,6 @@
         <bundle.namespace>${namespace}.server.log.task</bundle.namespace>
     </properties>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>

Modified: incubator/ace/trunk/ace-log/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-log/pom.xml?rev=1073691&r1=1073690&r2=1073691&view=diff
==============================================================================
--- incubator/ace/trunk/ace-log/pom.xml (original)
+++ incubator/ace/trunk/ace-log/pom.xml Wed Feb 23 10:51:11 2011
@@ -25,7 +25,7 @@
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
         <version>0.8.0-SNAPSHOT</version>
-        <relativePath>../pom/</relativePath>                
+        <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
     <artifactId>ace-log</artifactId>
@@ -38,15 +38,6 @@
         <bundle.namespace>${namespace}.log</bundle.namespace>
     </properties>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>

Modified: incubator/ace/trunk/ace-managementagent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-managementagent/pom.xml?rev=1073691&r1=1073690&r2=1073691&view=diff
==============================================================================
--- incubator/ace/trunk/ace-managementagent/pom.xml (original)
+++ incubator/ace/trunk/ace-managementagent/pom.xml Wed Feb 23 10:51:11 2011
@@ -25,7 +25,7 @@
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
         <version>0.8.0-SNAPSHOT</version>
-        <relativePath>../pom/</relativePath>
+        <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
     <artifactId>ace-managementagent</artifactId>
@@ -38,15 +38,6 @@
         <bundle.namespace>${namespace}</bundle.namespace>
     </properties>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
     <dependencies>
         <dependency>
             <groupId>org.osgi</groupId>

Modified: incubator/ace/trunk/ace-obr-metadata/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-obr-metadata/pom.xml?rev=1073691&r1=1073690&r2=1073691&view=diff
==============================================================================
--- incubator/ace/trunk/ace-obr-metadata/pom.xml (original)
+++ incubator/ace/trunk/ace-obr-metadata/pom.xml Wed Feb 23 10:51:11 2011
@@ -25,7 +25,7 @@
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
         <version>0.8.0-SNAPSHOT</version>
-        <relativePath>../pom/</relativePath>
+        <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
     <artifactId>ace-obr-metadata</artifactId>
@@ -38,15 +38,6 @@
         <bundle.namespace>${namespace}.obr.metadata</bundle.namespace>
     </properties>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
     <dependencies>
         <dependency>
             <groupId>org.osgi</groupId>

Modified: incubator/ace/trunk/ace-obr-servlet/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-obr-servlet/pom.xml?rev=1073691&r1=1073690&r2=1073691&view=diff
==============================================================================
--- incubator/ace/trunk/ace-obr-servlet/pom.xml (original)
+++ incubator/ace/trunk/ace-obr-servlet/pom.xml Wed Feb 23 10:51:11 2011
@@ -25,7 +25,7 @@
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
         <version>0.8.0-SNAPSHOT</version>
-        <relativePath>../pom/</relativePath>
+        <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
     <artifactId>ace-obr-servlet</artifactId>
@@ -38,15 +38,6 @@
         <bundle.namespace>${namespace}.obr.servlet</bundle.namespace>
     </properties>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>

Modified: incubator/ace/trunk/ace-obr-storage/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-obr-storage/pom.xml?rev=1073691&r1=1073690&r2=1073691&view=diff
==============================================================================
--- incubator/ace/trunk/ace-obr-storage/pom.xml (original)
+++ incubator/ace/trunk/ace-obr-storage/pom.xml Wed Feb 23 10:51:11 2011
@@ -25,7 +25,7 @@
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
         <version>0.8.0-SNAPSHOT</version>
-        <relativePath>../pom/</relativePath>
+        <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
     <artifactId>ace-obr-storage</artifactId>
@@ -38,15 +38,6 @@
         <bundle.namespace>${namespace}.obr.storage</bundle.namespace>
     </properties>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>

Modified: incubator/ace/trunk/ace-range-api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-range-api/pom.xml?rev=1073691&r1=1073690&r2=1073691&view=diff
==============================================================================
--- incubator/ace/trunk/ace-range-api/pom.xml (original)
+++ incubator/ace/trunk/ace-range-api/pom.xml Wed Feb 23 10:51:11 2011
@@ -25,7 +25,7 @@
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
         <version>0.8.0-SNAPSHOT</version>
-        <relativePath>../pom/</relativePath>
+        <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
     <artifactId>ace-range-api</artifactId>
@@ -38,15 +38,6 @@
         <bundle.namespace>${namespace}.range</bundle.namespace>
     </properties>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>

Modified: incubator/ace/trunk/ace-repository-api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-repository-api/pom.xml?rev=1073691&r1=1073690&r2=1073691&view=diff
==============================================================================
--- incubator/ace/trunk/ace-repository-api/pom.xml (original)
+++ incubator/ace/trunk/ace-repository-api/pom.xml Wed Feb 23 10:51:11 2011
@@ -25,7 +25,7 @@
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
         <version>0.8.0-SNAPSHOT</version>
-        <relativePath>../pom/</relativePath>
+        <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
     <artifactId>ace-repository-api</artifactId>
@@ -38,15 +38,6 @@
         <bundle.namespace>${namespace}.repository</bundle.namespace>
     </properties>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>

Modified: incubator/ace/trunk/ace-repository-ext/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-repository-ext/pom.xml?rev=1073691&r1=1073690&r2=1073691&view=diff
==============================================================================
--- incubator/ace/trunk/ace-repository-ext/pom.xml (original)
+++ incubator/ace/trunk/ace-repository-ext/pom.xml Wed Feb 23 10:51:11 2011
@@ -25,7 +25,7 @@
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
         <version>0.8.0-SNAPSHOT</version>
-        <relativePath>../pom/</relativePath>
+        <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
     <artifactId>ace-repository-ext</artifactId>

Modified: incubator/ace/trunk/ace-repository-impl/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-repository-impl/pom.xml?rev=1073691&r1=1073690&r2=1073691&view=diff
==============================================================================
--- incubator/ace/trunk/ace-repository-impl/pom.xml (original)
+++ incubator/ace/trunk/ace-repository-impl/pom.xml Wed Feb 23 10:51:11 2011
@@ -25,7 +25,7 @@
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
         <version>0.8.0-SNAPSHOT</version>
-        <relativePath>../pom/</relativePath>
+        <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
     <artifactId>ace-repository-impl</artifactId>
@@ -38,15 +38,6 @@
         <bundle.namespace>${namespace}.repository</bundle.namespace>
     </properties>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>

Modified: incubator/ace/trunk/ace-repository-servlet/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-repository-servlet/pom.xml?rev=1073691&r1=1073690&r2=1073691&view=diff
==============================================================================
--- incubator/ace/trunk/ace-repository-servlet/pom.xml (original)
+++ incubator/ace/trunk/ace-repository-servlet/pom.xml Wed Feb 23 10:51:11 2011
@@ -25,7 +25,7 @@
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
         <version>0.8.0-SNAPSHOT</version>
-        <relativePath>../pom/</relativePath>
+        <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
     <artifactId>ace-repository-servlet</artifactId>
@@ -38,15 +38,6 @@
         <bundle.namespace>${namespace}.repository.servlet</bundle.namespace>
     </properties>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>

Modified: incubator/ace/trunk/ace-repository-task/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-repository-task/pom.xml?rev=1073691&r1=1073690&r2=1073691&view=diff
==============================================================================
--- incubator/ace/trunk/ace-repository-task/pom.xml (original)
+++ incubator/ace/trunk/ace-repository-task/pom.xml Wed Feb 23 10:51:11 2011
@@ -25,7 +25,7 @@
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
         <version>0.8.0-SNAPSHOT</version>
-        <relativePath>../pom/</relativePath>
+        <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
     <artifactId>ace-repository-task</artifactId>
@@ -38,15 +38,6 @@
         <bundle.namespace>${namespace}.repository.task</bundle.namespace>
     </properties>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>

Modified: incubator/ace/trunk/ace-resourceprocessor-useradmin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-resourceprocessor-useradmin/pom.xml?rev=1073691&r1=1073690&r2=1073691&view=diff
==============================================================================
--- incubator/ace/trunk/ace-resourceprocessor-useradmin/pom.xml (original)
+++ incubator/ace/trunk/ace-resourceprocessor-useradmin/pom.xml Wed Feb 23 10:51:11 2011
@@ -25,7 +25,7 @@
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
         <version>0.8.0-SNAPSHOT</version>
-        <relativePath>../pom/</relativePath>
+        <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
     <artifactId>ace-resourceprocessor-useradmin</artifactId>
@@ -38,15 +38,6 @@
         <bundle.namespace>${namespace}.resourceprocessor.useradmin</bundle.namespace>
     </properties>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
     <dependencies>
         <dependency>
             <groupId>org.osgi</groupId>

Modified: incubator/ace/trunk/ace-scheduler-api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-scheduler-api/pom.xml?rev=1073691&r1=1073690&r2=1073691&view=diff
==============================================================================
--- incubator/ace/trunk/ace-scheduler-api/pom.xml (original)
+++ incubator/ace/trunk/ace-scheduler-api/pom.xml Wed Feb 23 10:51:11 2011
@@ -25,7 +25,7 @@
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
         <version>0.8.0-SNAPSHOT</version>
-        <relativePath>../pom/</relativePath>
+        <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
     <artifactId>ace-scheduler-api</artifactId>
@@ -38,13 +38,4 @@
         <bundle.namespace>${namespace}.scheduler.constants</bundle.namespace>
     </properties>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>
\ No newline at end of file

Modified: incubator/ace/trunk/ace-scheduler/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-scheduler/pom.xml?rev=1073691&r1=1073690&r2=1073691&view=diff
==============================================================================
--- incubator/ace/trunk/ace-scheduler/pom.xml (original)
+++ incubator/ace/trunk/ace-scheduler/pom.xml Wed Feb 23 10:51:11 2011
@@ -25,7 +25,7 @@
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
         <version>0.8.0-SNAPSHOT</version>
-        <relativePath>../pom/</relativePath>
+        <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
     <artifactId>ace-scheduler</artifactId>
@@ -38,15 +38,6 @@
         <bundle.namespace>${namespace}.scheduler</bundle.namespace>
     </properties>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>

Modified: incubator/ace/trunk/ace-server-action-popupmessage/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-server-action-popupmessage/pom.xml?rev=1073691&r1=1073690&r2=1073691&view=diff
==============================================================================
--- incubator/ace/trunk/ace-server-action-popupmessage/pom.xml (original)
+++ incubator/ace/trunk/ace-server-action-popupmessage/pom.xml Wed Feb 23 10:51:11 2011
@@ -25,7 +25,7 @@
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
         <version>0.8.0-SNAPSHOT</version>
-        <relativePath>../pom/</relativePath>
+        <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
     <artifactId>ace-server-action-popupmessage</artifactId>
@@ -38,15 +38,6 @@
         <bundle.namespace>${namespace}.server.action.popupmessage</bundle.namespace>
     </properties>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>

Modified: incubator/ace/trunk/ace-server-action/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-server-action/pom.xml?rev=1073691&r1=1073690&r2=1073691&view=diff
==============================================================================
--- incubator/ace/trunk/ace-server-action/pom.xml (original)
+++ incubator/ace/trunk/ace-server-action/pom.xml Wed Feb 23 10:51:11 2011
@@ -25,7 +25,7 @@
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
         <version>0.8.0-SNAPSHOT</version>
-        <relativePath>../pom/</relativePath>
+        <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
     <artifactId>ace-server-action</artifactId>
@@ -38,15 +38,6 @@
         <bundle.namespace>${namespace}.server.action</bundle.namespace>
     </properties>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
     <dependencies>
         <dependency>
             <groupId>org.osgi</groupId>

Modified: incubator/ace/trunk/ace-server-log-store/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-server-log-store/pom.xml?rev=1073691&r1=1073690&r2=1073691&view=diff
==============================================================================
--- incubator/ace/trunk/ace-server-log-store/pom.xml (original)
+++ incubator/ace/trunk/ace-server-log-store/pom.xml Wed Feb 23 10:51:11 2011
@@ -25,7 +25,7 @@
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
         <version>0.8.0-SNAPSHOT</version>
-        <relativePath>../pom/</relativePath>
+        <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
     <artifactId>ace-server-log-store</artifactId>
@@ -38,15 +38,6 @@
         <bundle.namespace>${namespace}.server.log.store</bundle.namespace>
     </properties>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>

Modified: incubator/ace/trunk/ace-target-defaults/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-target-defaults/pom.xml?rev=1073691&r1=1073690&r2=1073691&view=diff
==============================================================================
--- incubator/ace/trunk/ace-target-defaults/pom.xml (original)
+++ incubator/ace/trunk/ace-target-defaults/pom.xml Wed Feb 23 10:51:11 2011
@@ -25,7 +25,7 @@
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
         <version>0.8.0-SNAPSHOT</version>
-        <relativePath>../pom/</relativePath>                
+        <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
     <artifactId>ace-target-defaults</artifactId>

Modified: incubator/ace/trunk/ace-target-devgateway/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-target-devgateway/pom.xml?rev=1073691&r1=1073690&r2=1073691&view=diff
==============================================================================
--- incubator/ace/trunk/ace-target-devgateway/pom.xml (original)
+++ incubator/ace/trunk/ace-target-devgateway/pom.xml Wed Feb 23 10:51:11 2011
@@ -25,7 +25,7 @@
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
         <version>0.8.0-SNAPSHOT</version>
-        <relativePath>../pom/</relativePath>
+        <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
     <artifactId>ace-target-devgateway</artifactId>

Modified: incubator/ace/trunk/ace-target-devserver/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-target-devserver/pom.xml?rev=1073691&r1=1073690&r2=1073691&view=diff
==============================================================================
--- incubator/ace/trunk/ace-target-devserver/pom.xml (original)
+++ incubator/ace/trunk/ace-target-devserver/pom.xml Wed Feb 23 10:51:11 2011
@@ -25,7 +25,7 @@
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
         <version>0.8.0-SNAPSHOT</version>
-        <relativePath>../pom/</relativePath>
+        <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
     <artifactId>ace-target-devserver</artifactId>

Modified: incubator/ace/trunk/ace-util/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-util/pom.xml?rev=1073691&r1=1073690&r2=1073691&view=diff
==============================================================================
--- incubator/ace/trunk/ace-util/pom.xml (original)
+++ incubator/ace/trunk/ace-util/pom.xml Wed Feb 23 10:51:11 2011
@@ -25,7 +25,7 @@
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
         <version>0.8.0-SNAPSHOT</version>
-        <relativePath>../pom/</relativePath>
+        <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
     <artifactId>ace-util</artifactId>
@@ -38,15 +38,6 @@
         <bundle.namespace>${namespace}.util</bundle.namespace>
     </properties>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
     <dependencies>
         <dependency>
             <groupId>org.osgi</groupId>

Modified: incubator/ace/trunk/ace-webconsole-plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-webconsole-plugin/pom.xml?rev=1073691&r1=1073690&r2=1073691&view=diff
==============================================================================
--- incubator/ace/trunk/ace-webconsole-plugin/pom.xml (original)
+++ incubator/ace/trunk/ace-webconsole-plugin/pom.xml Wed Feb 23 10:51:11 2011
@@ -25,7 +25,7 @@
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
         <version>0.8.0-SNAPSHOT</version>
-        <relativePath>../pom/</relativePath>                
+        <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
     <artifactId>ace-webconsole-plugin</artifactId>
@@ -38,15 +38,6 @@
         <bundle.namespace>${namespace}.webconsole.plugin</bundle.namespace>
     </properties>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
     <dependencies>
         <dependency>
             <groupId>org.osgi</groupId>

Modified: incubator/ace/trunk/ace-webui-vaadin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-webui-vaadin/pom.xml?rev=1073691&r1=1073690&r2=1073691&view=diff
==============================================================================
--- incubator/ace/trunk/ace-webui-vaadin/pom.xml (original)
+++ incubator/ace/trunk/ace-webui-vaadin/pom.xml Wed Feb 23 10:51:11 2011
@@ -25,7 +25,7 @@
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
         <version>0.8.0-SNAPSHOT</version>
-        <relativePath>../pom/</relativePath>
+        <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
     <artifactId>ace-webui-vaadin</artifactId>
@@ -38,16 +38,6 @@
         <bundle.namespace>${namespace}</bundle.namespace>
     </properties>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <version>2.0.0</version>
-            </plugin>
-        </plugins>
-    </build>
-
     <repositories>
         <repository>
             <id>ace-repository</id>

Modified: incubator/ace/trunk/ace-webui/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-webui/pom.xml?rev=1073691&r1=1073690&r2=1073691&view=diff
==============================================================================
--- incubator/ace/trunk/ace-webui/pom.xml (original)
+++ incubator/ace/trunk/ace-webui/pom.xml Wed Feb 23 10:51:11 2011
@@ -25,7 +25,7 @@
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
         <version>0.8.0-SNAPSHOT</version>
-        <relativePath>../pom/</relativePath>
+        <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
     <artifactId>ace-webui</artifactId>
@@ -43,7 +43,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>gwt-maven-plugin</artifactId>
-                <version>1.2</version>
                 <executions>
                     <execution>
                         <goals>
@@ -59,7 +58,6 @@
 
             <plugin>
                 <artifactId>maven-war-plugin</artifactId>
-                <version>2.1-alpha-1</version>
                 <configuration>
                     <warSourceExcludes>WEB-INF/lib/ace-*.jar,WEB-INF/lib/xpp3-1.1.4c.jar,WEB-INF/lib/gwt-dnd-2.6.5.jar</warSourceExcludes>
                     <archive>
@@ -74,7 +72,6 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>2.0.0</version>
                 <executions>
                     <execution>
                         <id>bundle-manifest</id>
@@ -87,27 +84,10 @@
                         </configuration>
                     </execution>
                 </executions>
-                <configuration>
-                    <supportedProjectTypes>
-                        <supportedProjectType>jar</supportedProjectType>
-                        <supportedProjectType>bundle</supportedProjectType>
-                        <supportedProjectType>war</supportedProjectType>
-                    </supportedProjectTypes>
-                    <instructions>
-                        <!-- ...etc... -->
-                    </instructions>
-                </configuration>
             </plugin>
         </plugins>
     </build>
 
-    <repositories>
-        <repository>
-            <id>ace-repository</id>
-            <url>http://svn.apache.org/repos/asf/incubator/ace/repo</url>
-        </repository>
-    </repositories>
-
     <dependencies>
         <dependency>
             <groupId>org.osgi</groupId>

Modified: incubator/ace/trunk/pom/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/pom/pom.xml?rev=1073691&r1=1073690&r2=1073691&view=diff
==============================================================================
--- incubator/ace/trunk/pom/pom.xml (original)
+++ incubator/ace/trunk/pom/pom.xml Wed Feb 23 10:51:11 2011
@@ -25,6 +25,7 @@
         <groupId>org.apache</groupId>
         <artifactId>apache</artifactId>
         <version>8</version>
+        <relativePath></relativePath>
     </parent>
 
     <groupId>org.apache.ace</groupId>
@@ -63,7 +64,7 @@
     <developers>
         <developer>
             <id>angelos</id>
-            <name>Angelo van der Sijpt </name>
+            <name>Angelo van der Sijpt</name>
         </developer>
         <developer>
             <id>btopping</id>
@@ -126,9 +127,10 @@
         <felix.deploymentadmin.version>0.9.0-SNAPSHOT</felix.deploymentadmin.version>
         <felix.eventadmin.version>1.2.2</felix.eventadmin.version>
         <felix.framework.version>3.0.6</felix.framework.version>
+        <felix.maven-bundle-plugin.version>2.3.4</felix.maven-bundle-plugin.version>
         <felix.prefs.version>1.0.4</felix.prefs.version>
         <felix.shell.version>1.4.1</felix.shell.version>
-        <gwt.version>2.0.3</gwt.version>
+        <gwt.version>2.1.0</gwt.version>
         <gwt-dnd.version>2.6.5</gwt-dnd.version>
         <junit.version>4.4</junit.version>
         <knopflerfish.version>2.0.0</knopflerfish.version>
@@ -149,25 +151,15 @@
     </properties>
 
     <repositories>
-      <repository>
-         <id>ace-m2</id>
-         <url>http://svn.apache.org/repos/asf/incubator/ace/repo</url>
-      </repository>
+        <repository>
+            <id>ace-m2</id>
+            <url>http://svn.apache.org/repos/asf/incubator/ace/repo</url>
+        </repository>
     </repositories>
 
     <build>
 
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>2.3</version>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-gpg-plugin</artifactId>
-                <version>1.0-alpha-4</version>
-            </plugin>
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -198,27 +190,24 @@
                     <target>1.5</target>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <version>${felix.maven-bundle-plugin.version}</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <_include>-osgi.bnd</_include>
+                    </instructions>
+                    <supportedProjectTypes>
+                        <supportedProjectType>jar</supportedProjectType>
+                        <supportedProjectType>bundle</supportedProjectType>
+                        <supportedProjectType>war</supportedProjectType>
+                    </supportedProjectTypes>
+                </configuration>
+            </plugin>
         </plugins>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.felix</groupId>
-                    <artifactId>maven-bundle-plugin</artifactId>
-                    <version>2.1.0</version>
-                    <extensions>true</extensions>
-                    <configuration>
-                        <instructions>
-                            <_include>-osgi.bnd</_include>
-                        </instructions>
-				        <supportedProjectTypes>
-					        <supportedProjectType>jar</supportedProjectType>
-					        <supportedProjectType>bundle</supportedProjectType>
-					        <supportedProjectType>war</supportedProjectType>
-				        </supportedProjectTypes>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
+
         <extensions>
             <extension>
                 <groupId>org.apache.maven.wagon</groupId>
@@ -226,6 +215,7 @@
                 <version>1.0-beta-6</version>
             </extension>
         </extensions>
+
     </build>
 
     <!-- Global Dependencies for Testing Facilities -->
@@ -289,28 +279,10 @@
             </dependency>
             <dependency>
                 <groupId>org.apache.felix</groupId>
-                <artifactId>org.apache.felix.dependencymanager.shell</artifactId>
-                <version>${felix.dependencymanager.version}</version>
-                <scope>provided</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.felix</groupId>
                 <artifactId>org.apache.felix.configadmin</artifactId>
                 <version>${felix.configadmin.version}</version>
                 <scope>provided</scope>
             </dependency>
-            <dependency>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>org.apache.felix.eventadmin</artifactId>
-                <version>${felix.eventadmin.version}</version>
-                <scope>provided</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>org.apache.felix.deploymentadmin</artifactId>
-                <version>${felix.deploymentadmin.version}</version>
-                <scope>provided</scope>
-            </dependency>
 
             <!-- Servlet API -->
             <dependency>
@@ -333,7 +305,7 @@
                 <groupId>net.sf.kxml</groupId>
                 <artifactId>kxml2</artifactId>
                 <version>${kxml2.version}</version>
-                <scope>provided</scope>                
+                <scope>provided</scope>
             </dependency>
 
             <!-- XPP3 -->
@@ -383,12 +355,12 @@
                 <version>${junit.version}</version>
                 <scope>test</scope>
             </dependency>
-			<dependency>
-			    <groupId>org.apache.maven.surefire</groupId>
-			    <artifactId>surefire-testng</artifactId>
-			    <version>${surefire.testng.version}</version>
+            <dependency>
+                <groupId>org.apache.maven.surefire</groupId>
+                <artifactId>surefire-testng</artifactId>
+                <version>${surefire.testng.version}</version>
                 <scope>test</scope>
-			</dependency>
+            </dependency>
             <dependency>
                 <groupId>org.easymock</groupId>
                 <artifactId>easymock</artifactId>



Mime
View raw message