From 6c3d7de934fd8a90cb66c81c0d81c1a6b5390168 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Sun, 23 Aug 2020 12:37:50 +0200
Subject: [PATCH] no longer complain when not finding tools.jar

People using the JRE won't have it and it has been removed from
OpenJDK with Java 9, it seems.
---
 WHATSNEW                                          | 6 ++++++
 src/main/org/apache/tools/ant/launch/Locator.java | 2 --
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/WHATSNEW b/WHATSNEW
index 0dfcdafb6..a9ea33fee 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -15,6 +15,12 @@ Fixed bugs:
    surrogate pairs (and likely other edge cases as well).
    Bugzilla Report 40455
 
+Other changes:
+--------------
+
+ * Ant will no longer log a warning if it doesn't find tools.jar
+   Bugzilla Report 63577
+
 Changes from Ant 1.10.7 TO Ant 1.10.8
 =====================================
 
diff --git a/src/main/org/apache/tools/ant/launch/Locator.java b/src/main/org/apache/tools/ant/launch/Locator.java
index f7558273e..9f616b5d1 100644
--- a/src/main/org/apache/tools/ant/launch/Locator.java
+++ b/src/main/org/apache/tools/ant/launch/Locator.java
@@ -380,8 +380,6 @@ public final class Locator {
             toolsJar = new File(javaHome + libToolsJar);
         }
         if (!toolsJar.exists()) {
-            System.out.println("Unable to locate tools.jar. "
-                 + "Expected to find it in " + toolsJar.getPath());
             return null;
         }
         return toolsJar;