[tomcat] branch main updated: Separate out the suffix and the dev marker

[ma...@apache.org]

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

markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/main by this push:
     new f316b75c22 Separate out the suffix and the dev marker
f316b75c22 is described below

commit f316b75c2291b29483877ea3e036871b3963bee4
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Jun 9 14:57:55 2022 +0100

    Separate out the suffix and the dev marker
    
    This makes the pre-release target a lot easier to implement
---
 build.properties.default |  3 ++-
 build.xml                | 10 +++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index bd93d66127..456b5e826e 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -33,7 +33,8 @@ version.major=10
 version.minor=1
 version.build=0
 version.patch=0
-version.suffix=-M17-dev
+version.suffix=-M17
+version.dev=-dev
 
 # ----- Build tools -----
 ant.version.required=1.10.2
diff --git a/build.xml b/build.xml
index 3e750e42d0..cbd86c5b9f 100644
--- a/build.xml
+++ b/build.xml
@@ -49,7 +49,7 @@
 
   <!-- Version numbers -->
   <!-- Keep in sync with webapps/docs/tomcat-docs.xsl -->
-  <property name="version"               value="${version.major}.${version.minor}.${version.build}${version.suffix}" />
+  <property name="version"               value="${version.major}.${version.minor}.${version.build}${version.suffix}${version.dev}" />
   <property name="version.number"        value="${version.major}.${version.minor}.${version.build}.${version.patch}" />
   <property name="version.major.minor"   value="${version.major}.${version.minor}" />
 
@@ -2666,8 +2666,8 @@ skip.installer property in build.properties" />
 
 # This file was auto-generated by the pre-release Ant target
 
-# Set the version-suffix to "" (empty string) as this is not a development release.
-version.suffix=
+# Set the version-dev to "" (empty string) as this is not a development release.
+version.dev=
 
 # Ensure consistent timestamps for reproducible builds
 ant.tstamp.now.iso=${tstamp.iso.release}
@@ -2710,8 +2710,8 @@ ant.tstamp.now.iso=${tstamp.iso.release}
 
 # This file was auto-generated by the pre-release Ant target
 
-# Remove version-suffix to from the version since this is not a development release.
-maven.asf.release.deploy.version=${version.major}.${version.minor}.${version.build}
+# Remove version-dev to from the version since this is not a development release.
+maven.asf.release.deploy.version=${version.major}.${version.minor}.${version.build}${version.suffix}
 
 # Re-use the same GPG executable
 gpg.exec=${gpg.exec}


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