[prev in list] [next in list] [prev in thread] [next in thread] 

List:       avalon-cvs
Subject:    cvs commit: avalon/util/plugin project.xml
From:       mcconnell () apache ! org
Date:       2004-01-31 12:25:00
Message-ID: 20040131122500.15354.qmail () minotaur ! apache ! org
[Download RAW message or body]

mcconnell    2004/01/31 04:25:00

  Modified:    util     .cvsignore maven.xml project.xml
               util/plugin project.xml
  Added:       util     README.txt
  Log:
  Update the build procedure to address the following:
  1. more consitent naming convention of distribution artifacts
  2. automated signed of distributions and jars
  3. renaming of the avalon-util plugin from avalon-plugin to avalon-util-plugin
  4. readme containing notes about changes needed to maven/plugins
  
  Revision  Changes    Path
  1.2       +3 -1      avalon/util/.cvsignore
  
  Index: .cvsignore
  ===================================================================
  RCS file: /home/cvs/avalon/util/.cvsignore,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- .cvsignore	3 Dec 2003 04:58:13 -0000	1.1
  +++ .cvsignore	31 Jan 2004 12:24:59 -0000	1.2
  @@ -3,4 +3,6 @@
   build.properties
   target
   .classpath
  -.project
  \ No newline at end of file
  +.project
  +build.properties
  +build.xml
  \ No newline at end of file
  
  
  
  1.6       +90 -20    avalon/util/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/avalon/util/maven.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- maven.xml	11 Dec 2003 09:23:10 -0000	1.5
  +++ maven.xml	31 Jan 2004 12:25:00 -0000	1.6
  @@ -1,7 +1,18 @@
   <project default="avalon:build" xmlns:maven="jelly:maven" xmlns:j="jelly:core" \
