[jboss-cvs] JBossAS SVN: r85801 - in trunk: build and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: pgier
Date: 2009-03-12 22:32:10 -0400 (Thu, 12 Mar 2009)
New Revision: 85801

Modified:
   trunk/build/build.xml
   trunk/pom.xml
   trunk/thirdparty/pom.xml
Log:
Make thirdparty generation part of the maven build.

Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml	2009-03-13 02:29:10 UTC (rev 85800)
+++ trunk/build/build.xml	2009-03-13 02:32:10 UTC (rev 85801)
@@ -932,7 +932,7 @@
 
   <!-- Clean up all build output -->
   <target name="clean" description="Cleans up most generated files."
-          depends="checkthirdparty, maven-clean, _buildmagic:clean, 
+          depends="maven-clean, _buildmagic:clean, 
                    modules-clean">
   </target>
 
@@ -950,10 +950,10 @@
   <target name="main" depends="most"
 	  description="Executes the default target (most)."/>
 
-  <target name="all" depends="createthirdparty, maven-install, modules-all, install"
+  <target name="all" depends="maven-install, modules-all, install"
 	  description="Executes all modules and builds everything."/>
 
-  <target name="most" depends="createthirdparty, maven-install, modules-most, install"
+  <target name="most" depends="maven-install, modules-most, install"
 	  description="Executes all modules and builds most everything."/>
 
   <target name="release" depends="most" />
@@ -992,17 +992,6 @@
     <echo message="Maven Home set to ${maven.home}"/>
   </target>
   
-  <target name="checkthirdparty">
-    <if>
-      <not>
-        <available file="${basedir}/../thirdparty/libraries.ent"/>
-      </not>
-      <then>
-        <antcall target="createthirdparty"/>
-      </then>
-    </if>
-  </target>
-  
    <!-- Call maven to create the thirdparty folder from artifacts in the maven repository -->
    <target name="createthirdparty" unless="inhibit.downloads"
       depends="maven-init, init, check.inhibit.downloads, set.proxy">

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2009-03-13 02:29:10 UTC (rev 85800)
+++ trunk/pom.xml	2009-03-13 02:32:10 UTC (rev 85801)
@@ -356,6 +356,7 @@
       </activation>
       <modules>
         <module>component-matrix</module>
+        <module>thirdparty</module>
         <module>main</module>
         <module>system</module>
         <module>system-jmx</module>

Modified: trunk/thirdparty/pom.xml
===================================================================
--- trunk/thirdparty/pom.xml	2009-03-13 02:29:10 UTC (rev 85800)
+++ trunk/thirdparty/pom.xml	2009-03-13 02:32:10 UTC (rev 85801)
@@ -1978,6 +1978,7 @@
                   <goal>sources</goal>
                 </goals>
                 <configuration>
+                  <markersDirectory>${basedir}/dependency-maven-plugin-markers</markersDirectory>
                   <silent>true</silent>
                 </configuration>
               </execution>