You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by kk...@apache.org on 2011/12/16 23:25:18 UTC
svn commit: r1215319 - in /tomcat/tc6.0.x/trunk: res/maven/mvn-pub.xml
webapps/docs/changelog.xml
Author: kkolinko
Date: Fri Dec 16 22:25:18 2011
New Revision: 1215319
URL: http://svn.apache.org/viewvc?rev=1215319&view=rev
Log:
Followup to r1215167
Fix copy-pasted description
Correct changelog entry
a) It is in 6.0.36
b) Mention https://issues.apache.org/bugzilla/show_bug.cgi?id=49402
The juli publishing bug fixed by this commit was introduced by r762906 in April 2009
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=1215319&r1=1215318&r2=1215319&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 22:25:18 2011
@@ -120,7 +120,7 @@
<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"/>
+ <attribute name="jarFileDir" default="${tomcat.lib.path}" description="only need to be specified if not same as tomcat.lib.path"/>
<sequential>
<antcall target="maven-deploy">
<param name="file" value="@{jarFileDir}/@{jarFileName}"/>
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=1215319&r1=1215318&r2=1215319&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Dec 16 22:25:18 2011
@@ -43,20 +43,23 @@
<!-- Section names:
General, Catalina, Coyote, Jasper, Cluster, Webapps, Other
-->
-<section name="Tomcat 6.0.35 (jfclere)" rtext="released 2011-12-05">
- <subsection name="Catalina">
+<section name="Tomcat 6.0.36 (jfclere)" rtext="">
+ <subsection name="Other">
<changelog>
<fix>
- Fix regression in decoding of parameters that contain spaces.
- Patch by Willem Fibbe. (kkolinko)
+ <bug>49402</bug>, <bug>52124</bug>: Fix Maven publishing script:
+ make sure it finds tomcat-juli.jar and use later version of
+ wagon-ssh. (jfclere)
</fix>
</changelog>
</subsection>
- <subsection name="Other">
+</section>
+<section name="Tomcat 6.0.35 (jfclere)" rtext="released 2011-12-05">
+ <subsection name="Catalina">
<changelog>
<fix>
- <bug>52124</bug>: Ensure Maven publishing process retains metadata for
- previous releases. (jfclere)
+ Fix regression in decoding of parameters that contain spaces.
+ Patch by Willem Fibbe. (kkolinko)
</fix>
</changelog>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org