felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rickh...@apache.org
Subject svn commit: r523342 - in /incubator/felix/trunk: build.xml pom.xml
Date Wed, 28 Mar 2007 14:27:29 GMT
Author: rickhall
Date: Wed Mar 28 07:27:28 2007
New Revision: 523342

URL: http://svn.apache.org/viewvc?view=rev&rev=523342
Log:
Applied patch (FELIX-263) to fix a build issue with Maven 2.0.5.

Modified:
    incubator/felix/trunk/build.xml
    incubator/felix/trunk/pom.xml

Modified: incubator/felix/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/build.xml?view=diff&rev=523342&r1=523341&r2=523342
==============================================================================
--- incubator/felix/trunk/build.xml (original)
+++ incubator/felix/trunk/build.xml Wed Mar 28 07:27:28 2007
@@ -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">
@@ -56,6 +62,9 @@
         </exec>
     </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>

Modified: incubator/felix/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/pom.xml?view=diff&rev=523342&r1=523341&r2=523342
==============================================================================
--- incubator/felix/trunk/pom.xml (original)
+++ incubator/felix/trunk/pom.xml Wed Mar 28 07:27:28 2007
@@ -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>
 



Mime
View raw message