Title: [925] trunk/etc: Update build so that the "default" goal does not clean all subprojects.

Diff

Modified: trunk/assembly/maven.xml (924 => 925)

--- trunk/assembly/maven.xml	2005-11-24 10:01:48 UTC (rev 924)
+++ trunk/assembly/maven.xml	2005-11-24 10:23:41 UTC (rev 925)
@@ -36,7 +36,7 @@
     <!-- ==================== -->
     <goal name="nightly" prereqs="clean, jar:install, jar:deploy, dist:deploy"/>
     
-    <goal name="default" prereqs="clean, jar:install, dist:build-bin"/>
+    <goal name="default" prereqs="jar:install, dist:build-bin"/>
     
     <goal name="prepare"
         prereqs="dist:prepare-bin-filesystem"/>

Modified: trunk/assembly/project.xml (924 => 925)

--- trunk/assembly/project.xml	2005-11-24 10:01:48 UTC (rev 924)
+++ trunk/assembly/project.xml	2005-11-24 10:23:41 UTC (rev 925)
@@ -65,6 +65,31 @@
     </dependency>
     
     <dependency>
+      <groupId>servicemix</groupId>
+      <artifactId>servicemix-wsn</artifactId>
+      <version>${pom.currentVersion}</version>
+      <properties>
+        <eclipse.dependency>true</eclipse.dependency>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>servicemix</groupId>
+      <artifactId>servicemix-jsr181</artifactId>
+      <version>${pom.currentVersion}</version>
+      <properties>
+        <eclipse.dependency>true</eclipse.dependency>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>servicemix</groupId>
+      <artifactId>servicemix-jms</artifactId>
+      <version>${pom.currentVersion}</version>
+      <properties>
+        <eclipse.dependency>true</eclipse.dependency>
+      </properties>
+    </dependency>
+    
+    <dependency>
       <groupId>org.xbean</groupId>
       <artifactId>xbean-spring</artifactId>
       <version>${xbean_version}</version>

Modified: trunk/components/base/maven.xml (924 => 925)

--- trunk/components/base/maven.xml	2005-11-24 10:01:48 UTC (rev 924)
+++ trunk/components/base/maven.xml	2005-11-24 10:23:41 UTC (rev 925)
@@ -5,6 +5,4 @@
     xmlns:util="jelly:util"
     xmlns:artifact="artifact">
 
-  <goal name="default" prereqs="clean, jar:install"/>
-
 </project>

Modified: trunk/components/jaxws/maven.xml (924 => 925)

--- trunk/components/jaxws/maven.xml	2005-11-24 10:01:48 UTC (rev 924)
+++ trunk/components/jaxws/maven.xml	2005-11-24 10:23:41 UTC (rev 925)
@@ -5,6 +5,4 @@
     xmlns:util="jelly:util"
     xmlns:artifact="artifact">
 
-  <goal name="default" prereqs="clean, jar:install"/>
-
 </project>

Modified: trunk/components/xfire/maven.xml (924 => 925)

--- trunk/components/xfire/maven.xml	2005-11-24 10:01:48 UTC (rev 924)
+++ trunk/components/xfire/maven.xml	2005-11-24 10:23:41 UTC (rev 925)
@@ -5,6 +5,4 @@
     xmlns:util="jelly:util"
     xmlns:artifact="artifact">
 
-  <goal name="default" prereqs="clean, jar:install"/>
-
 </project>

Modified: trunk/etc/maven.xml (924 => 925)

--- trunk/etc/maven.xml	2005-11-24 10:01:48 UTC (rev 924)
+++ trunk/etc/maven.xml	2005-11-24 10:23:41 UTC (rev 925)
@@ -10,7 +10,7 @@
     <touch file="${maven.repo.local}/servicemix/jars/${pom.artifactId}-${pom.currentVersion}.jar"/>
   </postGoal>
   
-  <goal name="default" prereqs="clean, jar:install"/>
+  <goal name="default" prereqs="jar:install"/>
 
   <goal name="nightly" prereqs="clean, jar:install, jar:deploy"/>
 

Modified: trunk/servicemix-console/maven.xml (924 => 925)

--- trunk/servicemix-console/maven.xml	2005-11-24 10:01:48 UTC (rev 924)
+++ trunk/servicemix-console/maven.xml	2005-11-24 10:23:41 UTC (rev 925)
@@ -3,7 +3,7 @@
 <project default="default"
     xmlns:ant="jelly:ant">
 
-  <goal name="default" prereqs="clean, war:install"/>
+  <goal name="default" prereqs="war:install"/>
 
   <goal name="nightly" prereqs="clean, war:install, war:deploy"/>
 

