[tomcat] branch 8.5.x updated: Use correct version number when writing mvn.properties. Notify the user which files were created.

[schultz]

This is an automated email from the ASF dual-hosted git repository.

schultz pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/8.5.x by this push:
     new fb4819de89 Use correct version number when writing mvn.properties. 
Notify the user which files were created.
fb4819de89 is described below

commit fb4819de89aedc82e76d1e7cc41f5598d914c8f2
Author: Christopher Schultz <ch...@christopherschultz.net>
AuthorDate: Thu Jun 9 08:53:06 2022 -0400

    Use correct version number when writing mvn.properties. Notify the user 
which files were created.
---
 build.xml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/build.xml b/build.xml
index 66539dce2d..87294ea2d3 100644
--- a/build.xml
+++ b/build.xml
@@ -2304,12 +2304,18 @@ release.os=${os.arch} ${os.name} ${os.version}
 release.default.file.encoding=${file.encoding}
 release.ant.version=${ant.version}
 </echo>
+    <echo>Wrote file build-release.properties</echo>
+    <!-- Note that res/maven/mvn.properties is ignored by git and won't show
+         up as a "new file". We use 
${version.major}.${version.minor}.${version.build}
+         instead of ${version} to explicitly remove the version suffix,
+         because we are preparing a release build. -->
     <echo file="res/maven/mvn.properties">
 asf.ldap.username=${release.asfusername}
 gpg.exec=${gpg.exec}
-maven.asf.release.deploy.version=${version}
+maven.asf.release.deploy.version=${version.major}.${version.minor}.${version.build}
 </echo>
-  <replace file="webapps/docs/changelog.xml" token="rtext=&quot;in 
development&quot;" value="rtext=&quot;release in progress&quot;" />
+    <echo>Wrote file res/maven/mvn.properties</echo>
+    <replace file="webapps/docs/changelog.xml" token="rtext=&quot;in 
development&quot;" value="rtext=&quot;release in progress&quot;" />
   </target>
 
   <target name="release"


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