[tomcat] branch 8.5.x updated: Organise properties into groups

[ma...@apache.org]

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

markt 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 a7214800aa Organise properties into groups
a7214800aa is described below

commit a7214800aa6ebdc5d828374129b9034647b1d093
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Jun 9 08:23:35 2022 +0100

    Organise properties into groups
    
    The properties were grouped originally but over time some entries were
    added out of place
---
 build.properties.default | 39 +++++++++++++++++++++++----------------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 5b4e0372f0..2c25c43aad 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -35,18 +35,35 @@ version.build=81
 version.patch=0
 version.suffix=-dev
 
+# ----- Build tools -----
+ant.version.required=1.9.10
+
 # ----- Reproducible builds -----
 # Uncomment and set to current time for reproducible builds
 # Note: The value is in seconds (unlike milliseconds used by System.currentTimeMillis()).
 #2022-03-31T12:00:00Z
 #ant.tstamp.now=1648728000
 
-# ----- Source control flags -----
+# ----- Build control flags -----
+compile.debug=true
+# Do not pass -deprecation (-Xlint:deprecation) flag to javac
+compile.deprecation=false
+
+# ----- Documentation properties -----
 git.branch=8.5.x
 
-# ----- Build control flags -----
+# ----- Code quality tools
 # Note enabling validation uses Checkstyle which is LGPL licensed
 execute.validate=false
+
+# Note the JaCoCo code coverage tool is EPLv2 licensed
+# Enabling code coverage extends the time taken to run the tests by ~50%
+test.coverage=false
+
+# Note the SpotBugs is LGPL licensed
+execute.spotbugs=false
+
+# ----- Test configuration -----
 execute.test.nio=true
 execute.test.nio2=true
 # Still requires APR/native library to be present
@@ -62,13 +79,6 @@ test.verbose=true
 # thread per core.
 test.threads=1
 
-# Note the JaCoCo code coverage tool is EPLv2 licensed
-# Enabling code coverage extends the time taken to run the tests by ~50%
-test.coverage=false
-
-# Note the SpotBugs is LGPL licensed
-execute.spotbugs=false
-
 # Some platforms (e.g. OSX El Capitan) require IPv4 to be the default for the
 # multicast tests to work
 java.net.preferIPv4Stack=false
@@ -77,7 +87,8 @@ java.net.preferIPv4Stack=false
 # effectively changes the setting to false
 org.apache.tomcat.util.net.NioSelectorShared=true
 
-# Location of GPG executable (used only for releases)
+# ----- Release build settings -----
+# Location of GPG executable
 gpg.exec=/path/to/gpg
 
 # Code signing of Windows installer
@@ -93,17 +104,13 @@ codesigning.storetype=DIGICERTONE
 execute.download=true
 trydownload.httpusecaches=true
 
-# ----- Default Base Path for Dependent Packages -----
+# ----- Default base path for dependencies -----
 # Please note this path must be absolute, not relative,
 # as it is referenced with different working directory
 # contexts by the various build scripts.
 base.path=${user.home}/tomcat-build-libs
 
-compile.debug=true
-
-# Do not pass -deprecation (-Xlint:deprecation) flag to javac
-compile.deprecation=false
-
+# ---- Download locations for dependencies -----
 base-apache.loc.1=https://dlcdn.apache.org
 base-apache.loc.2=https://archive.apache.org/dist
 base-commons.loc.1=${base-apache.loc.1}/commons


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