commit 430f335b8d60b4d39ece0539385d34a146b23413
author Richard S. Hall <rickhall@apache.org> Wed Mar 28 14:27:28 2007 +0000
committer Richard S. Hall <rickhall@apache.org> Wed Mar 28 14:27:28 2007 +0000
tree efae3b0e8a37d152ac8648a35f1ada80ad9a46b5
parent 7becaf5f38f3881e798beb01ffdc2c8cb7f34c9f

Applied patch (FELIX-263) to fix a build issue with Maven 2.0.5.


git-svn-id: https://svn.apache.org/repos/asf/incubator/felix/trunk@523342 13f79535-47bb-0310-9956-ffa450edef68

build.xml

diff --git a/build.xml b/build.xml
index c7b06c9..064be75 100644
--- a/build.xml
+++ b/build.xml
@@ -29,6 +29,9 @@
     </target>
     <target name="clean" depends="init">
         <exec executable="${mvn}" failonerror="true">
+            <arg line="-Dpackaging=plugins clean" />
+        </exec>
+        <exec executable="${mvn}" failonerror="true">
             <arg line="-Dpackaging=bundle clean" />
         </exec>
         <exec executable="${mvn}" failonerror="true">
@@ -43,6 +46,9 @@
     </target>
     <target name="install" depends="init">
         <exec executable="${mvn}" failonerror="true">
+            <arg line="-Dpackaging=plugins install" />
+        </exec>
+        <exec executable="${mvn}" failonerror="true">
             <arg line="-Dpackaging=bundle install" />
         </exec>
         <exec executable="${mvn}" failonerror="true">
@@ -57,6 +63,9 @@
     </target>
     <target name="all" depends="init">
         <exec executable="${mvn}" failonerror="true">
+            <arg line="-Dpackaging=plugins clean install" />
+        </exec>
+        <exec executable="${mvn}" failonerror="true">
             <arg line="-Dpackaging=bundle clean install" />
         </exec>
         <exec executable="${mvn}" failonerror="true">

pom.xml

diff --git a/pom.xml b/pom.xml
index a74f0b2..82a62cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,6 +85,21 @@
   <profiles>
 
     <profile>
+      <id>packaging-plugins</id>
+      <activation>
+        <property>
+          <name>packaging</name>
+          <value>plugins</value>
+        </property>
+      </activation>
+      <modules>
+        <module>tools/maven2/maven-bundle-plugin</module>
+        <module>tools/maven2/maven-osgi-plugin</module>
+        <module>ipojo.plugin</module>
+      </modules>
+    </profile>
+
+    <profile>
       <id>packaging-ipojo-bundle</id>
       <activation>
         <property>
@@ -107,7 +122,6 @@
       </activation>
       <modules>
         <module>org.osgi.foundation</module>
-        <module>tools/maven2/maven-bundle-plugin</module>
         <module>javax.servlet</module>
         <module>org.osgi.core</module>
         <module>org.osgi.compendium</module>
@@ -134,7 +148,6 @@
         </property>
       </activation>
       <modules>
-        <module>tools/maven2/maven-osgi-plugin</module>
         <module>shell.gui</module>
         <module>shell.gui.plugin</module>
         <module>org.apache.felix.daemon</module>
@@ -157,7 +170,6 @@
 
         <module>ipojo</module>
         <module>ipojo.metadata</module>
-        <module>ipojo.plugin</module>
       </modules>
     </profile>