From d8b1423fa1c87598017a9c01024cb3a836ee9f87 Mon Sep 17 00:00:00 2001
From: Gintas Grigelionis <gintas@apache.org>
Date: Wed, 21 Mar 2018 21:24:41 +0100
Subject: [PATCH] Easier to read buildfile (cf master)

---
 build.xml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/build.xml b/build.xml
index 7f9c9f410..89e9d2b1e 100644
--- a/build.xml
+++ b/build.xml
@@ -31,7 +31,7 @@
   -->
   <property name="Name" value="Apache Ant"/>
   <property name="name" value="ant"/>
-  <!-- this is the groupId of ant in the Maven repository -->
+  <!-- this is the directory corresponding to groupId of Ant in the Maven repository -->
   <property name="groupid" value="org/apache/ant"/>
   <property name="project.version" value="1.9.11alpha"/>
   <!-- pom.version is used when doing a distribution and must match with what is checked in under src/etc/poms -->
@@ -45,7 +45,7 @@
   <property name="optional.package" value="${taskdefs.package}/optional"/>
   <property name="type.package" value="${ant.package}/types"/>
   <property name="optional.type.package" value="${type.package}/optional"/>
-  <property name="apache.resolver.type.package" value="${ant.package}/types/resolver"/>
+  <property name="apache.resolver.type.package" value="${type.package}/resolver"/>
   <property name="util.package" value="${ant.package}/util"/>
   <property name="regexp.package" value="${util.package}/regexp"/>
 
@@ -60,14 +60,14 @@
   <property name="src.dir" value="src"/>
   <property name="java.dir" value="${src.dir}/main"/>
   <property name="script.dir" value="${src.dir}/script"/>
-  <property name="lib.dir" value="lib"/>
-  <property name="manual.dir" value="manual"/>
-  <property name="etc.dir" value="${src.dir}/etc"/>
+  <property name="resource.dir" value="${src.dir}/resources"/>
   <property name="src.junit" value="${src.dir}/tests/junit"/>
   <property name="src.antunit" value="${src.dir}/tests/antunit"/>
-  <property name="tests.etc.dir" value="${src.dir}/etc/testcases"/>
-  <property name="manifest" value="${src.dir}/etc/manifest"/>
-  <property name="resource.dir" value="${src.dir}/resources"/>
+  <property name="etc.dir" value="${src.dir}/etc"/>
+  <property name="tests.etc.dir" value="${etc.dir}/testcases"/>
+  <property name="manifest" value="${etc.dir}/manifest"/>
+  <property name="lib.dir" value="lib"/>
+  <property name="manual.dir" value="manual"/>
 
   <!--
        ===================================================================
@@ -84,11 +84,11 @@
   <property name="build.tests.javadocs" value="${build.dir}/javadocs.test/"/>
   <property name="build.junit.xml" location="${build.tests}/xml"/>
   <property name="build.junit.tmpdir" location="${build.tests}/tmp"/>
+  <property name="build.junit.reports" location="${build.tests}/reports"/>
   <property name="antunit.xml" location="${build.dir}/antunit/xml"/>
   <property name="antunit.tmpdir" location="${build.dir}/antunit/tmp"/>
   <property name="antunit.reports" location="${build.dir}/antunit/reports"/>
   <property name="antunit.loglevel" value="none"/>
-  <property name="build.junit.reports" location="${build.tests}/reports"/>
   <property name="manifest.tmp" value="${build.dir}/optional.manifest"/>
   <!-- the absolute path -->
   <property name="build.tests.value" location="${build.tests}"/>