Modified: trunk/servicemix-jms/maven.xml (924 => 925)

--- trunk/servicemix-jms/maven.xml	2005-11-24 10:01:48 UTC (rev 924)
+++ trunk/servicemix-jms/maven.xml	2005-11-24 10:23:41 UTC (rev 925)
@@ -3,7 +3,7 @@
 <project default="default"
     xmlns:ant="jelly:ant">
 
-  <goal name="default" prereqs="clean, jbi:install"/>
+  <goal name="default" prereqs="jbi:install"/>
 
   <goal name="nightly" prereqs="clean, jbi:install, jbi:deploy"/>
 

Modified: trunk/servicemix-jsr181/maven.xml (924 => 925)

--- trunk/servicemix-jsr181/maven.xml	2005-11-24 10:01:48 UTC (rev 924)
+++ trunk/servicemix-jsr181/maven.xml	2005-11-24 10:23:41 UTC (rev 925)
@@ -3,7 +3,7 @@
 <project default="default"
     xmlns:ant="jelly:ant">
 
-  <goal name="default" prereqs="clean, jbi:install"/>
+  <goal name="default" prereqs="jbi:install"/>
 
   <goal name="nightly" prereqs="clean, jbi:install, jbi:deploy"/>
 

Modified: trunk/tooling/maven-jbi-plugin/maven.xml (924 => 925)

--- trunk/tooling/maven-jbi-plugin/maven.xml	2005-11-24 10:01:48 UTC (rev 924)
+++ trunk/tooling/maven-jbi-plugin/maven.xml	2005-11-24 10:23:41 UTC (rev 925)
@@ -6,7 +6,7 @@
   xmlns:ant="jelly:ant"
   xmlns:maven="jelly:maven">
 
-  <goal name="default" prereqs="clean, plugin:repository-install, plugin:install-now"/>
+  <goal name="default" prereqs="plugin:repository-install, plugin:install-now"/>
 
   <goal name="nightly" prereqs="clean, plugin:repository-install, plugin:install-now, plugin:repository-deploy"/>
 

Modified: trunk/ws/jaxws/wsnotification/maven.xml (924 => 925)

--- trunk/ws/jaxws/wsnotification/maven.xml	2005-11-24 10:01:48 UTC (rev 924)
+++ trunk/ws/jaxws/wsnotification/maven.xml	2005-11-24 10:23:41 UTC (rev 925)
@@ -1,16 +1,3 @@
 <project default="default" xmlns:j="jelly:core" xmlns:ant="jelly:ant" xmlns:maven="jelly:maven">
 
-  <goal name="default">
-    <attainGoal name="clean" />
-    <attainGoal name="jar:install" />
-  </goal>
-
-  <goal name="setclasspath">
-    <path id="test.classpath">
-      <pathelement path="${maven.build.dest}"/>
-      <pathelement path="target/classes"/>
-      <pathelement path="target/test-classes"/>
-      <path refid="maven.dependency.classpath"/>
-    </path>
-  </goal>
 </project>

Modified: trunk/ws/jaxws/wspojo/maven.xml (924 => 925)

--- trunk/ws/jaxws/wspojo/maven.xml	2005-11-24 10:01:48 UTC (rev 924)
+++ trunk/ws/jaxws/wspojo/maven.xml	2005-11-24 10:23:41 UTC (rev 925)
@@ -1,10 +1,5 @@
 <project default="default" xmlns:j="jelly:core" xmlns:ant="jelly:ant" xmlns:maven="jelly:maven">
 
-  <goal name="default">
-    <attainGoal name="clean"/>
-    <attainGoal name="jar:install"/>
-  </goal>
-
   <preGoal name="java:compile">
     <attainGoal name="jaxws:compile"/>
   </preGoal>

Modified: trunk/ws/jaxws/wsrm/maven.xml (924 => 925)

--- trunk/ws/jaxws/wsrm/maven.xml	2005-11-24 10:01:48 UTC (rev 924)
+++ trunk/ws/jaxws/wsrm/maven.xml	2005-11-24 10:23:41 UTC (rev 925)
@@ -1,16 +1,3 @@
 <project default="default" xmlns:j="jelly:core" xmlns:ant="jelly:ant" xmlns:maven="jelly:maven">
 
-  <goal name="default">
-    <attainGoal name="clean" />
-    <attainGoal name="jar:install" />
-  </goal>
-
-  <goal name="setclasspath">
-    <path id="test.classpath">
-      <pathelement path="${maven.build.dest}"/>
-      <pathelement path="target/classes"/>
-      <pathelement path="target/test-classes"/>
-      <path refid="maven.dependency.classpath"/>
-    </path>
-  </goal>
 </project>

Reply via email to