Return-Path: 
 <dev-return-122724-apmail-tomcat-dev-archive=tomcat.apache.org@tomcat.apache.org>
X-Original-To: apmail-tomcat-dev-archive@www.apache.org
Delivered-To: apmail-tomcat-dev-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 2B134966D
	for <apmail-tomcat-dev-archive@www.apache.org>;
 Fri, 16 Dec 2011 14:55:41 +0000 (UTC)
Received: (qmail 6048 invoked by uid 500); 16 Dec 2011 14:55:40 -0000
Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org
Received: (qmail 5973 invoked by uid 500); 16 Dec 2011 14:55:40 -0000
Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:dev-help@tomcat.apache.org>
List-Unsubscribe: <mailto:dev-unsubscribe@tomcat.apache.org>
List-Post: <mailto:dev@tomcat.apache.org>
List-Id: <dev.tomcat.apache.org>
Reply-To: "Tomcat Developers List" <dev@tomcat.apache.org>
Delivered-To: mailing list dev@tomcat.apache.org
Received: (qmail 5964 invoked by uid 99); 16 Dec 2011 14:55:40 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 16 Dec 2011 14:55:40 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 16 Dec 2011 14:55:37 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id EB72023889E2
	for <dev@tomcat.apache.org>; Fri, 16 Dec 2011 14:55:15 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1215167 - in /tomcat/tc6.0.x/trunk:
 res/maven/mvn-pub.xml
 webapps/docs/changelog.xml
Date: Fri, 16 Dec 2011 14:55:15 -0000
To: dev@tomcat.apache.org
From: markt@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20111216145515.EB72023889E2@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: markt
Date: Fri Dec 16 14:55:15 2011
New Revision: 1215167

URL: http://svn.apache.org/viewvc?rev=1215167&view=rev
Log:
Fix the publishing side of https://issues.apache.org/bugzilla/show_bug.cgi?id=52124

Modified:
    tomcat/tc6.0.x/trunk/res/maven/mvn-pub.xml
    tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/res/maven/mvn-pub.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/maven/mvn-pub.xml?rev=1215167&r1=1215166&r2=1215167&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/res/maven/mvn-pub.xml (original)
+++ tomcat/tc6.0.x/trunk/res/maven/mvn-pub.xml Fri Dec 16 14:55:15 2011
@@ -65,7 +65,7 @@
         <pathelement location="${basedir}/maven-artifact-ant-2.0.4-dep.jar" />
       </classpath>
     </typedef>
-    <artifact:install-provider artifactId="wagon-ssh" version="1.0-beta-2"/>
+    <artifact:install-provider artifactId="wagon-ssh" version="1.0-beta-6"/>
   </target>
 
   <target name="maven-deploy" depends="init-maven">
@@ -120,9 +120,10 @@
   <macrodef name="doMavenDeploy">
     <attribute name="artifactId"/>
     <attribute name="jarFileName" default="@{artifactId}.jar" description="only need to be specified if not same as artifactId"/>
+    <attribute name="jarFileDir" default="${tomcat.lib.path}" description="only need to be specified if not same as artifactId"/>
     <sequential>
       <antcall target="maven-deploy">
-        <param name="file" value="${tomcat.lib.path}/@{jarFileName}"/>
+        <param name="file" value="@{jarFileDir}/@{jarFileName}"/>
         <param name="groupId" value="org.apache.tomcat"/>
         <param name="artifactId" value="@{artifactId}"/>
         <param name="pom" value="${tomcat.pom.path}/@{artifactId}.pom"/>
@@ -135,7 +136,7 @@
     <doMavenDeploy artifactId="servlet-api"/> <!--Deploy Servlet api-->
     <doMavenDeploy artifactId="el-api"/> <!--Deploy expression lanaguage api-->
     <doMavenDeploy artifactId="jsp-api"/> <!--Deploy JSP api-->
-    <doMavenDeploy artifactId="juli" jarFileName="tomcat-juli.jar"/> <!--Deploy JULI-->
+    <doMavenDeploy artifactId="juli" jarFileName="tomcat-juli.jar" jarFileDir="${tomcat.bin.path}"/> <!--Deploy JULI-->
     <doMavenDeploy artifactId="tribes" jarFileName="catalina-tribes.jar"/> <!--Deploy Tribes-->
     <doMavenDeploy artifactId="jasper-el"/> <!--Deploy Jasper EL-->
     <doMavenDeploy artifactId="coyote" jarFileName="tomcat-coyote.jar"/> <!--Deploy Coyote-->

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1215167&r1=1215166&r2=1215167&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Dec 16 14:55:15 2011
@@ -52,6 +52,14 @@
       </fix>
     </changelog>
   </subsection>
+  <subsection name="Other">
+    <changelog>
+      <fix>
+        <bug>52124</bug>: Ensure Maven publishing process retains metadata for
+        previous releases. (jfclere) 
+      </fix>
+    </changelog>
+  </subsection>
 </section>
 <section name="Tomcat 6.0.34 (jfclere)" rtext="not released">
   <subsection name="Catalina">



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org