You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by bo...@apache.org on 2018/03/24 12:55:04 UTC
[1/4] ant git commit: Easier to read buildfile (cf master)
Repository: ant
Updated Branches:
refs/heads/master e0ab351aa -> 813da2ad3
Easier to read buildfile (cf master)
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/d8b1423f
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/d8b1423f
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/d8b1423f
Branch: refs/heads/master
Commit: d8b1423fa1c87598017a9c01024cb3a836ee9f87
Parents: 360acf5
Author: Gintas Grigelionis <gi...@apache.org>
Authored: Wed Mar 21 21:24:41 2018 +0100
Committer: Gintas Grigelionis <gi...@apache.org>
Committed: Wed Mar 21 21:24:41 2018 +0100
----------------------------------------------------------------------
build.xml | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/d8b1423f/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 7f9c9f4..89e9d2b 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}"/>
[3/4] ant git commit: typos in release instructions
Posted by bo...@apache.org.
typos in release instructions
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/3f1cec6f
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/3f1cec6f
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/3f1cec6f
Branch: refs/heads/master
Commit: 3f1cec6f033959549a2e9c8ea847d7074b1d186a
Parents: a3b065b
Author: Stefan Bodewig <bo...@apache.org>
Authored: Sat Mar 24 13:52:24 2018 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Sat Mar 24 13:52:24 2018 +0100
----------------------------------------------------------------------
ReleaseInstructions | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/3f1cec6f/ReleaseInstructions
----------------------------------------------------------------------
diff --git a/ReleaseInstructions b/ReleaseInstructions
index a68dccf..762450f 100644
--- a/ReleaseInstructions
+++ b/ReleaseInstructions
@@ -21,7 +21,7 @@ Note: This document was updated in the context of releasing Ant
release and wait for a few days whether anybody objects.
We haven't created extra branches for releases in a long time and
- with out new 1.9.x LTS policy there is a permanent branch for
+ with our new 1.9.x LTS policy there is a permanent branch for
Java5 compatible releases anyway. So no extra branch for the
releases is needed.
@@ -37,7 +37,7 @@ Note: This document was updated in the context of releasing Ant
the build with -verbose option and scan for lines beginning with
"Unable to load...".
-3. We don't want tags for failed votes to end up on out branches so
+3. We don't want tags for failed votes to end up on our branches so
the release is first created from a detached head.
Checkout the HEAD of the 1.9.x branch as a detached head:
[4/4] ant git commit: Merge branch '1.9.x'
Posted by bo...@apache.org.
Merge branch '1.9.x'
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/813da2ad
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/813da2ad
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/813da2ad
Branch: refs/heads/master
Commit: 813da2ad3e50beafd0defebe24cf0b9b1f3c4d0d
Parents: e0ab351 3f1cec6
Author: Stefan Bodewig <bo...@apache.org>
Authored: Sat Mar 24 13:54:46 2018 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Sat Mar 24 13:54:46 2018 +0100
----------------------------------------------------------------------
ReleaseInstructions | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/813da2ad/ReleaseInstructions
----------------------------------------------------------------------
diff --cc ReleaseInstructions
index 615640f,762450f..f9f1c19
--- a/ReleaseInstructions
+++ b/ReleaseInstructions
@@@ -38,12 -37,12 +38,12 @@@ Note: This document was adapted from th
the build with -verbose option and scan for lines beginning with
"Unable to load...".
- 3. We don't want tags for failed votes to end up on out branches so
+ 3. We don't want tags for failed votes to end up on our branches so
the release is first created from a detached head.
- Checkout the HEAD of the 1.9.x branch as a detached head:
+ Checkout the HEAD of the master branch as a detached head:
- $ git checkout 1.9.x^0
+ $ git checkout master^0
4. Make sure that your directory tree is clean by running git status.
Some tests leave behind leftovers which end up in the source
[2/4] ant git commit: Fix binary distribution directory layout in
documentation
Posted by bo...@apache.org.
Fix binary distribution directory layout in documentation
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/a3b065b9
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/a3b065b9
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/a3b065b9
Branch: refs/heads/master
Commit: a3b065b967b87641dc0e5a154a44002395f656c8
Parents: d8b1423
Author: Jaikiran Pai <ja...@apache.org>
Authored: Sat Mar 24 12:05:43 2018 +0530
Committer: Jaikiran Pai <ja...@apache.org>
Committed: Sat Mar 24 12:05:43 2018 +0530
----------------------------------------------------------------------
manual/install.html | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/a3b065b9/manual/install.html
----------------------------------------------------------------------
diff --git a/manual/install.html b/manual/install.html
index 7bcab8c..ccaeb3e 100644
--- a/manual/install.html
+++ b/manual/install.html
@@ -256,11 +256,7 @@ other open source Java runtimes, and so strives to have a product that works wel
|
+--- lib // contains Ant JARs plus necessary dependencies
|
- +--- docs // contains documentation
- | |
- | +--- images // various logos for html documentation
- | |
- | +--- manual // Ant documentation (a must read ;-)
+ +--- manual // Ant documentation (a must read ;-)
|
+--- etc // contains xsl goodies to:
// - create an enhanced report from xml output of various tasks.