xmlns:util="jelly:util" xmlns:ant="jelly:ant">  
  -  <ant:property name="pom.organization.identifier" value="ASF"/>
  -  <ant:property name="pom.specificationVersion" value="1.0"/>
  +  <!--
  +  ==============================================================================
  +  switches 
  +  ==============================================================================
  +  -->
  +
  +  <ant:property name="avalon.snapshot" value="true"/>
  +
  +  <!--
  +  ==============================================================================
  +  dependent properties 
  +  ==============================================================================
  +  -->
   
     <ant:property name="maven.dist.assembly.dir"
       value="${maven.build.dir}/temp"/>
  @@ -16,6 +27,20 @@
     <ant:property name="maven.dist.dir"
       value="${maven.build.dir}/distributions"/>
   
  +  <!--
  +  ==============================================================================
  +  structural properties 
  +  ==============================================================================
  +  -->
  +
  +  <ant:property name="pom.organization.identifier" value="ASF"/>
  +  <ant:property name="pom.specificationVersion" value="1.0"/>
  +
  +  <!--
  +  ==============================================================================
  +  build the utilities package
  +  ==============================================================================
  +  -->
   
     <goal name="avalon:build" description="Build the Repository.">
   
  @@ -26,13 +51,26 @@
         banner="Building:"
         ignoreFailures="false"
         postProcessing="true" />
  -    <ant:copy todir="${maven.build.dir}">
  +    <ant:copy todir="${maven.build.dir}/jars">
         <j:forEach var="child" items="${reactorProjects}">
           <ant:fileset dir="${child.file.parentFile}/target">
             <ant:include name="${child.artifactId}-${child.currentVersion}.jar"/>
           </ant:fileset>
         </j:forEach>
       </ant:copy>
  +    <j:forEach var="child" items="${reactorProjects}">
  +      <j:set var="path" 
  +          value="${child.artifactId}-${child.currentVersion}.jar"/>
  +      <checksum file="${maven.build.dir}/jars/${path}"/>
  +      <j:if test="${maven.gpg.exe != ''}">
  +        <ant:exec executable="${maven.gpg.exec}">
  +          <ant:arg value="--armour"/>
  +          <ant:arg value="--yes"/>
  +          <ant:arg value="-b"/>
  +          <ant:arg value="${maven.build.dir}/jars/${path}"/>
  +        </ant:exec>
  +      </j:if>
  +    </j:forEach>
     </goal>
   
     <goal name="avalon:clean" prereqs="clean">
  @@ -42,7 +80,7 @@
         excludes="project.xml,**/target/**"
         goals="clean:clean"
         banner="Cleaning subproject:"
  -      ignoreFailures="false"/>
  +      ignoreFailures="true"/>
     </goal>
   
     <goal name="avalon:site">
  @@ -72,6 +110,18 @@
       description="Set up directories for a distribution build">
       <ant:delete dir="${maven.dist.dir}"/>
       <ant:mkdir dir="${maven.dist.dir}"/>
  +    <j:choose>
  +      <j:when test="${avalon.snapshot}">
  +        <maven:snapshot project="${pom}"/>
  +        <j:set var="timestamp" value="${snapshotSignature.substring(12)}"/>
  +        <j:set var="build.name" value="${maven.final.name}-${timestamp}"/>
  +        <echo>Snapshot Packaging: ${timestamp}</echo>
  +      </j:when>
  +      <j:otherwise>
  +        <j:set var="build.name" value="${maven.final.name}"/>
  +        <echo>Release Packaging: ${pom.currentVersion}</echo>
  +      </j:otherwise>
  +    </j:choose>
     </goal>
   
   
  @@ -81,22 +131,31 @@
       description="Build the binary distribution.">
   
       <!-- Create a tar.gz file -->
  -    <ant:tar longfile="gnu" tarfile="${maven.dist.dir}/${maven.final.name}.tar">
  +    <ant:tar longfile="gnu" tarfile="${maven.dist.dir}/${build.name}-bin.tar">
         <ant:tarfileset dir="${maven.dist.bin.archive.dir}"/>
       </ant:tar>
  -
       <ant:gzip 
  -      zipfile="${maven.dist.dir}/${maven.final.name}.tar.gz"
  -      src="${maven.dist.dir}/${maven.final.name}.tar"
  +      zipfile="${maven.dist.dir}/${build.name}-bin.tar.gz"
  +      src="${maven.dist.dir}/${build.name}-bin.tar"
       />
  -    <checksum file="${maven.dist.dir}/${maven.final.name}.tar.gz"/>
  -    <ant:delete file="${maven.dist.dir}/${maven.final.name}.tar"/>
  +    <ant:delete file="${maven.dist.dir}/${build.name}-bin.tar"/>
  +    <checksum file="${maven.dist.dir}/${build.name}-bin.tar.gz"/>
  +    <ant:exec executable="${maven.gpg.exec}">
  +      <ant:arg value="--armour"/>
  +      <ant:arg value="-b"/>
  +      <ant:arg value="${maven.dist.dir}/${build.name}-bin.tar.gz"/>
  +    </ant:exec>
   
       <!-- Create a zip file -->
  -    <ant:zip zipfile="${maven.dist.dir}/${maven.final.name}.zip">
  +    <ant:zip zipfile="${maven.dist.dir}/${build.name}-bin.zip">
         <ant:zipfileset dir="${maven.dist.bin.archive.dir}"/>
       </ant:zip>
  -    <checksum file="${maven.dist.dir}/${maven.final.name}.zip"/>
  +    <checksum file="${maven.dist.dir}/${build.name}-bin.zip"/>
  +    <ant:exec executable="${maven.gpg.exec}">
  +      <ant:arg value="--armour"/>
  +      <ant:arg value="-b"/>
  +      <ant:arg value="${maven.dist.dir}/${build.name}-bin.zip"/>
  +    </ant:exec>
     </goal>
   
     <goal
  @@ -105,21 +164,31 @@
       description="Build the source distribution.">
    
       <!-- Create a tar.gz file -->
  -    <ant:tar longfile="gnu" \
