commit 72593da50812a05cc2ab364140e7eda478ecd9d9
author Guillaume Nodet <gnodet@apache.org> Fri Mar 26 14:02:26 2010 +0000
committer Guillaume Nodet <gnodet@apache.org> Fri Mar 26 14:02:26 2010 +0000
tree 455c0b89cb25238dfed5079451a16b973699ed1b
parent 8668736ec6bb05bdc9ef274bd31142eaea0ddc2c

Try to fix the build from the whole trunk

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

build.xml

diff --git a/build.xml b/build.xml
index 8abfee9..d96082a 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=obr clean" />
+        </exec>
+        <exec executable="${mvn}" failonerror="true">
             <arg line="-Dpackaging=plugins clean" />
         </exec>
         <exec executable="${mvn}" failonerror="true">
@@ -46,6 +49,9 @@
     </target>
     <target name="install" depends="init">
         <exec executable="${mvn}" failonerror="true">
+            <arg line="-Dpackaging=obr install" />
+        </exec>
+        <exec executable="${mvn}" failonerror="true">
             <arg line="-Dpackaging=plugins install" />
         </exec>
         <exec executable="${mvn}" failonerror="true">
@@ -66,6 +72,9 @@
     </target>
     <target name="all" depends="init">
         <exec executable="${mvn}" failonerror="true">
+            <arg line="-Dpackaging=obr clean install" />
+        </exec>
+        <exec executable="${mvn}" failonerror="true">
             <arg line="-Dpackaging=plugins clean install" />
         </exec>
         <exec executable="${mvn}" failonerror="true">

pom.xml

diff --git a/pom.xml b/pom.xml
index 4bb2414..bf3f106 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,6 +54,20 @@
   <profiles>
 
     <profile>
+      <id>packaging-obr</id>
+      <activation>
+        <property>
+          <name>packaging</name>
+          <value>obr</value>
+        </property>
+      </activation>
+      <modules>
+        <module>utils</module>
+        <module>bundlerepository</module>
+     </modules>
+   </profile>
+
+    <profile>
       <id>packaging-plugins</id>
       <activation>
         <property>
@@ -63,8 +77,6 @@
       </activation>
       <modules>
         <module>maven-obr-plugin</module>
-        <module>utils</module>
-        <module>bundlerepository</module>
         <module>bundleplugin</module>
         <module>scr-annotations</module>
         <module>scrplugin</module>
@@ -107,8 +119,6 @@
         <module>shell.gui.plugin</module>
         <module>shell.remote</module>
         <module>org.osgi.service.obr</module>
-        <module>utils</module>
-        <module>bundlerepository</module>
         <module>log</module>
         <module>eventadmin</module>
         <module>http</module>