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-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org