avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject cvs commit: avalon/meta/tools maven.xml
Date Wed, 10 Dec 2003 09:52:35 GMT
mcconnell    2003/12/10 01:52:35

  Modified:    meta     maven.xml
  Added:       meta/api maven.xml
               meta/impl maven.xml
               meta/plugin maven.xml
               meta/spi maven.xml
               meta/tools maven.xml
  Log:
  Update to build off a default goal.
  
  Revision  Changes    Path
  1.6       +7 -21     avalon/meta/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/avalon/meta/maven.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- maven.xml	10 Dec 2003 09:51:20 -0000	1.5
  +++ maven.xml	10 Dec 2003 09:52:35 -0000	1.6
  @@ -1,4 +1,4 @@
  -<project default="avalon:plugin"  xmlns:maven="jelly:maven" xmlns:j="jelly:core" xmlns:util="jelly:util"
xmlns:ant="jelly:ant">
  +<project default="avalon:build"  xmlns:maven="jelly:maven" xmlns:j="jelly:core" xmlns:util="jelly:util"
xmlns:ant="jelly:ant">
   
     <ant:property name="meta.plugin.version" value="1.2"/>
     <ant:property name="meta.plugin.groupId" value="avalon-meta"/>   
  @@ -43,18 +43,16 @@
   The complete set of target include:
   
     avalon:clean
  -  avalon:build
  +  avalon:build ---------- default goal
     avalon:build-snapshot
     avalon:dist
  -  avalon:plugin ---------- default goal
     avalon:site
       </echo>
   
       <maven:reactor
         basedir="${basedir}"
         includes="*/project.xml"
  -      excludes="plugin/project.xml"
  -      goals="jar:install"
  +      goals=""
         banner="Building:"
         ignoreFailures="false"/>
       <ant:copy todir="${maven.build.dir}">
  @@ -70,6 +68,9 @@
         <ant:fileset dir="${basedir}/tools/target">
           <ant:include name="${pom.artifactId}-tools-${pom.currentVersion}.jar"/>
         </ant:fileset>
  +      <ant:fileset dir="${basedir}/plugin/target">
  +        <ant:include name="${pom.artifactId}-plugin-${meta.plugin.version}.jar"/>
  +      </ant:fileset>
       </ant:copy>
   
     </goal>
  @@ -84,22 +85,7 @@
         ignoreFailures="false"/>
     </goal>
   
  -  <goal name="avalon:plugin" prereqs="avalon:build">
  -    <maven:reactor
  -      basedir="${basedir}"
  -      includes="plugin/project.xml"
  -      goals="plugin:install"
  -      banner="Installing plugin:"
  -      ignoreFailures="false"
  -    />
  -    <ant:copy todir="${maven.build.dir}">
  -      <ant:fileset dir="${basedir}/plugin/target">
  -        <ant:include name="${pom.artifactId}-plugin-${meta.plugin.version}.jar"/>
  -      </ant:fileset>
  -    </ant:copy>
  -  </goal>
  -
  -  <goal name="avalon:dist" prereqs="avalon:plugin,avalon:site,xdist"/>
  +  <goal name="avalon:dist" prereqs="avalon:build,avalon:site,xdist"/>
   
     <goal name="avalon:site" prereqs="avalon:build,xsite"/>
   
  
  
  
  1.1                  avalon/meta/api/maven.xml
  
  Index: maven.xml
  ===================================================================
  <project default="jar:install">
  </project>
  
  
  
  1.1                  avalon/meta/impl/maven.xml
  
  Index: maven.xml
  ===================================================================
  <project default="jar:install">
  </project>
  
  
  
  1.1                  avalon/meta/plugin/maven.xml
  
  Index: maven.xml
  ===================================================================
  <project default="plugin:install">
  </project>
  
  
  
  1.1                  avalon/meta/spi/maven.xml
  
  Index: maven.xml
  ===================================================================
  <project default="jar:install">
  </project>
  
  
  
  1.1                  avalon/meta/tools/maven.xml
  
  Index: maven.xml
  ===================================================================
  <project default="jar:install">
  </project>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org


Mime
View raw message