[ant] branch master updated (711132a -> df65998)

[bo...@apache.org]

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

bodewig pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/ant.git.


    from 711132a  Merge branch '1.9.x'
     add 96ca021  properly describe how Ant reads environment variables
     new df65998  Merge branch '1.9.x'

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 manual/Tasks/property.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

[ant] 01/01: Merge branch '1.9.x'

[bo...@apache.org]

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

bodewig pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ant.git

commit df65998cff76c04d8e62dcb7c5219e87f7c499c1
Merge: 711132a 96ca021
Author: Stefan Bodewig <bo...@apache.org>
AuthorDate: Tue Dec 28 18:47:37 2021 +0100

    Merge branch '1.9.x'

 manual/Tasks/property.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --cc manual/Tasks/property.html
index b96f90e,df406b0..9fb1cec
--- a/manual/Tasks/property.html
+++ b/manual/Tasks/property.html
@@@ -278,19 -307,22 +278,19 @@@ on a classpath. Here are some interesti
  <pre>
  build.compiler=jikes
  deploy.server=lucky
 -deploy.port=8080
 -deploy.url=http://${deploy.server}:${deploy.port}/
 -</pre>
 +deploy.port=8443
 +deploy.url=https://${deploy.server}:${deploy.port}/</pre>
  
 -
 -<a name="notes-env"></a>
 -<h3>Notes about environment variables</h3>
 +<h3 id="notes-env">Notes about environment variables</h3>
  <p>
    When Ant started to support setting properties from environment
 -  variables it ran on Java 1.2 where <code>System.getEnv</code> didn't
 +  variables it ran on Java 1.2 where <code class="code">System.getEnv</code> didn't
    work. So we decided to start a command in a new process which prints
    the environment variables, analyzes the output and creates the
-   properties. Once Java 5 became our baseline we could have switched
-   to <code class="code">getEnv</code> but it returned different results on some
-   platforms so we stuck with the command approach to remain backwards
-   compatible.
+   properties. With Ant 1.9.0 when we started to require Java 5 we switched back
 -  to <code>System.getEnv</code> even though it returned different results on some
++  to <code class="code">System.getEnv</code> even though it returned different results on some
+   platforms. The commands described below are still used on OpenVMS or
 -  if <code>System.getEnv</code> throws an exception.
++  if <code class="code">System.getEnv</code> throws an exception.
  </p>
  <p>
    There are commands for the following operating systems implemented in