From 69f3b9fc2eeb98b2711960fd147856c1dac6efe6 Mon Sep 17 00:00:00 2001
From: brett <brett@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 12 Apr 2004 22:47:49 +0000
Subject: [PATCH] PR: MPJAR-17 revert maven.final.name after usage of snapshots

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@115003 13f79535-47bb-0310-9956-ffa450edef68
---
 jar/plugin.jelly      | 4 ++++
 jar/xdocs/changes.xml | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/jar/plugin.jelly b/jar/plugin.jelly
index 4c4197c2..ce500b8c 100644
--- a/jar/plugin.jelly
+++ b/jar/plugin.jelly
@@ -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>
diff --git a/jar/xdocs/changes.xml b/jar/xdocs/changes.xml
index be422cba..5d872516 100644
--- a/jar/xdocs/changes.xml
+++ b/jar/xdocs/changes.xml
@@ -25,6 +25,9 @@
     <author email="dion@apache.org">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>