brett       2004/04/12 15:47:49

  Modified:    jar      plugin.jelly
               jar/xdocs changes.xml
  Log:
  PR: MPJAR-17
  revert maven.final.name after usage of snapshots
  
  Revision  Changes    Path
  1.32      +4 -0      maven-plugins/jar/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /home/cvs/maven-plugins/jar/plugin.jelly,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- plugin.jelly      10 Apr 2004 02:22:12 -0000      1.31
  +++ plugin.jelly      12 Apr 2004 22:47:49 -0000      1.32
  @@ -159,6 +159,7 @@
   
       <maven:snapshot project="${pom}"/>    
   
  +    <j:set var="oldMavenFinalName" value="${maven.final.name}" />
       <j:set var="maven.final.name" value="${snapshotSignature}"/>
       <ant:echo>Building snapshot JAR: ${maven.final.name}</ant:echo>
       
  @@ -193,6 +194,7 @@
         assureDirectoryCommand="mkdir -p"
         siteCommand="cd @deployDirectory@; chmod g+w ${maven.jar.to.deploy}; chgrp 
${maven.remote.group} ${maven.jar.to.deploy}; ln -sf ${maven.jar.to.deploy} 
${pom.artifactId}-SNAPSHOT.jar; echo ${snapshotVersion} > 
${pom.artifactId}-snapshot-version"
       />
  +    <j:set var="maven.final.name" value="${oldMavenFinalName}" />
                       
     </goal>
   
  @@ -266,5 +268,7 @@
         file="${maven.build.dir}/${maven.final.name}.jar"
         tofile="${jardir__}/${maven.final.name}.jar"
       />
  +
  +    <j:set var="maven.final.name" value="${oldMavenFinalName}" />
     </goal>
   </project>
  
  
  
  1.12      +3 -0      maven-plugins/jar/xdocs/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/maven-plugins/jar/xdocs/changes.xml,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- changes.xml       4 Mar 2004 18:35:27 -0000       1.11
  +++ changes.xml       12 Apr 2004 22:47:49 -0000      1.12
  @@ -25,6 +25,9 @@
       <author email="[EMAIL PROTECTED]">dIon Gillard</author>
     </properties>
     <body>
  +    <release version="1.5-SNAPSHOT" date="in CVS">
  +      <action dev="brett" type="fix" issue="MPJAR-17">revert maven.final.name to 
previuous value after executing jar:snapshot related goals.</action>
  +    </release>
       <release version="1.4" date="2004-02-27">
         <action dev="dion" type="update">Remove old nav (current etc) as it was 
confusing people. Implement maven.jar.includes as per Eric Giguere's 
suggestion.</action>
         <action dev="neilc" type="update">Added manifest Class-Path, specified by 
setting property jar.manifest.classpath on dependency artifacts in 
project.xml.</action>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to