tarfile="${maven.dist.dir}/${maven.final.name}-src.tar">  +    <ant:tar \
longfile="gnu" tarfile="${maven.dist.dir}/${build.name}-src.tar">  <ant:tarfileset \
dir="${maven.dist.src.archive.dir}"/>  </ant:tar>
       <ant:gzip 
  -      zipfile="${maven.dist.dir}/${maven.final.name}-src.tar.gz" 
  -      src="${maven.dist.dir}/${maven.final.name}-src.tar"
  +      zipfile="${maven.dist.dir}/${build.name}-src.tar.gz" 
  +      src="${maven.dist.dir}/${build.name}-src.tar"
       />
  -    <checksum file="${maven.dist.dir}/${maven.final.name}-src.tar.gz"/>
  -    <ant:delete file="${maven.dist.dir}/${maven.final.name}-src.tar"/>
  +    <ant:delete file="${maven.dist.dir}/${build.name}-src.tar"/>
  +    <checksum file="${maven.dist.dir}/${build.name}-src.tar.gz"/>
  +    <ant:exec executable="${maven.gpg.exec}">
  +      <ant:arg value="--armour"/>
  +      <ant:arg value="-b"/>
  +      <ant:arg value="${maven.dist.dir}/${build.name}-src.tar.gz"/>
  +    </ant:exec>
   
       <!-- Create a zip file -->
  -    <ant:zip zipfile="${maven.dist.dir}/${maven.final.name}-src.zip">
  +    <ant:zip zipfile="${maven.dist.dir}/${build.name}-src.zip">
         <ant:zipfileset dir="${maven.dist.src.archive.dir}"/>
       </ant:zip>
  -    <checksum file="${maven.dist.dir}/${maven.final.name}-src.zip"/>
  +    <checksum file="${maven.dist.dir}/${build.name}-src.zip"/>
  +    <ant:exec executable="${maven.gpg.exec}">
  +      <ant:arg value="--armour"/>
  +      <ant:arg value="-b"/>
  +      <ant:arg value="${maven.dist.dir}/${build.name}-src.zip"/>
  +    </ant:exec>
     </goal>
   
     <goal
  @@ -136,13 +205,14 @@
       <ant:copy todir="${maven.dist.bin.assembly.dir}">
         <ant:fileset dir=".">
           <ant:include name="LICENSE*"/>
  +        <ant:include name="README*"/>
         </ant:fileset>
       </ant:copy>
   
       <!-- Copy Jars -->
       <ant:copy todir="${maven.dist.bin.assembly.dir}">
         <ant:fileset dir="${maven.build.dir}">
  -        <ant:include name="*.jar"/>
  +        <ant:include name="jars/*.*"/>
           <ant:include name="docs/**"/>
         </ant:fileset>
       </ant:copy>
  
  
  
  1.10      +1 -1      avalon/util/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/util/project.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- project.xml	21 Jan 2004 03:24:33 -0000	1.9
  +++ project.xml	31 Jan 2004 12:25:00 -0000	1.10
  @@ -7,7 +7,7 @@
     <name>Avalon Utilities</name>
     <package>org.apache.avalon.util</package>
     <shortDescription>Avalon Utilities</shortDescription>
  -  <currentVersion>1.1-SNAPSHOT</currentVersion>
  +  <currentVersion>1.1</currentVersion>
   
     <organization>
       <name>Apache Software Foundation</name>
  
  
  
  1.1                  avalon/util/README.txt
  
  Index: README.txt
  ===================================================================
  
  IMPORTANT
  
  Between version 1.0 and 1.1 (snapshot build from 20040130), the id of the 
  utilities plugin was changed from avalon-plugin to avalon-util-plugin.  
  Please check that your maven plugin directory DOES NOT contain the old
  avalon-plugin (if it does please delete the avalon-plugin-1.0.jar file and
  the avalon-plugin-1.0 directory).  
  
  To use the avalon-util-plugin please ensure that the jar file is copies to 
  you maven/plugins directory.
  
  
  1.6       +2 -2      avalon/util/plugin/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/util/plugin/project.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- project.xml	21 Jan 2004 05:40:34 -0000	1.5
  +++ project.xml	31 Jan 2004 12:25:00 -0000	1.6
  @@ -4,9 +4,9 @@
     <extend>${basedir}/../project.xml</extend>
     <pomVersion>3</pomVersion>
     <groupId>avalon-util</groupId>
  -  <id>avalon-plugin</id>
  +  <id>avalon-util-plugin</id>
     <name>Avalon Plugin</name>
  -  <currentVersion>1.0</currentVersion>
  +  <currentVersion>1.0-SNAPSHOT</currentVersion>
     <description>Avalon Plugin for Maven</description>
     <shortDescription>Avalon Plugin</shortDescription>
     <package>org.apache.avalon</package>
  
  
  

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


[prev in list] [next in list] [prev in thread] [next in thread]