[4/6] ant git commit: Use equals method of a string literal to prevent NPE and isEmpty() method instead of comparing a String object with an empty string.

[bodewig]

Use equals method of a string literal to prevent NPE and isEmpty() method 
instead of comparing a String object with an empty string.


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/02e32f76
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/02e32f76
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/02e32f76

Branch: refs/heads/master
Commit: 02e32f76ca0730eb46649d4e0c59c1945355221f
Parents: 14bd759
Author: reudismam 
Authored: Thu Feb 1 14:03:19 2018 -0300
Committer: Stefan Bodewig 
Committed: Fri Feb 2 06:10:43 2018 +0100

--
 .../apache/tools/ant/helper/ProjectHelper2.java | 44 ++--
 .../tools/ant/helper/ProjectHelperImpl.java | 32 +++---
 .../optional/ejb/JonasDeploymentTool.java   |  4 +-
 .../tools/ant/taskdefs/optional/net/FTP.java|  8 ++--
 4 files changed, 44 insertions(+), 44 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/02e32f76/src/main/org/apache/tools/ant/helper/ProjectHelper2.java
--
diff --git a/src/main/org/apache/tools/ant/helper/ProjectHelper2.java 
b/src/main/org/apache/tools/ant/helper/ProjectHelper2.java
index 268869d..61a696c 100644
--- a/src/main/org/apache/tools/ant/helper/ProjectHelper2.java
+++ b/src/main/org/apache/tools/ant/helper/ProjectHelper2.java
@@ -667,8 +667,8 @@ public class ProjectHelper2 extends ProjectHelper {
 @Override
 public AntHandler onStartChild(String uri, String name, String qname, 
Attributes attrs,
AntXMLContext context) throws 
SAXParseException {
-if (name.equals("project")
-&& (uri.equals("") || uri.equals(ANT_CORE_URI))) {
+if ("project".equals(name)
+&& (uri.isEmpty() || uri.equals(ANT_CORE_URI))) {
 return ProjectHelper2.projectHandler;
 }
 if (name.equals(qname)) {
@@ -727,19 +727,19 @@ public class ProjectHelper2 extends ProjectHelper {
 
 for (int i = 0; i < attrs.getLength(); i++) {
 String attrUri = attrs.getURI(i);
-if (attrUri != null && !attrUri.equals("") && 
!attrUri.equals(uri)) {
+if (attrUri != null && !attrUri.isEmpty() && 
!attrUri.equals(uri)) {
 continue; // Ignore attributes from unknown uris
 }
 String key = attrs.getLocalName(i);
 String value = attrs.getValue(i);
 
-if (key.equals("default")) {
-if (value != null && !value.equals("")) {
+if ("default".equals(key)) {
+if (value != null && !value.isEmpty()) {
 if (!context.isIgnoringProjectTag()) {
 project.setDefault(value);
 }
 }
-} else if (key.equals("name")) {
+} else if ("name".equals(key)) {
 if (value != null) {
 context.setCurrentProjectName(value);
 nameAttributeSet = true;
@@ -754,14 +754,14 @@ public class ProjectHelper2 extends ProjectHelper {
 }
 }
 }
-} else if (key.equals("id")) {
+} else if ("id".equals(key)) {
 if (value != null) {
 // What's the difference between id and name ?
 if (!context.isIgnoringProjectTag()) {
 project.addReference(value, project);
 }
 }
-} else if (key.equals("basedir")) {
+} else if ("basedir".equals(key)) {
 if (!context.isIgnoringProjectTag()) {
 baseDir = value;
 }
@@ -864,8 +864,8 @@ public class ProjectHelper2 extends ProjectHelper {
 @Override
 public AntHandler onStartChild(String uri, String name, String qname, 
Attributes attrs,
AntXMLContext context) throws 
SAXParseException {
-return (name.equals("target") || name.equals("extension-point"))
-&& (uri.equals("") || uri.equals(ANT_CORE_URI))
+return ("target".equals(name) || "extension-point".equals(name))
+&& (uri.isEmpty() || uri.equals(ANT_CORE_URI))
 ? ProjectHelper2.targetHandl

[5/6] ant git commit: swap constant string and variable in some equals ops

[bodewig]

swap constant string and variable in some equals ops

this is a stripped down version of #56 as `isEmpty` is not available
in Java5.


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/b38faab1
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/b38faab1
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/b38faab1

Branch: refs/heads/master
Commit: b38faab1cc70bd7529c0ba073f5e53f8f85f7e71
Parents: 76933d2
Author: Stefan Bodewig 
Authored: Fri Feb 2 06:19:33 2018 +0100
Committer: Stefan Bodewig 
Committed: Fri Feb 2 06:19:33 2018 +0100

--
 .../apache/tools/ant/helper/ProjectHelper2.java | 26 ++--
 .../tools/ant/helper/ProjectHelperImpl.java | 26 ++--
 .../tools/ant/taskdefs/optional/net/FTP.java|  4 +--
 3 files changed, 28 insertions(+), 28 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/b38faab1/src/main/org/apache/tools/ant/helper/ProjectHelper2.java
--
diff --git a/src/main/org/apache/tools/ant/helper/ProjectHelper2.java 
b/src/main/org/apache/tools/ant/helper/ProjectHelper2.java
index 6ae2d32..34dfde3 100644
--- a/src/main/org/apache/tools/ant/helper/ProjectHelper2.java
+++ b/src/main/org/apache/tools/ant/helper/ProjectHelper2.java
@@ -656,7 +656,7 @@ public class ProjectHelper2 extends ProjectHelper {
  */
 public AntHandler onStartChild(String uri, String name, String qname, 
Attributes attrs,
AntXMLContext context) throws 
SAXParseException {
-if (name.equals("project")
+if ("project".equals(name)
 && (uri.equals("") || uri.equals(ANT_CORE_URI))) {
 return ProjectHelper2.projectHandler;
 }
@@ -721,13 +721,13 @@ public class ProjectHelper2 extends ProjectHelper {
 String key = attrs.getLocalName(i);
 String value = attrs.getValue(i);
 
-if (key.equals("default")) {
+if ("default".equals(key)) {
 if (value != null && !value.equals("")) {
 if (!context.isIgnoringProjectTag()) {
 project.setDefault(value);
 }
 }
-} else if (key.equals("name")) {
+} else if ("name".equals(key)) {
 if (value != null) {
 context.setCurrentProjectName(value);
 nameAttributeSet = true;
@@ -742,14 +742,14 @@ public class ProjectHelper2 extends ProjectHelper {
 }
 }
 }
-} else if (key.equals("id")) {
+} else if ("id".equals(key)) {
 if (value != null) {
 // What's the difference between id and name ?
 if (!context.isIgnoringProjectTag()) {
 project.addReference(value, project);
 }
 }
-} else if (key.equals("basedir")) {
+} else if ("basedir".equals(key)) {
 if (!context.isIgnoringProjectTag()) {
 baseDir = value;
 }
@@ -904,26 +904,26 @@ public class ProjectHelper2 extends ProjectHelper {
 String key = attrs.getLocalName(i);
 String value = attrs.getValue(i);
 
-if (key.equals("name")) {
+if ("name".equals(key)) {
 name = value;
 if ("".equals(name)) {
 throw new BuildException("name attribute must " + "not 
be empty");
 }
-} else if (key.equals("depends")) {
+} else if ("depends".equals(key)) {
 depends = value;
-} else if (key.equals("if")) {
+} else if ("if".equals(key)) {
 target.setIf(value);
-} else if (key.equals("unless")) {
+} else if ("unless".equals(key)) {
 target.setUnless(value);
-} else if (key.equals("id")) {
+} else if ("id".equals(key)) {
 if (value != null && !value.equals("")) {
 context.getProject().addReference(value, target);
 }
-} else if (key.e

[6/6] ant git commit: Merge branch '1.9.x'

[bodewig]

Merge branch '1.9.x'

closes #56


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/32d178ff
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/32d178ff
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/32d178ff

Branch: refs/heads/master
Commit: 32d178ffe2ee813f2cc4b7860f64f9232c6aa161
Parents: 02e32f7 b38faab
Author: Stefan Bodewig 
Authored: Fri Feb 2 06:21:54 2018 +0100
Committer: Stefan Bodewig 
Committed: Fri Feb 2 06:21:54 2018 +0100

--

--

[3/6] ant git commit: update to latest Simian (fixed the multi formatter issue)

[bodewig]

update to latest Simian (fixed the multi formatter issue)


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/76933d2e
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/76933d2e
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/76933d2e

Branch: refs/heads/master
Commit: 76933d2e2835b5083f264ce33bdc0f4132c6e68c
Parents: 49eefb1
Author: Jan Matèrne 
Authored: Tue Jan 30 06:58:13 2018 +0100
Committer: Jan Matèrne 
Committed: Tue Jan 30 06:59:31 2018 +0100

--
 check.xml | 14 +++---
 1 file changed, 3 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/76933d2e/check.xml
--
diff --git a/check.xml b/check.xml
index 52f3fb3..b5a6586 100644
--- a/check.xml
+++ b/check.xml
@@ -91,7 +91,7 @@
 
   
   
   http://www.harukizaemon.com/simian/simian-${simian.version}.tar.gz";
@@ -182,6 +182,7 @@
   
 
 
+  Install Simian ${simian.version}
   
   
   
@@ -194,6 +195,7 @@
   
 
 
+Run Simian
 
   
 
@@ -202,17 +204,7 @@
 
 
 
-
 
 
 

[1/2] ant git commit: fix javadoc

[bodewig]

Repository: ant
Updated Branches:
  refs/heads/1.9.x b38faab1c -> a390fd653


fix javadoc


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/82573c46
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/82573c46
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/82573c46

Branch: refs/heads/1.9.x
Commit: 82573c463b5640cd98128b2eeb23110e694ac148
Parents: b38faab
Author: Stefan Bodewig 
Authored: Fri Feb 2 10:25:30 2018 +0100
Committer: Stefan Bodewig 
Committed: Fri Feb 2 10:25:30 2018 +0100

--
 src/main/org/apache/tools/ant/types/AbstractFileSet.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/82573c46/src/main/org/apache/tools/ant/types/AbstractFileSet.java
--
diff --git a/src/main/org/apache/tools/ant/types/AbstractFileSet.java 
b/src/main/org/apache/tools/ant/types/AbstractFileSet.java
index 1639150..7d1ac4a 100644
--- a/src/main/org/apache/tools/ant/types/AbstractFileSet.java
+++ b/src/main/org/apache/tools/ant/types/AbstractFileSet.java
@@ -292,7 +292,7 @@ public abstract class AbstractFileSet extends DataType
 }
 
 /**
- * Appends excludes to the current list of include
+ * Appends excludes to the current list of exclude
  * patterns.
  *
  * @param excludes array containing the exclude patterns.

[2/2] ant git commit: BZ 62071 - fix error message when fileset.setFile is called twice

[bodewig]

BZ 62071 - fix error message when fileset.setFile is called twice


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/a390fd65
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/a390fd65
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/a390fd65

Branch: refs/heads/1.9.x
Commit: a390fd653ca45cb32cee7b25050ae70a4f1b55c9
Parents: 82573c4
Author: Stefan Bodewig 
Authored: Fri Feb 2 10:25:53 2018 +0100
Committer: Stefan Bodewig 
Committed: Fri Feb 2 10:25:53 2018 +0100

--
 WHATSNEW|  5 +
 .../apache/tools/ant/types/AbstractFileSet.java | 11 ++-
 .../tools/ant/types/AbstractFileSetTest.java| 20 
 3 files changed, 35 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/a390fd65/WHATSNEW
--
diff --git a/WHATSNEW b/WHATSNEW
index 1430c8d..923f75a 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -30,6 +30,11 @@ Fixed bugs:
streams of a process, could end up being truncated.
Bugzilla Report 58833, 58451
 
+ * // will now throw an exception
+   with a more useful error message when setFile is called twice on
+   the same instance.
+   Bugzilla Report 62071
+
 Other changes:
 --
 

http://git-wip-us.apache.org/repos/asf/ant/blob/a390fd65/src/main/org/apache/tools/ant/types/AbstractFileSet.java
--
diff --git a/src/main/org/apache/tools/ant/types/AbstractFileSet.java 
b/src/main/org/apache/tools/ant/types/AbstractFileSet.java
index 7d1ac4a..0c1d57d 100644
--- a/src/main/org/apache/tools/ant/types/AbstractFileSet.java
+++ b/src/main/org/apache/tools/ant/types/AbstractFileSet.java
@@ -232,7 +232,16 @@ public abstract class AbstractFileSet extends DataType
 if (isReference()) {
 throw tooManyAttributes();
 }
-if (getDir() != null) {
+if (fileAttributeUsed) {
+if (getDir().equals(file.getParentFile())) {
+String[] includes = 
defaultPatterns.getIncludePatterns(getProject());
+if (includes.length == 1 && 
includes[0].equals(file.getName())) {
+// NOOP, setFile has been invoked twice with the same 
parameter
+return;
+}
+}
+throw new BuildException("setFile cannot be called twice with 
different arguments");
+} else if (getDir() != null) {
 throw dirAndFileAreMutuallyExclusive();
 }
 setDir(file.getParentFile());

http://git-wip-us.apache.org/repos/asf/ant/blob/a390fd65/src/tests/junit/org/apache/tools/ant/types/AbstractFileSetTest.java
--
diff --git 
a/src/tests/junit/org/apache/tools/ant/types/AbstractFileSetTest.java 
b/src/tests/junit/org/apache/tools/ant/types/AbstractFileSetTest.java
index 56ee498..a025b2b 100644
--- a/src/tests/junit/org/apache/tools/ant/types/AbstractFileSetTest.java
+++ b/src/tests/junit/org/apache/tools/ant/types/AbstractFileSetTest.java
@@ -244,4 +244,24 @@ public abstract class AbstractFileSetTest {
 File dir = f1.getDir(project);
 assertEquals("Dir is basedir", dir, project.getBaseDir());
 }
+
+@Test
+public void canCallSetFileTwiceWithSameArgument() {
+AbstractFileSet f = getInstance();
+f.setFile(new File("/a"));
+f.setFile(new File("/a"));
+// really only asserts no exception is thrown
+}
+
+@Test
+public void cantCallSetFileTwiceWithDifferentArguments() {
+AbstractFileSet f = getInstance();
+f.setFile(new File("/a"));
+try {
+f.setFile(new File("/b"));
+fail("expected an exception");
+} catch (BuildException ex) {
+assertEquals("setFile cannot be called twice with different 
arguments", ex.getMessage());
+}
+}
 }

[2/3] ant git commit: BZ 62071 - fix error message when fileset.setFile is called twice

[bodewig]

BZ 62071 - fix error message when fileset.setFile is called twice


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/a390fd65
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/a390fd65
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/a390fd65

Branch: refs/heads/master
Commit: a390fd653ca45cb32cee7b25050ae70a4f1b55c9
Parents: 82573c4
Author: Stefan Bodewig 
Authored: Fri Feb 2 10:25:53 2018 +0100
Committer: Stefan Bodewig 
Committed: Fri Feb 2 10:25:53 2018 +0100

--
 WHATSNEW|  5 +
 .../apache/tools/ant/types/AbstractFileSet.java | 11 ++-
 .../tools/ant/types/AbstractFileSetTest.java| 20 
 3 files changed, 35 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/a390fd65/WHATSNEW
--
diff --git a/WHATSNEW b/WHATSNEW
index 1430c8d..923f75a 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -30,6 +30,11 @@ Fixed bugs:
streams of a process, could end up being truncated.
Bugzilla Report 58833, 58451
 
+ * // will now throw an exception
+   with a more useful error message when setFile is called twice on
+   the same instance.
+   Bugzilla Report 62071
+
 Other changes:
 --
 

http://git-wip-us.apache.org/repos/asf/ant/blob/a390fd65/src/main/org/apache/tools/ant/types/AbstractFileSet.java
--
diff --git a/src/main/org/apache/tools/ant/types/AbstractFileSet.java 
b/src/main/org/apache/tools/ant/types/AbstractFileSet.java
index 7d1ac4a..0c1d57d 100644
--- a/src/main/org/apache/tools/ant/types/AbstractFileSet.java
+++ b/src/main/org/apache/tools/ant/types/AbstractFileSet.java
@@ -232,7 +232,16 @@ public abstract class AbstractFileSet extends DataType
 if (isReference()) {
 throw tooManyAttributes();
 }
-if (getDir() != null) {
+if (fileAttributeUsed) {
+if (getDir().equals(file.getParentFile())) {
+String[] includes = 
defaultPatterns.getIncludePatterns(getProject());
+if (includes.length == 1 && 
includes[0].equals(file.getName())) {
+// NOOP, setFile has been invoked twice with the same 
parameter
+return;
+}
+}
+throw new BuildException("setFile cannot be called twice with 
different arguments");
+} else if (getDir() != null) {
 throw dirAndFileAreMutuallyExclusive();
 }
 setDir(file.getParentFile());

http://git-wip-us.apache.org/repos/asf/ant/blob/a390fd65/src/tests/junit/org/apache/tools/ant/types/AbstractFileSetTest.java
--
diff --git 
a/src/tests/junit/org/apache/tools/ant/types/AbstractFileSetTest.java 
b/src/tests/junit/org/apache/tools/ant/types/AbstractFileSetTest.java
index 56ee498..a025b2b 100644
--- a/src/tests/junit/org/apache/tools/ant/types/AbstractFileSetTest.java
+++ b/src/tests/junit/org/apache/tools/ant/types/AbstractFileSetTest.java
@@ -244,4 +244,24 @@ public abstract class AbstractFileSetTest {
 File dir = f1.getDir(project);
 assertEquals("Dir is basedir", dir, project.getBaseDir());
 }
+
+@Test
+public void canCallSetFileTwiceWithSameArgument() {
+AbstractFileSet f = getInstance();
+f.setFile(new File("/a"));
+f.setFile(new File("/a"));
+// really only asserts no exception is thrown
+}
+
+@Test
+public void cantCallSetFileTwiceWithDifferentArguments() {
+AbstractFileSet f = getInstance();
+f.setFile(new File("/a"));
+try {
+f.setFile(new File("/b"));
+fail("expected an exception");
+} catch (BuildException ex) {
+assertEquals("setFile cannot be called twice with different 
arguments", ex.getMessage());
+}
+}
 }

[3/3] ant git commit: Merge branch '1.9.x'

[bodewig]

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/f11bc4ea
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/f11bc4ea
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/f11bc4ea

Branch: refs/heads/master
Commit: f11bc4eaa38aecd467c8c9d954100baa0c71c893
Parents: 32d178f a390fd6
Author: Stefan Bodewig 
Authored: Fri Feb 2 10:51:50 2018 +0100
Committer: Stefan Bodewig 
Committed: Fri Feb 2 10:51:50 2018 +0100

--
 WHATSNEW|  5 +
 .../apache/tools/ant/types/AbstractFileSet.java | 13 +++--
 .../tools/ant/types/AbstractFileSetTest.java| 20 
 3 files changed, 36 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/f11bc4ea/WHATSNEW
--

http://git-wip-us.apache.org/repos/asf/ant/blob/f11bc4ea/src/main/org/apache/tools/ant/types/AbstractFileSet.java
--

[1/3] ant git commit: fix javadoc

[bodewig]

Repository: ant
Updated Branches:
  refs/heads/master 32d178ffe -> f11bc4eaa


fix javadoc


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/82573c46
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/82573c46
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/82573c46

Branch: refs/heads/master
Commit: 82573c463b5640cd98128b2eeb23110e694ac148
Parents: b38faab
Author: Stefan Bodewig 
Authored: Fri Feb 2 10:25:30 2018 +0100
Committer: Stefan Bodewig 
Committed: Fri Feb 2 10:25:30 2018 +0100

--
 src/main/org/apache/tools/ant/types/AbstractFileSet.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/82573c46/src/main/org/apache/tools/ant/types/AbstractFileSet.java
--
diff --git a/src/main/org/apache/tools/ant/types/AbstractFileSet.java 
b/src/main/org/apache/tools/ant/types/AbstractFileSet.java
index 1639150..7d1ac4a 100644
--- a/src/main/org/apache/tools/ant/types/AbstractFileSet.java
+++ b/src/main/org/apache/tools/ant/types/AbstractFileSet.java
@@ -292,7 +292,7 @@ public abstract class AbstractFileSet extends DataType
 }
 
 /**
- * Appends excludes to the current list of include
+ * Appends excludes to the current list of exclude
  * patterns.
  *
  * @param excludes array containing the exclude patterns.

ant git commit: looks like a bad merge, seems Jenkins doesn't build everything

[bodewig]

Repository: ant
Updated Branches:
  refs/heads/1.9.x a390fd653 -> 87409137e


looks like a bad merge, seems Jenkins doesn't build everything


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/87409137
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/87409137
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/87409137

Branch: refs/heads/1.9.x
Commit: 87409137ed04aedffa31a8e831075f10de9d82e8
Parents: a390fd6
Author: Stefan Bodewig 
Authored: Sat Feb 3 16:33:40 2018 +0100
Committer: Stefan Bodewig 
Committed: Sat Feb 3 16:33:40 2018 +0100

--
 .../org/apache/tools/ant/listener/Log4jListener.java   | 13 +
 1 file changed, 5 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/87409137/src/main/org/apache/tools/ant/listener/Log4jListener.java
--
diff --git a/src/main/org/apache/tools/ant/listener/Log4jListener.java 
b/src/main/org/apache/tools/ant/listener/Log4jListener.java
index 4adf796..b691300 100644
--- a/src/main/org/apache/tools/ant/listener/Log4jListener.java
+++ b/src/main/org/apache/tools/ant/listener/Log4jListener.java
@@ -34,21 +34,18 @@ import org.apache.tools.ant.Task;
 @Deprecated
 public class Log4jListener implements BuildListener {
 
-/** Indicates if the listener was initialized. */
-private final boolean initialized;
-
 /**
  * log category we log into
  */
 public static final String LOG_ANT = "org.apache.tools.ant";
 
- /**
+/**
  * Construct the listener
-  */
- public Log4jListener() {
+ */
+public Log4jListener() {
 // trigger the log4j initialization (if at all it's not yet 
initialized)
- final Logger log = Logger.getLogger(LOG_ANT);
- }
+final Logger log = Logger.getLogger(LOG_ANT);
+}
 
 /**
  * @see BuildListener#buildStarted

[ant] Git Push Summary

[bodewig]

Repository: ant
Updated Tags:  refs/tags/ANT_1_9_10_RC1 [created] 979d4b548

svn commit: r24666 - in /dev/ant: ./ binaries/ manual/ source/

[bodewig]

Author: bodewig
Date: Sat Feb  3 16:23:14 2018
New Revision: 24666

Log:
RC1 of Ant 1.9.10

Added:
dev/ant/RELEASE-NOTES-1.9.10.html   (with props)
dev/ant/binaries/apache-ant-1.9.10-bin.tar.bz2   (with props)
dev/ant/binaries/apache-ant-1.9.10-bin.tar.bz2.asc
dev/ant/binaries/apache-ant-1.9.10-bin.tar.bz2.md5
dev/ant/binaries/apache-ant-1.9.10-bin.tar.bz2.sha1
dev/ant/binaries/apache-ant-1.9.10-bin.tar.bz2.sha512
dev/ant/binaries/apache-ant-1.9.10-bin.tar.gz   (with props)
dev/ant/binaries/apache-ant-1.9.10-bin.tar.gz.asc
dev/ant/binaries/apache-ant-1.9.10-bin.tar.gz.md5
dev/ant/binaries/apache-ant-1.9.10-bin.tar.gz.sha1
dev/ant/binaries/apache-ant-1.9.10-bin.tar.gz.sha512
dev/ant/binaries/apache-ant-1.9.10-bin.zip   (with props)
dev/ant/binaries/apache-ant-1.9.10-bin.zip.asc
dev/ant/binaries/apache-ant-1.9.10-bin.zip.md5
dev/ant/binaries/apache-ant-1.9.10-bin.zip.sha1
dev/ant/binaries/apache-ant-1.9.10-bin.zip.sha512
dev/ant/manual/apache-ant-1.9.10-manual.tar.bz2   (with props)
dev/ant/manual/apache-ant-1.9.10-manual.tar.bz2.asc
dev/ant/manual/apache-ant-1.9.10-manual.tar.bz2.md5
dev/ant/manual/apache-ant-1.9.10-manual.tar.bz2.sha1
dev/ant/manual/apache-ant-1.9.10-manual.tar.bz2.sha512
dev/ant/manual/apache-ant-1.9.10-manual.tar.gz   (with props)
dev/ant/manual/apache-ant-1.9.10-manual.tar.gz.asc
dev/ant/manual/apache-ant-1.9.10-manual.tar.gz.md5
dev/ant/manual/apache-ant-1.9.10-manual.tar.gz.sha1
dev/ant/manual/apache-ant-1.9.10-manual.tar.gz.sha512
dev/ant/manual/apache-ant-1.9.10-manual.zip   (with props)
dev/ant/manual/apache-ant-1.9.10-manual.zip.asc
dev/ant/manual/apache-ant-1.9.10-manual.zip.md5
dev/ant/manual/apache-ant-1.9.10-manual.zip.sha1
dev/ant/manual/apache-ant-1.9.10-manual.zip.sha512
dev/ant/source/apache-ant-1.9.10-src.tar.bz2   (with props)
dev/ant/source/apache-ant-1.9.10-src.tar.bz2.asc
dev/ant/source/apache-ant-1.9.10-src.tar.bz2.md5
dev/ant/source/apache-ant-1.9.10-src.tar.bz2.sha1
dev/ant/source/apache-ant-1.9.10-src.tar.bz2.sha512
dev/ant/source/apache-ant-1.9.10-src.tar.gz   (with props)
dev/ant/source/apache-ant-1.9.10-src.tar.gz.asc
dev/ant/source/apache-ant-1.9.10-src.tar.gz.md5
dev/ant/source/apache-ant-1.9.10-src.tar.gz.sha1
dev/ant/source/apache-ant-1.9.10-src.tar.gz.sha512
dev/ant/source/apache-ant-1.9.10-src.zip   (with props)
dev/ant/source/apache-ant-1.9.10-src.zip.asc
dev/ant/source/apache-ant-1.9.10-src.zip.md5
dev/ant/source/apache-ant-1.9.10-src.zip.sha1
dev/ant/source/apache-ant-1.9.10-src.zip.sha512

Added: dev/ant/RELEASE-NOTES-1.9.10.html
==
--- dev/ant/RELEASE-NOTES-1.9.10.html (added)
+++ dev/ant/RELEASE-NOTES-1.9.10.html Sat Feb  3 16:23:14 2018
@@ -0,0 +1,86 @@
+
+  Release Notes of Apache Ant 1.9.10
+  
+Changes from Ant 1.9.9 TO Ant 1.9.10
+
+
+ * The Log4jListener is marked as deprecated as the required log4j library
+   (in version 1.x) is not maintained any more.
+
+Fixed bugs:
+---
+
+ * <genkey>'s <dname> child now skips <param>s that lack a key or
+   value.
+   Bugzilla Report 60767
+
+ * Fixed the issue where the SCP based tasks would try to change
+   the permissions on the parent directory of a transferred file,
+   instead of changing it on the transferred file itself.
+   Bugzilla Reports 59648 and 43271
+
+ * Fixed the issue where the source file being copied could end
+   up being corrupted if the target of the copy happened to be
+   the same source file (symlinked back to itself).
+   Bugzilla Report 60644
+
+ * Improvement to the Zip task for reduced memory usage in certain
+   cases. Thanks to Glen Lewis for reporting the issue and
+   suggesting the fix.
+   Bugzilla Report 19516
+
+ * Fixed an issue where the content redirected from output/error
+   streams of a process, could end up being truncated.
+   Bugzilla Report 58833, 58451
+
+ * <fileset>/<zipfileset>/<tarfileset> will now throw an exception
+   with a more useful error message when setFile is called twice on
+   the same instance.
+   Bugzilla Report 62071
+
+Other changes:
+--
+
+ * Added forceCsvQuoteChar option to <csv> task. When enabled the
+   values always get quoted.
+   Github Pull Request #32
+
+ * added "regexp" attribute to <linecontainsregexp>
+   Bugzilla Report 60968
+
+ * added a new magic property ant.tstamp.now that can be used to
+   override the current time/date used by <tstamp>.
+   Bugzilla Report 61079
+
+ * added Orion support to ejbjar
+   Github Pull Request #33
+
+ * SCP task, when configured to use SFTP protocol, now preserves last
+   modified timestamp on files that it uploads, if the
+   preserveLastModified attribute is set to true for that task
+   Bugzilla Repo

[1/2] ant git commit: looks like a bad merge, seems Jenkins doesn't build everything

[bodewig]

Repository: ant
Updated Branches:
  refs/heads/master f11bc4eaa -> 314eb433e


looks like a bad merge, seems Jenkins doesn't build everything


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/87409137
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/87409137
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/87409137

Branch: refs/heads/master
Commit: 87409137ed04aedffa31a8e831075f10de9d82e8
Parents: a390fd6
Author: Stefan Bodewig 
Authored: Sat Feb 3 16:33:40 2018 +0100
Committer: Stefan Bodewig 
Committed: Sat Feb 3 16:33:40 2018 +0100

--
 .../org/apache/tools/ant/listener/Log4jListener.java   | 13 +
 1 file changed, 5 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/87409137/src/main/org/apache/tools/ant/listener/Log4jListener.java
--
diff --git a/src/main/org/apache/tools/ant/listener/Log4jListener.java 
b/src/main/org/apache/tools/ant/listener/Log4jListener.java
index 4adf796..b691300 100644
--- a/src/main/org/apache/tools/ant/listener/Log4jListener.java
+++ b/src/main/org/apache/tools/ant/listener/Log4jListener.java
@@ -34,21 +34,18 @@ import org.apache.tools.ant.Task;
 @Deprecated
 public class Log4jListener implements BuildListener {
 
-/** Indicates if the listener was initialized. */
-private final boolean initialized;
-
 /**
  * log category we log into
  */
 public static final String LOG_ANT = "org.apache.tools.ant";
 
- /**
+/**
  * Construct the listener
-  */
- public Log4jListener() {
+ */
+public Log4jListener() {
 // trigger the log4j initialization (if at all it's not yet 
initialized)
- final Logger log = Logger.getLogger(LOG_ANT);
- }
+final Logger log = Logger.getLogger(LOG_ANT);
+}
 
 /**
  * @see BuildListener#buildStarted

[2/2] ant git commit: Merge branch '1.9.x'

[bodewig]

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/314eb433
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/314eb433
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/314eb433

Branch: refs/heads/master
Commit: 314eb433eede2345a41962c0e1d4636eb26b1939
Parents: f11bc4e 8740913
Author: Stefan Bodewig 
Authored: Sat Feb 3 17:33:09 2018 +0100
Committer: Stefan Bodewig 
Committed: Sat Feb 3 17:33:09 2018 +0100

--
 src/main/org/apache/tools/ant/listener/Log4jListener.java | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/314eb433/src/main/org/apache/tools/ant/listener/Log4jListener.java
--

[ant] Git Push Summary

[bodewig]

Repository: ant
Updated Tags:  refs/tags/ANT_1.10.2_RC1 [created] 7d09ee2c1

svn commit: r24668 - in /dev/ant: ./ binaries/ source/

[bodewig]

Author: bodewig
Date: Sat Feb  3 16:59:14 2018
New Revision: 24668

Log:
RC1 of Ant 1.10.2

Added:
dev/ant/RELEASE-NOTES-1.10.2.html   (with props)
dev/ant/binaries/apache-ant-1.10.2-bin.tar.bz2   (with props)
dev/ant/binaries/apache-ant-1.10.2-bin.tar.bz2.asc
dev/ant/binaries/apache-ant-1.10.2-bin.tar.bz2.md5
dev/ant/binaries/apache-ant-1.10.2-bin.tar.bz2.sha1
dev/ant/binaries/apache-ant-1.10.2-bin.tar.bz2.sha512
dev/ant/binaries/apache-ant-1.10.2-bin.tar.gz   (with props)
dev/ant/binaries/apache-ant-1.10.2-bin.tar.gz.asc
dev/ant/binaries/apache-ant-1.10.2-bin.tar.gz.md5
dev/ant/binaries/apache-ant-1.10.2-bin.tar.gz.sha1
dev/ant/binaries/apache-ant-1.10.2-bin.tar.gz.sha512
dev/ant/binaries/apache-ant-1.10.2-bin.tar.xz   (with props)
dev/ant/binaries/apache-ant-1.10.2-bin.tar.xz.md5
dev/ant/binaries/apache-ant-1.10.2-bin.tar.xz.sha1
dev/ant/binaries/apache-ant-1.10.2-bin.tar.xz.sha512
dev/ant/binaries/apache-ant-1.10.2-bin.zip   (with props)
dev/ant/binaries/apache-ant-1.10.2-bin.zip.asc
dev/ant/binaries/apache-ant-1.10.2-bin.zip.md5
dev/ant/binaries/apache-ant-1.10.2-bin.zip.sha1
dev/ant/binaries/apache-ant-1.10.2-bin.zip.sha512
dev/ant/source/apache-ant-1.10.2-src.tar.bz2   (with props)
dev/ant/source/apache-ant-1.10.2-src.tar.bz2.asc
dev/ant/source/apache-ant-1.10.2-src.tar.bz2.md5
dev/ant/source/apache-ant-1.10.2-src.tar.bz2.sha1
dev/ant/source/apache-ant-1.10.2-src.tar.bz2.sha512
dev/ant/source/apache-ant-1.10.2-src.tar.gz   (with props)
dev/ant/source/apache-ant-1.10.2-src.tar.gz.asc
dev/ant/source/apache-ant-1.10.2-src.tar.gz.md5
dev/ant/source/apache-ant-1.10.2-src.tar.gz.sha1
dev/ant/source/apache-ant-1.10.2-src.tar.gz.sha512
dev/ant/source/apache-ant-1.10.2-src.tar.xz   (with props)
dev/ant/source/apache-ant-1.10.2-src.tar.xz.md5
dev/ant/source/apache-ant-1.10.2-src.tar.xz.sha1
dev/ant/source/apache-ant-1.10.2-src.tar.xz.sha512
dev/ant/source/apache-ant-1.10.2-src.zip   (with props)
dev/ant/source/apache-ant-1.10.2-src.zip.asc
dev/ant/source/apache-ant-1.10.2-src.zip.md5
dev/ant/source/apache-ant-1.10.2-src.zip.sha1
dev/ant/source/apache-ant-1.10.2-src.zip.sha512

Added: dev/ant/RELEASE-NOTES-1.10.2.html
==
--- dev/ant/RELEASE-NOTES-1.10.2.html (added)
+++ dev/ant/RELEASE-NOTES-1.10.2.html Sat Feb  3 16:59:14 2018
@@ -0,0 +1,136 @@
+
+  Release Notes of Apache Ant 1.10.2
+  
+Changes from Ant 1.10.1 TO Ant 1.10.2
+=
+
+Changes that could break older environments:
+---
+
+ * updated the dependency of BCEL to 6.2.
+   Bugzilla Report 61196
+
+ * delete task previously would silently accept wildcard (*)
+   value for the "file" attribute. That's no longer the case
+   and an exception could get thrown by the underlying filesystem
+   for such use. Usage like:
+
+   <delete file="/foo/bar/*.something"/>
+
+   should instead be changed to use resource collections like:
+
+   <delete>
+<fileset dir="/foo/bar/" includes="*.something"/>
+   </delete>
+
+ * Commons Net 3.6 is binary-code, but not source compatible;
+   see change list of Commons Net 3.0 for details
+
+ * The Log4jListener is marked as deprecated as the required log4j library
+   (in version 1.x) is not maintained any more.
+
+ * Image task is marked as deprecated as the required JAI library is not
+   maintained any more and internal APIs that JAI depended on are no longer
+   available in Java 9.
+
+Fixed bugs:
+---
+
+ * <genkey>'s <dname> child now skips <param>s that lack a key or
+   value.
+   Bugzilla Report 60767
+
+ * bootstrapping Ant on Windows failed
+   Bugzilla Report 61027
+
+ * Fixed the issue where the SCP based tasks would try to change
+   the permissions on the parent directory of a transferred file,
+   instead of changing it on the transferred file itself.
+   Bugzilla Reports 59648 and 43271
+
+ * Fixed the issue where the source file being copied could end
+   up being corrupted if the target of the copy happened to be
+   the same source file (symlinked back to itself).
+   Bugzilla Report 60644
+
+ * Fixed the issue where symlink creation with "overwrite=false",
+   on existing symlink whose target was a directory, would end
+   up creating a new symlink under the target directory.
+   Bugzilla Report 58683
+
+ * Improvement to the Zip task for reduced memory usage in certain
+   cases. Thanks to Glen Lewis for reporting the issue and
+   suggesting the fix.
+   Bugzilla Report 19516
+
+ * Fixed an issue where the content redirected from output/error
+   streams of a process, could end up being truncated.
+   Bugzilla Report 58833, 58451
+
+ * <fileset>/<zipfileset>/<tarf

svn commit: r24707 - /dev/ant/manual/

[bodewig]

Author: bodewig
Date: Mon Feb  5 20:00:38 2018
New Revision: 24707

Log:
forgot to svn add the 1.10.2 manual

Added:
dev/ant/manual/apache-ant-1.10.2-manual.tar.bz2   (with props)
dev/ant/manual/apache-ant-1.10.2-manual.tar.bz2.asc
dev/ant/manual/apache-ant-1.10.2-manual.tar.bz2.md5
dev/ant/manual/apache-ant-1.10.2-manual.tar.bz2.sha1
dev/ant/manual/apache-ant-1.10.2-manual.tar.bz2.sha512
dev/ant/manual/apache-ant-1.10.2-manual.tar.gz   (with props)
dev/ant/manual/apache-ant-1.10.2-manual.tar.gz.asc
dev/ant/manual/apache-ant-1.10.2-manual.tar.gz.md5
dev/ant/manual/apache-ant-1.10.2-manual.tar.gz.sha1
dev/ant/manual/apache-ant-1.10.2-manual.tar.gz.sha512
dev/ant/manual/apache-ant-1.10.2-manual.tar.xz   (with props)
dev/ant/manual/apache-ant-1.10.2-manual.tar.xz.md5
dev/ant/manual/apache-ant-1.10.2-manual.tar.xz.sha1
dev/ant/manual/apache-ant-1.10.2-manual.tar.xz.sha512
dev/ant/manual/apache-ant-1.10.2-manual.zip   (with props)
dev/ant/manual/apache-ant-1.10.2-manual.zip.asc
dev/ant/manual/apache-ant-1.10.2-manual.zip.md5
dev/ant/manual/apache-ant-1.10.2-manual.zip.sha1
dev/ant/manual/apache-ant-1.10.2-manual.zip.sha512

Added: dev/ant/manual/apache-ant-1.10.2-manual.tar.bz2
==
Binary file - no diff available.

Propchange: dev/ant/manual/apache-ant-1.10.2-manual.tar.bz2
--
svn:mime-type = application/octet-stream

Added: dev/ant/manual/apache-ant-1.10.2-manual.tar.bz2.asc
==
--- dev/ant/manual/apache-ant-1.10.2-manual.tar.bz2.asc (added)
+++ dev/ant/manual/apache-ant-1.10.2-manual.tar.bz2.asc Mon Feb  5 20:00:38 2018
@@ -0,0 +1,6 @@
+-BEGIN PGP SIGNATURE-
+
+iFoEABECABoFAlp16VUTHGJvZGV3aWdAYXBhY2hlLm9yZwAKCRCiEVrhX2uLcjuf
+AKC/39fm8NKcfpsgA0abkDwCvg3HmQCfYnkLgst1MEqkdeVvXFhpn4AHXhY=
+=FYf5
+-END PGP SIGNATURE-

Added: dev/ant/manual/apache-ant-1.10.2-manual.tar.bz2.md5
==
--- dev/ant/manual/apache-ant-1.10.2-manual.tar.bz2.md5 (added)
+++ dev/ant/manual/apache-ant-1.10.2-manual.tar.bz2.md5 Mon Feb  5 20:00:38 2018
@@ -0,0 +1 @@
+e2dba6dd2a39c76e322e67835209de26

Added: dev/ant/manual/apache-ant-1.10.2-manual.tar.bz2.sha1
==
--- dev/ant/manual/apache-ant-1.10.2-manual.tar.bz2.sha1 (added)
+++ dev/ant/manual/apache-ant-1.10.2-manual.tar.bz2.sha1 Mon Feb  5 20:00:38 
2018
@@ -0,0 +1 @@
+add9788d5c6c9feb08a43cc52e7736abd5da9e11

Added: dev/ant/manual/apache-ant-1.10.2-manual.tar.bz2.sha512
==
--- dev/ant/manual/apache-ant-1.10.2-manual.tar.bz2.sha512 (added)
+++ dev/ant/manual/apache-ant-1.10.2-manual.tar.bz2.sha512 Mon Feb  5 20:00:38 
2018
@@ -0,0 +1 @@
+109bc22ce1bb5942e2e11bcf1f5994ba37dc133cbd6ce2fa365eb4a7eaad24cfc233fad8459d5604b24097c2cb245110eccb31fb0a9a98a561ae13ab21167afa

Added: dev/ant/manual/apache-ant-1.10.2-manual.tar.gz
==
Binary file - no diff available.

Propchange: dev/ant/manual/apache-ant-1.10.2-manual.tar.gz
--
svn:mime-type = application/octet-stream

Added: dev/ant/manual/apache-ant-1.10.2-manual.tar.gz.asc
==
--- dev/ant/manual/apache-ant-1.10.2-manual.tar.gz.asc (added)
+++ dev/ant/manual/apache-ant-1.10.2-manual.tar.gz.asc Mon Feb  5 20:00:38 2018
@@ -0,0 +1,6 @@
+-BEGIN PGP SIGNATURE-
+
+iFoEABECABoFAlp16VQTHGJvZGV3aWdAYXBhY2hlLm9yZwAKCRCiEVrhX2uLcht8
+AKCpKD/ufBLnDHXNP7nCdo/gUfvQnwCgtmsaOa36rSpdRSdLrAmEMjQgf6A=
+=VTA9
+-END PGP SIGNATURE-

Added: dev/ant/manual/apache-ant-1.10.2-manual.tar.gz.md5
==
--- dev/ant/manual/apache-ant-1.10.2-manual.tar.gz.md5 (added)
+++ dev/ant/manual/apache-ant-1.10.2-manual.tar.gz.md5 Mon Feb  5 20:00:38 2018
@@ -0,0 +1 @@
+bd97c4ed8a229ba276f29f868e1dab6f

Added: dev/ant/manual/apache-ant-1.10.2-manual.tar.gz.sha1
==
--- dev/ant/manual/apache-ant-1.10.2-manual.tar.gz.sha1 (added)
+++ dev/ant/manual/apache-ant-1.10.2-manual.tar.gz.sha1 Mon Feb  5 20:00:38 2018
@@ -0,0 +1 @@
+1ce06ef74cfaadfc923143f0180fdd2d11f72278

Added: dev/ant/manual/apache-ant-1.10.2-manual.tar.gz.sha512
==
--- dev/ant/manual/apache-ant-1.10.2-manual.tar.gz.sha512 (added)
+++ dev/ant/manual/apache-ant-1.10.2-manual.tar.gz.sha512 Mon Feb  5 20:00:38 
2018
@@ -0,0 +1

[4/4] ant-antlibs-compress git commit: add read-only support for DEFLATE64

[bodewig]

add read-only support for DEFLATE64


Project: http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/commit/86bdc32f
Tree: http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/tree/86bdc32f
Diff: http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/diff/86bdc32f

Branch: refs/heads/master
Commit: 86bdc32f88652db4b3d710da343feb6fe8e69e3a
Parents: c3bdae5
Author: Stefan Bodewig 
Authored: Tue Feb 6 12:07:15 2018 +0100
Committer: Stefan Bodewig 
Committed: Tue Feb 6 12:07:15 2018 +0100

--
 changes.xml |   9 
 docs/compresource.html  |   7 +++
 docs/index.html |   6 ++-
 docs/unpack.html|   7 +++
 ivy.xml |   4 +-
 src/main/org/apache/ant/compress/antlib.xml |   8 +++
 .../compress/resources/Deflate64Resource.java   |  39 ++
 .../ant/compress/taskdefs/Undeflate64.java  |  39 ++
 .../compress/util/Deflate64StreamFactory.java   |  52 +++
 src/tests/antunit/un7z-test.xml |   9 
 src/tests/antunit/undeflate64-test.xml  |  41 +++
 src/tests/resources/asf-logo.gif.deflate64.7z   | Bin 0 -> 7099 bytes
 12 files changed, 217 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/86bdc32f/changes.xml
--
diff --git a/changes.xml b/changes.xml
index 946954a..e1875b4 100644
--- a/changes.xml
+++ b/changes.xml
@@ -38,6 +38,15 @@
 
 
 
+  
+The Apache Compress Antlib now requires Apache Commons
+Compress 1.16 or later for DEFLATE64 support.
+  
+  
+Added read-only support for the DEFLATE64 format. More
+importantly we can now read zip and 7z entries using this
+algorithm.
+  
 
 
   

http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/86bdc32f/docs/compresource.html
--
diff --git a/docs/compresource.html b/docs/compresource.html
index 714fece..57e85b3 100644
--- a/docs/compresource.html
+++ b/docs/compresource.html
@@ -109,6 +109,13 @@
 
   
 
+deflate64resource
+
+Since Apache Compress Antlib 1.6.
+
+This is a compressed resource using the
+  DEFLATE64 compression.
+
 gzipresource
 
 This is a compressed resource using the

http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/86bdc32f/docs/index.html
--
diff --git a/docs/index.html b/docs/index.html
index b16a16a..065030a 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -29,10 +29,10 @@
   compression/uncompression and archival/unarchival capabilities
   based on http://commons.apache.org/compress/";>Apache
   Commons Compress.  Using Apache Commons Compress 1.14 this
-  Antlib supports gzip, bzip2, lzma standalone, xz, .Z, DEFLATE,
+  Antlib supports gzip, bzip2, lzma standalone, xz, .Z, DEFLATE, DEFLATE64,
   Snappy, LZ4, Brotli and pack200 compression and ar, arj, cpio,
   7z, Unix dump, tar and zip archives.  Support for arj, .Z,
-  Brotli and dump is read-only.  7z can only be used on filesystem
+  Brotli, DEFLATE64 and dump is read-only.  7z can only be used on 
filesystem
   resources.
 
 Known Limitations
@@ -66,6 +66,7 @@
   unbrotli
   uncpio
   undeflate
+  undeflate64
   undump
   unlz4
   unlzma
@@ -92,6 +93,7 @@
   cpioentry
   cpiofileset
   deflateresource
+  deflate64resource
   dumpentry
   dumpfileset
   gzipresource

http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/86bdc32f/docs/unpack.html
--
diff --git a/docs/unpack.html b/docs/unpack.html
index c47eae0..9167598 100644
--- a/docs/unpack.html
+++ b/docs/unpack.html
@@ -124,6 +124,13 @@ resource collection
 
   
 
+Undeflate64
+
+Is an uncompressing task that uses the DEFLATE64
+  compression algorithm.
+
+  Since Compress Antlib 1.6
+
 UnLZ4
 
 Is an uncompressing task that uses the LZ4

http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/86bdc32f/ivy.xml
--
diff --git a/ivy.xml b/ivy.xml
index c31ca03..9c3148d 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -29,8 +29,8 @@
 http://ant.apache.org/antlibs/compress/";>
   Provides tasks and types that deal with AR, ARJ, CPIO, TAR,
   DUMP, 7Z and ZIP archives as well as BZIP2, PACK200, GZIP, LZMA,
-  Snappy, LZ4, Brotli and XZ compre

[2/4] ant-antlibs-compress git commit: uodate dependencies

[bodewig]

uodate dependencies


Project: http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/commit/b6aada79
Tree: http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/tree/b6aada79
Diff: http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/diff/b6aada79

Branch: refs/heads/master
Commit: b6aada79db797f38c43fcfaa3410066393fe7699
Parents: 25eb9c5
Author: Stefan Bodewig 
Authored: Tue Feb 6 12:06:42 2018 +0100
Committer: Stefan Bodewig 
Committed: Tue Feb 6 12:06:42 2018 +0100

--
 ivy.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/b6aada79/ivy.xml
--
diff --git a/ivy.xml b/ivy.xml
index 6c5e823..88d170d 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -56,9 +56,9 @@
   e:classifier="ivy"/>
   
   
-
-
+
+
 
-
+
   
 

[3/4] ant-antlibs-compress git commit: add antunit as test dependency

[bodewig]

add antunit as test dependency


Project: http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/commit/c3bdae5c
Tree: http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/tree/c3bdae5c
Diff: http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/diff/c3bdae5c

Branch: refs/heads/master
Commit: c3bdae5cf99808416ca7cb4604d46ed70fc1460f
Parents: b6aada7
Author: Stefan Bodewig 
Authored: Tue Feb 6 12:06:59 2018 +0100
Committer: Stefan Bodewig 
Committed: Tue Feb 6 12:06:59 2018 +0100

--
 ivy.xml | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/c3bdae5c/ivy.xml
--
diff --git a/ivy.xml b/ivy.xml
index 88d170d..c31ca03 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -60,5 +60,7 @@
 
 
 
+
   
 

[1/4] ant-antlibs-compress git commit: happy new year

[bodewig]

Repository: ant-antlibs-compress
Updated Branches:
  refs/heads/master 5aa13ff89 -> 86bdc32f8


happy new year


Project: http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/commit/25eb9c5f
Tree: http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/tree/25eb9c5f
Diff: http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/diff/25eb9c5f

Branch: refs/heads/master
Commit: 25eb9c5f030396ee8d6412dbc276746af7696ede
Parents: 5aa13ff
Author: Stefan Bodewig 
Authored: Tue Feb 6 12:06:01 2018 +0100
Committer: Stefan Bodewig 
Committed: Tue Feb 6 12:06:01 2018 +0100

--
 NOTICE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/25eb9c5f/NOTICE
--
diff --git a/NOTICE b/NOTICE
index e30c860..38799eb 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
 Apache Compress Ant Library
-Copyright 2009-2014,2017 The Apache Software Foundation
+Copyright 2009-2014,2017-2018 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

ant-antlibs-compress git commit: strip copy-paste left-over

[bodewig]

Repository: ant-antlibs-compress
Updated Branches:
  refs/heads/master 86bdc32f8 -> 405d27dc9


strip copy-paste left-over


Project: http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/commit/405d27dc
Tree: http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/tree/405d27dc
Diff: http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/diff/405d27dc

Branch: refs/heads/master
Commit: 405d27dc9b29803aef1473f66d9a3f1d3d74a7b4
Parents: 86bdc32
Author: Stefan Bodewig 
Authored: Tue Feb 6 12:10:29 2018 +0100
Committer: Stefan Bodewig 
Committed: Tue Feb 6 12:10:29 2018 +0100

--
 src/main/org/apache/ant/compress/taskdefs/Undeflate64.java | 2 --
 1 file changed, 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/405d27dc/src/main/org/apache/ant/compress/taskdefs/Undeflate64.java
--
diff --git a/src/main/org/apache/ant/compress/taskdefs/Undeflate64.java 
b/src/main/org/apache/ant/compress/taskdefs/Undeflate64.java
index 0b9a3f4..c48839d 100644
--- a/src/main/org/apache/ant/compress/taskdefs/Undeflate64.java
+++ b/src/main/org/apache/ant/compress/taskdefs/Undeflate64.java
@@ -30,8 +30,6 @@ import 
org.apache.commons.compress.compressors.CompressorInputStream;
  */
 public final class Undeflate64 extends UnpackBase {
 
-private boolean zlibHeader = true;
-
 public Undeflate64() {
 super(".dfl64", new Deflate64StreamFactory());
 }

svn commit: r24729 - /dev/ant/ /dev/ant/binaries/ /dev/ant/manual/ /dev/ant/source/ /release/ant/ /release/ant/binaries/ /release/ant/manual/ /release/ant/source/

[bodewig]

Author: bodewig
Date: Tue Feb  6 17:24:13 2018
New Revision: 24729

Log:
votes for Ant 1.9.10 and 1.10.2 have passed

Added:
release/ant/RELEASE-NOTES-1.10.2.html
  - copied unchanged from r24728, dev/ant/RELEASE-NOTES-1.10.2.html
release/ant/RELEASE-NOTES-1.9.10.html
  - copied unchanged from r24728, dev/ant/RELEASE-NOTES-1.9.10.html
release/ant/binaries/apache-ant-1.10.2-bin.tar.bz2
  - copied unchanged from r24728, 
dev/ant/binaries/apache-ant-1.10.2-bin.tar.bz2
release/ant/binaries/apache-ant-1.10.2-bin.tar.bz2.asc
  - copied unchanged from r24728, 
dev/ant/binaries/apache-ant-1.10.2-bin.tar.bz2.asc
release/ant/binaries/apache-ant-1.10.2-bin.tar.bz2.md5
  - copied unchanged from r24728, 
dev/ant/binaries/apache-ant-1.10.2-bin.tar.bz2.md5
release/ant/binaries/apache-ant-1.10.2-bin.tar.bz2.sha1
  - copied unchanged from r24728, 
dev/ant/binaries/apache-ant-1.10.2-bin.tar.bz2.sha1
release/ant/binaries/apache-ant-1.10.2-bin.tar.bz2.sha512
  - copied unchanged from r24728, 
dev/ant/binaries/apache-ant-1.10.2-bin.tar.bz2.sha512
release/ant/binaries/apache-ant-1.10.2-bin.tar.gz
  - copied unchanged from r24728, 
dev/ant/binaries/apache-ant-1.10.2-bin.tar.gz
release/ant/binaries/apache-ant-1.10.2-bin.tar.gz.asc
  - copied unchanged from r24728, 
dev/ant/binaries/apache-ant-1.10.2-bin.tar.gz.asc
release/ant/binaries/apache-ant-1.10.2-bin.tar.gz.md5
  - copied unchanged from r24728, 
dev/ant/binaries/apache-ant-1.10.2-bin.tar.gz.md5
release/ant/binaries/apache-ant-1.10.2-bin.tar.gz.sha1
  - copied unchanged from r24728, 
dev/ant/binaries/apache-ant-1.10.2-bin.tar.gz.sha1
release/ant/binaries/apache-ant-1.10.2-bin.tar.gz.sha512
  - copied unchanged from r24728, 
dev/ant/binaries/apache-ant-1.10.2-bin.tar.gz.sha512
release/ant/binaries/apache-ant-1.10.2-bin.tar.xz
  - copied unchanged from r24728, 
dev/ant/binaries/apache-ant-1.10.2-bin.tar.xz
release/ant/binaries/apache-ant-1.10.2-bin.tar.xz.md5
  - copied unchanged from r24728, 
dev/ant/binaries/apache-ant-1.10.2-bin.tar.xz.md5
release/ant/binaries/apache-ant-1.10.2-bin.tar.xz.sha1
  - copied unchanged from r24728, 
dev/ant/binaries/apache-ant-1.10.2-bin.tar.xz.sha1
release/ant/binaries/apache-ant-1.10.2-bin.tar.xz.sha512
  - copied unchanged from r24728, 
dev/ant/binaries/apache-ant-1.10.2-bin.tar.xz.sha512
release/ant/binaries/apache-ant-1.10.2-bin.zip
  - copied unchanged from r24728, dev/ant/binaries/apache-ant-1.10.2-bin.zip
release/ant/binaries/apache-ant-1.10.2-bin.zip.asc
  - copied unchanged from r24728, 
dev/ant/binaries/apache-ant-1.10.2-bin.zip.asc
release/ant/binaries/apache-ant-1.10.2-bin.zip.md5
  - copied unchanged from r24728, 
dev/ant/binaries/apache-ant-1.10.2-bin.zip.md5
release/ant/binaries/apache-ant-1.10.2-bin.zip.sha1
  - copied unchanged from r24728, 
dev/ant/binaries/apache-ant-1.10.2-bin.zip.sha1
release/ant/binaries/apache-ant-1.10.2-bin.zip.sha512
  - copied unchanged from r24728, 
dev/ant/binaries/apache-ant-1.10.2-bin.zip.sha512
release/ant/binaries/apache-ant-1.9.10-bin.tar.bz2
  - copied unchanged from r24728, 
dev/ant/binaries/apache-ant-1.9.10-bin.tar.bz2
release/ant/binaries/apache-ant-1.9.10-bin.tar.bz2.asc
  - copied unchanged from r24728, 
dev/ant/binaries/apache-ant-1.9.10-bin.tar.bz2.asc
release/ant/binaries/apache-ant-1.9.10-bin.tar.bz2.md5
  - copied unchanged from r24728, 
dev/ant/binaries/apache-ant-1.9.10-bin.tar.bz2.md5
release/ant/binaries/apache-ant-1.9.10-bin.tar.bz2.sha1
  - copied unchanged from r24728, 
dev/ant/binaries/apache-ant-1.9.10-bin.tar.bz2.sha1
release/ant/binaries/apache-ant-1.9.10-bin.tar.bz2.sha512
  - copied unchanged from r24728, 
dev/ant/binaries/apache-ant-1.9.10-bin.tar.bz2.sha512
release/ant/binaries/apache-ant-1.9.10-bin.tar.gz
  - copied unchanged from r24728, 
dev/ant/binaries/apache-ant-1.9.10-bin.tar.gz
release/ant/binaries/apache-ant-1.9.10-bin.tar.gz.asc
  - copied unchanged from r24728, 
dev/ant/binaries/apache-ant-1.9.10-bin.tar.gz.asc
release/ant/binaries/apache-ant-1.9.10-bin.tar.gz.md5
  - copied unchanged from r24728, 
dev/ant/binaries/apache-ant-1.9.10-bin.tar.gz.md5
release/ant/binaries/apache-ant-1.9.10-bin.tar.gz.sha1
  - copied unchanged from r24728, 
dev/ant/binaries/apache-ant-1.9.10-bin.tar.gz.sha1
release/ant/binaries/apache-ant-1.9.10-bin.tar.gz.sha512
  - copied unchanged from r24728, 
dev/ant/binaries/apache-ant-1.9.10-bin.tar.gz.sha512
release/ant/binaries/apache-ant-1.9.10-bin.zip
  - copied unchanged from r24728, dev/ant/binaries/apache-ant-1.9.10-bin.zip
release/ant/binaries/apache-ant-1.9.10-bin.zip.asc
  - copied unchanged from r24728, 
dev/ant/binaries/apache-ant-1.9.10-bin.zip.asc
release/ant/binaries/apache-ant-1.9.10-bin.zip.md5
  - copied unchanged from r24728, 
dev/ant/binaries/apache

[ant] Git Push Summary

[bodewig]

Repository: ant
Updated Tags:  refs/tags/rel/1.10.2 [created] cea9f8cc2
  refs/tags/rel/1.9.10 [created] c698d207d

svn commit: r1823367 - /ant/site/ant/production/doap_Ant.rdf

[bodewig]

Author: bodewig
Date: Tue Feb  6 17:37:04 2018
New Revision: 1823367

URL: http://svn.apache.org/viewvc?rev=1823367&view=rev
Log:
add new releases

Modified:
ant/site/ant/production/doap_Ant.rdf

Modified: ant/site/ant/production/doap_Ant.rdf
URL: 
http://svn.apache.org/viewvc/ant/site/ant/production/doap_Ant.rdf?rev=1823367&r1=1823366&r2=1823367&view=diff
==
--- ant/site/ant/production/doap_Ant.rdf (original)
+++ ant/site/ant/production/doap_Ant.rdf Tue Feb  6 17:37:04 2018
@@ -35,6 +35,20 @@
 http://projects.apache.org/category/build-management"; />
 
   
+Apache Ant 1.10.2
+2018-02-06
+1.10.2
+  
+
+
+  
+Apache Ant 1.9.10
+2018-02-06
+1.9.10
+  
+
+
+  
 Apache Ant 1.10.1
 2017-02-06
 1.10.1

svn commit: r1823368 - in /ant/site/ant/sources: antnews.xml bindownload.xml index.xml manualdownload.xml srcdownload.xml

[bodewig]

Author: bodewig
Date: Tue Feb  6 17:46:00 2018
New Revision: 1823368

URL: http://svn.apache.org/viewvc?rev=1823368&view=rev
Log:
prepare site update

Modified:
ant/site/ant/sources/antnews.xml
ant/site/ant/sources/bindownload.xml
ant/site/ant/sources/index.xml
ant/site/ant/sources/manualdownload.xml
ant/site/ant/sources/srcdownload.xml

Modified: ant/site/ant/sources/antnews.xml
URL: 
http://svn.apache.org/viewvc/ant/site/ant/sources/antnews.xml?rev=1823368&r1=1823367&r2=1823368&view=diff
==
--- ant/site/ant/sources/antnews.xml (original)
+++ ant/site/ant/sources/antnews.xml Tue Feb  6 17:46:00 2018
@@ -27,6 +27,29 @@
   
 
 
+  
+Feb 6, 2018 - Apache Ant 1.9.10 and 1.10.2 Released
+Apache Ant 1.9.10 and 1.10.2 are now available for download as source or
+  binary from
+  http://ant.apache.org/bindownload.cgi";>http://ant.apache.org/bindownload.cgi.
+
+The Apache Ant team currently maintains two lines of
+  development. The 1.9.x releases require Java5 at runtime and 1.10.x
+  requires Java8 at runtime. Both lines are based off of Ant 1.9.7 and
+  the 1.9.x releases are mostly bug fix releases while additional new
+  features are developed for 1.10.x. We recommend using 1.10.x unless
+  you are required to use versions of Java prior to Java8 during the
+  build process.
+
+Ant 1.10.2 contains a superset of 1.9.10 - with the exception of
+  a few tasks and features that no longer work with Java8 anyway
+  (like the apt task).
+
+Both releases are mostly bug fix releases with a few new
+features being added.
+
+  
+
   
 June 13, 2017 - Apache Compress Ant Library 1.5
 Available

Modified: ant/site/ant/sources/bindownload.xml
URL: 
http://svn.apache.org/viewvc/ant/site/ant/sources/bindownload.xml?rev=1823368&r1=1823367&r2=1823368&view=diff
==
--- ant/site/ant/sources/bindownload.xml (original)
+++ ant/site/ant/sources/bindownload.xml Tue Feb  6 17:46:00 2018
@@ -88,14 +88,14 @@ Other mirrors: 
   you are required to use versions of Java prior to Java8 during the
   build process.
 
-  Currently, Apache Ant 1.9.9 and 1.10.1 are the best available
+  Currently, Apache Ant 1.9.10 and 1.10.2 are the best available
   versions, see the release
   notes.
 
 
 Note
-Ant 1.9.9 and 1.10.1 have been released on
-06-Feb-2017 and may not be available on all mirrors for a few
+Ant 1.9.10 and 1.10.2 have been released on
+06-Feb-2018 and may not be available on all mirrors for a few
 days.
 
 
@@ -106,51 +106,51 @@ days.
 
 
 
-1.10.1 .zip archive:
-apache-ant-1.10.1-bin.zip
-[https://www.apache.org/dist/ant/binaries/apache-ant-1.10.1-bin.zip.asc";>PGP]
-[https://www.apache.org/dist/ant/binaries/apache-ant-1.10.1-bin.zip.sha1";>SHA1]
-[https://www.apache.org/dist/ant/binaries/apache-ant-1.10.1-bin.zip.sha512";>SHA512]
-[https://www.apache.org/dist/ant/binaries/apache-ant-1.10.1-bin.zip.md5";>MD5]
-1.9.9 .zip archive:
-apache-ant-1.9.9-bin.zip
-[https://www.apache.org/dist/ant/binaries/apache-ant-1.9.9-bin.zip.asc";>PGP]
-[https://www.apache.org/dist/ant/binaries/apache-ant-1.9.9-bin.zip.sha1";>SHA1]
-[https://www.apache.org/dist/ant/binaries/apache-ant-1.9.9-bin.zip.sha512";>SHA512]
-[https://www.apache.org/dist/ant/binaries/apache-ant-1.9.9-bin.zip.md5";>MD5]
-
-1.10.1 .tar.gz archive:
-apache-ant-1.10.1-bin.tar.gz
-[https://www.apache.org/dist/ant/binaries/apache-ant-1.10.1-bin.tar.gz.asc";>PGP]
-[https://www.apache.org/dist/ant/binaries/apache-ant-1.10.1-bin.tar.gz.sha1";>SHA1]
-[https://www.apache.org/dist/ant/binaries/apache-ant-1.10.1-bin.tar.gz.sha512";>SHA512]
-[https://www.apache.org/dist/ant/binaries/apache-ant-1.10.1-bin.tar.gz.md5";>MD5]
-1.9.9 .tar.gz archive:
-apache-ant-1.9.9-bin.tar.gz
-[https://www.apache.org/dist/ant/binaries/apache-ant-1.9.9-bin.tar.gz.asc";>PGP]
-[https://www.apache.org/dist/ant/binaries/apache-ant-1.9.9-bin.tar.gz.sha1";>SHA1]
-[https://www.apache.org/dist/ant/binaries/apache-ant-1.9.9-bin.tar.gz.sha512";>SHA512]
-[https://www.apache.org/dist/ant/binaries/apache-ant-1.9.9-bin.tar.gz.md5";>MD5]
-
-1.10.1 .tar.bz2 archive:
-apache-ant-1.10.1-bin.tar.bz2
-[https://www.apache.org/dist/ant/binaries/apache-ant-1.10.1-bin.tar.bz2.asc";>PGP]
-[https://www.apache.org/dist/ant/binaries/apache-ant-1.10.1-bin.tar.bz2.sha1";>SHA1]
-[https://www.apache.org/dist/ant/binaries/apache-ant-1.10.1-bin.tar.bz2.sha512";>SHA512]
-[https://www.apache.org/dist/ant/binaries/apache-ant-1.10.1-bin.tar.bz2.md5";>MD5]
-1.9.9 .tar.bz2 archive:
-apache-ant-1.9.9-bin.tar.bz2
-[https://www.apache.org/dist/ant/binaries/apache-ant-1.9.9-bin.tar.bz2.asc";>PGP]
-[https://www.apach

[1/2] ant git commit: preparing RC1 of Ant 1.9.10

[bodewig]

Repository: ant
Updated Branches:
  refs/heads/1.9.x 49d2f3ef9 -> 146df3615


preparing RC1 of Ant 1.9.10


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/528c94ee
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/528c94ee
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/528c94ee

Branch: refs/heads/1.9.x
Commit: 528c94ee425606780d46985e439ca9eab2b403aa
Parents: 8740913
Author: Stefan Bodewig 
Authored: Sat Feb 3 17:08:35 2018 +0100
Committer: Stefan Bodewig 
Committed: Sat Feb 3 17:08:35 2018 +0100

--
 build.xml| 4 ++--
 src/etc/poms/ant-antlr/pom.xml   | 6 +++---
 src/etc/poms/ant-apache-bcel/pom.xml | 6 +++---
 src/etc/poms/ant-apache-bsf/pom.xml  | 6 +++---
 src/etc/poms/ant-apache-log4j/pom.xml| 6 +++---
 src/etc/poms/ant-apache-oro/pom.xml  | 6 +++---
 src/etc/poms/ant-apache-regexp/pom.xml   | 6 +++---
 src/etc/poms/ant-apache-resolver/pom.xml | 6 +++---
 src/etc/poms/ant-apache-xalan2/pom.xml   | 6 +++---
 src/etc/poms/ant-commons-logging/pom.xml | 6 +++---
 src/etc/poms/ant-commons-net/pom.xml | 6 +++---
 src/etc/poms/ant-jai/pom.xml | 6 +++---
 src/etc/poms/ant-javamail/pom.xml| 6 +++---
 src/etc/poms/ant-jdepend/pom.xml | 6 +++---
 src/etc/poms/ant-jmf/pom.xml | 6 +++---
 src/etc/poms/ant-jsch/pom.xml| 6 +++---
 src/etc/poms/ant-junit/pom.xml   | 6 +++---
 src/etc/poms/ant-junit4/pom.xml  | 6 +++---
 src/etc/poms/ant-launcher/pom.xml| 4 ++--
 src/etc/poms/ant-netrexx/pom.xml | 6 +++---
 src/etc/poms/ant-swing/pom.xml   | 6 +++---
 src/etc/poms/ant-testutil/pom.xml| 6 +++---
 src/etc/poms/ant/pom.xml | 6 +++---
 src/etc/poms/pom.xml | 2 +-
 24 files changed, 68 insertions(+), 68 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/528c94ee/build.xml
--
diff --git a/build.xml b/build.xml
index 37476c0..f406504 100644
--- a/build.xml
+++ b/build.xml
@@ -33,9 +33,9 @@
   
   
   
-  
+  
   
-  
+  
   
   
 

http://git-wip-us.apache.org/repos/asf/ant/blob/528c94ee/src/etc/poms/ant-antlr/pom.xml
--
diff --git a/src/etc/poms/ant-antlr/pom.xml b/src/etc/poms/ant-antlr/pom.xml
index 7eb2863..2228529 100644
--- a/src/etc/poms/ant-antlr/pom.xml
+++ b/src/etc/poms/ant-antlr/pom.xml
@@ -27,13 +27,13 @@
 org.apache.ant
 ant-parent
 ../pom.xml
-1.9.10-SNAPSHOT
+1.9.10
   
   4.0.0
   http://ant.apache.org/
   org.apache.ant
   ant-antlr
-  1.9.10-SNAPSHOT
+  1.9.10
   Apache Ant + ANTLR
   antlr specific task.
 The implementation forks a java process, therefore the antlr jar file is 
only needed at runtime
@@ -41,7 +41,7 @@
 
   org.apache.ant
   ant
-  1.9.10-SNAPSHOT
+  1.9.10
   true
   compile
 

http://git-wip-us.apache.org/repos/asf/ant/blob/528c94ee/src/etc/poms/ant-apache-bcel/pom.xml
--
diff --git a/src/etc/poms/ant-apache-bcel/pom.xml 
b/src/etc/poms/ant-apache-bcel/pom.xml
index c526eab..8534299 100644
--- a/src/etc/poms/ant-apache-bcel/pom.xml
+++ b/src/etc/poms/ant-apache-bcel/pom.xml
@@ -27,19 +27,19 @@
 org.apache.ant
 ant-parent
 ../pom.xml
-1.9.10-SNAPSHOT
+1.9.10
   
   4.0.0
   http://ant.apache.org/
   org.apache.ant
   ant-apache-bcel
-  1.9.10-SNAPSHOT
+  1.9.10
   Apache Ant + BCEL
   
 
   org.apache.ant
   ant
-  1.9.10-SNAPSHOT
+  1.9.10
   compile
 
 

http://git-wip-us.apache.org/repos/asf/ant/blob/528c94ee/src/etc/poms/ant-apache-bsf/pom.xml
--
diff --git a/src/etc/poms/ant-apache-bsf/pom.xml 
b/src/etc/poms/ant-apache-bsf/pom.xml
index 0975ce4..edce54f 100644
--- a/src/etc/poms/ant-apache-bsf/pom.xml
+++ b/src/etc/poms/ant-apache-bsf/pom.xml
@@ -27,19 +27,19 @@
 org.apache.ant
 ant-parent
 ../pom.xml
-1.9.10-SNAPSHOT
+1.9.10
   
   4.0.0
   http://ant.apache.org/
   org.apache.ant
   ant-apache-bsf
-  1.9.10-SNAPSHOT
+  1.9.10
   Apache Ant + BSF
   
 
   org.apache.ant
   ant
-  1.9.10-SNAPSHOT
+  1.9.10
   compile
 
 

http://git-wip-us.apache.org/repos/asf/ant/blob/528c94ee/src/etc/poms/ant-apache-log4j/pom.xml
--
diff --git a/src/etc/poms/ant-apache-log4j/pom.xml 
b/src/etc/poms/ant-apache-log4j/pom.xml
index b9b558e..1e621c4 100644
--- a/src/etc/poms/ant-apache-log4j/pom.xml
+++ b/src/etc/poms/ant-apache-log4j/pom.xml
@@ -26,19 +26,19 @@ xsi:schemaLocation=&q

[2/2] ant git commit: Merge tag 'rel/1.9.10' into 1.9.x and prepare next iteration

[bodewig]

Merge tag 'rel/1.9.10' into 1.9.x and prepare next iteration


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/146df361
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/146df361
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/146df361

Branch: refs/heads/1.9.x
Commit: 146df361556b499f2fa7d34f58a86508b9492652
Parents: 49d2f3e 528c94e
Author: Stefan Bodewig 
Authored: Tue Feb 6 18:55:27 2018 +0100
Committer: Stefan Bodewig 
Committed: Tue Feb 6 18:57:45 2018 +0100

--
 WHATSNEW |  3 +++
 build.xml|  6 +++---
 manual/cover.html|  6 +++---
 manual/credits.html  |  2 +-
 release/ivy.xml  |  2 +-
 src/etc/poms/ant-antlr/pom.xml   |  6 +++---
 src/etc/poms/ant-apache-bcel/pom.xml |  6 +++---
 src/etc/poms/ant-apache-bsf/pom.xml  |  6 +++---
 src/etc/poms/ant-apache-log4j/pom.xml|  6 +++---
 src/etc/poms/ant-apache-oro/pom.xml  |  6 +++---
 src/etc/poms/ant-apache-regexp/pom.xml   |  6 +++---
 src/etc/poms/ant-apache-resolver/pom.xml |  6 +++---
 src/etc/poms/ant-apache-xalan2/pom.xml   |  6 +++---
 src/etc/poms/ant-commons-logging/pom.xml |  6 +++---
 src/etc/poms/ant-commons-net/pom.xml |  6 +++---
 src/etc/poms/ant-jai/pom.xml |  6 +++---
 src/etc/poms/ant-javamail/pom.xml|  6 +++---
 src/etc/poms/ant-jdepend/pom.xml |  6 +++---
 src/etc/poms/ant-jmf/pom.xml |  6 +++---
 src/etc/poms/ant-jsch/pom.xml|  6 +++---
 src/etc/poms/ant-junit/pom.xml   |  6 +++---
 src/etc/poms/ant-junit4/pom.xml  |  6 +++---
 src/etc/poms/ant-launcher/pom.xml|  4 ++--
 src/etc/poms/ant-netrexx/pom.xml |  6 +++---
 src/etc/poms/ant-swing/pom.xml   |  6 +++---
 src/etc/poms/ant-testutil/pom.xml|  6 +++---
 src/etc/poms/ant/pom.xml |  6 +++---
 src/etc/poms/pom.xml |  2 +-
 src/etc/testcases/taskdefs/conditions/antversion.xml | 12 ++--
 29 files changed, 83 insertions(+), 80 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/146df361/WHATSNEW
--
diff --cc WHATSNEW
index 923f75a,923f75a..17e68ca
--- a/WHATSNEW
+++ b/WHATSNEW
@@@ -1,3 -1,3 +1,6 @@@
++Changes from Ant 1.9.10 TO Ant 1.9.11
++=
++
  Changes from Ant 1.9.9 TO Ant 1.9.10
  
  

http://git-wip-us.apache.org/repos/asf/ant/blob/146df361/build.xml
--
diff --cc build.xml
index 67d6705,f406504..102793a
--- a/build.xml
+++ b/build.xml
@@@ -33,10 -33,10 +33,10 @@@



-   
 -  
++  

-   
 -  
--  
++  
++  

  


http://git-wip-us.apache.org/repos/asf/ant/blob/146df361/manual/cover.html
--
diff --cc manual/cover.html
index 15ae811,15ae811..4612e52
--- a/manual/cover.html
+++ b/manual/cover.html
@@@ -19,14 -19,14 +19,14 @@@
  
  
  
--Apache Ant 1.9.10 User Manual
++Apache Ant 1.9.11 User Manual
  
  
  
   

--  Apache Ant™ 1.9.10 Manual
--  This is the manual for version 1.9.10 of
++  Apache Ant™ 1.9.11 Manual
++  This is the manual for version 1.9.11 of
http://ant.apache.org/index.html";>Apache Ant. 
  If your version 
  of Ant (as verified with ant -version) is older or newer than 
this 

http://git-wip-us.apache.org/repos/asf/ant/blob/146df361/manual/credits.html
--
diff --cc manual/credits.html
index 85e92b6,85e92b6..97fee5c
--- a/manual/credits.html
+++ b/manual/credits.html
@@@ -62,7 -62,7 +62,7 @@@
  
  
  
--Version: 1.9.10
++Version: 1.9.11
  
  
  

http://git-wip-us.apache.org/repos/asf/ant/blob/146df361/release/ivy.xml
--
diff --cc release/ivy.xml
index 2efe770,2efe770..005fa97
--- a/release/ivy.xml
+++ b/release/ivy.xml
@@@ -19,7 -19,7 +19,7 @@@
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
  
xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd";>

++module="ant" revision="1.9.11"/>

  
  

http://git-wip-us.apach

svn commit: r1823371 - /ant/site/ant/sources/faq.xml

[bodewig]

Author: bodewig
Date: Tue Feb  6 17:59:28 2018
New Revision: 1823371

URL: http://svn.apache.org/viewvc?rev=1823371&view=rev
Log:
forgot to update FAQ

Modified:
ant/site/ant/sources/faq.xml

Modified: ant/site/ant/sources/faq.xml
URL: 
http://svn.apache.org/viewvc/ant/site/ant/sources/faq.xml?rev=1823371&r1=1823370&r2=1823371&view=diff
==
--- ant/site/ant/sources/faq.xml (original)
+++ ant/site/ant/sources/faq.xml Tue Feb  6 17:59:28 2018
@@ -267,6 +267,10 @@
 1.9.9
 06 Feb 2017
   
+  
+1.9.10
+06 Feb 2018
+  
 
   
 1.10.0
@@ -276,6 +280,10 @@
 1.10.1
 06 Feb 2017
   
+  
+1.10.2
+06 Feb 2018
+  
 
   
 

[3/7] ant git commit: Correct use of remoteRepository

[bodewig]

Correct use of remoteRepository

Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/536d0e6c
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/536d0e6c
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/536d0e6c

Branch: refs/heads/master
Commit: 536d0e6c8802e4e324df65ad675cbe26a7ba39e6
Parents: 8740913
Author: Gintas Grigelionis 
Authored: Sat Feb 3 18:41:54 2018 +0100
Committer: Gintas Grigelionis 
Committed: Sat Feb 3 18:41:54 2018 +0100

--
 fetch.xml | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/536d0e6c/fetch.xml
--
diff --git a/fetch.xml b/fetch.xml
index b92673e..51b438b 100644
--- a/fetch.xml
+++ b/fetch.xml
@@ -109,6 +109,7 @@ Set -Ddest=LOCATION on the command line
   
   
   
+  
   
 
   Unknown archive @{archive} -no property @{archive}.version defined 
in ${lib.dir}/libraries.properties.
@@ -118,7 +119,6 @@ Set -Ddest=LOCATION on the command line
 
   
 
-
 
   
 
   
+  
 
 
 
@@ -329,9 +330,9 @@ Set -Ddest=LOCATION on the command line
   
-https://repository.jboss.org/nexus/content/groups/public/"/>
-https://repository.jboss.org/nexus/content/groups/public/"/>
   
 

[1/7] ant git commit: preparing RC1 of Ant 1.9.10

[bodewig]

Repository: ant
Updated Branches:
  refs/heads/master a0a2bc391 -> 2b5310393


preparing RC1 of Ant 1.9.10


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/528c94ee
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/528c94ee
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/528c94ee

Branch: refs/heads/master
Commit: 528c94ee425606780d46985e439ca9eab2b403aa
Parents: 8740913
Author: Stefan Bodewig 
Authored: Sat Feb 3 17:08:35 2018 +0100
Committer: Stefan Bodewig 
Committed: Sat Feb 3 17:08:35 2018 +0100

--
 build.xml| 4 ++--
 src/etc/poms/ant-antlr/pom.xml   | 6 +++---
 src/etc/poms/ant-apache-bcel/pom.xml | 6 +++---
 src/etc/poms/ant-apache-bsf/pom.xml  | 6 +++---
 src/etc/poms/ant-apache-log4j/pom.xml| 6 +++---
 src/etc/poms/ant-apache-oro/pom.xml  | 6 +++---
 src/etc/poms/ant-apache-regexp/pom.xml   | 6 +++---
 src/etc/poms/ant-apache-resolver/pom.xml | 6 +++---
 src/etc/poms/ant-apache-xalan2/pom.xml   | 6 +++---
 src/etc/poms/ant-commons-logging/pom.xml | 6 +++---
 src/etc/poms/ant-commons-net/pom.xml | 6 +++---
 src/etc/poms/ant-jai/pom.xml | 6 +++---
 src/etc/poms/ant-javamail/pom.xml| 6 +++---
 src/etc/poms/ant-jdepend/pom.xml | 6 +++---
 src/etc/poms/ant-jmf/pom.xml | 6 +++---
 src/etc/poms/ant-jsch/pom.xml| 6 +++---
 src/etc/poms/ant-junit/pom.xml   | 6 +++---
 src/etc/poms/ant-junit4/pom.xml  | 6 +++---
 src/etc/poms/ant-launcher/pom.xml| 4 ++--
 src/etc/poms/ant-netrexx/pom.xml | 6 +++---
 src/etc/poms/ant-swing/pom.xml   | 6 +++---
 src/etc/poms/ant-testutil/pom.xml| 6 +++---
 src/etc/poms/ant/pom.xml | 6 +++---
 src/etc/poms/pom.xml | 2 +-
 24 files changed, 68 insertions(+), 68 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/528c94ee/build.xml
--
diff --git a/build.xml b/build.xml
index 37476c0..f406504 100644
--- a/build.xml
+++ b/build.xml
@@ -33,9 +33,9 @@
   
   
   
-  
+  
   
-  
+  
   
   
 

http://git-wip-us.apache.org/repos/asf/ant/blob/528c94ee/src/etc/poms/ant-antlr/pom.xml
--
diff --git a/src/etc/poms/ant-antlr/pom.xml b/src/etc/poms/ant-antlr/pom.xml
index 7eb2863..2228529 100644
--- a/src/etc/poms/ant-antlr/pom.xml
+++ b/src/etc/poms/ant-antlr/pom.xml
@@ -27,13 +27,13 @@
 org.apache.ant
 ant-parent
 ../pom.xml
-1.9.10-SNAPSHOT
+1.9.10
   
   4.0.0
   http://ant.apache.org/
   org.apache.ant
   ant-antlr
-  1.9.10-SNAPSHOT
+  1.9.10
   Apache Ant + ANTLR
   antlr specific task.
 The implementation forks a java process, therefore the antlr jar file is 
only needed at runtime
@@ -41,7 +41,7 @@
 
   org.apache.ant
   ant
-  1.9.10-SNAPSHOT
+  1.9.10
   true
   compile
 

http://git-wip-us.apache.org/repos/asf/ant/blob/528c94ee/src/etc/poms/ant-apache-bcel/pom.xml
--
diff --git a/src/etc/poms/ant-apache-bcel/pom.xml 
b/src/etc/poms/ant-apache-bcel/pom.xml
index c526eab..8534299 100644
--- a/src/etc/poms/ant-apache-bcel/pom.xml
+++ b/src/etc/poms/ant-apache-bcel/pom.xml
@@ -27,19 +27,19 @@
 org.apache.ant
 ant-parent
 ../pom.xml
-1.9.10-SNAPSHOT
+1.9.10
   
   4.0.0
   http://ant.apache.org/
   org.apache.ant
   ant-apache-bcel
-  1.9.10-SNAPSHOT
+  1.9.10
   Apache Ant + BCEL
   
 
   org.apache.ant
   ant
-  1.9.10-SNAPSHOT
+  1.9.10
   compile
 
 

http://git-wip-us.apache.org/repos/asf/ant/blob/528c94ee/src/etc/poms/ant-apache-bsf/pom.xml
--
diff --git a/src/etc/poms/ant-apache-bsf/pom.xml 
b/src/etc/poms/ant-apache-bsf/pom.xml
index 0975ce4..edce54f 100644
--- a/src/etc/poms/ant-apache-bsf/pom.xml
+++ b/src/etc/poms/ant-apache-bsf/pom.xml
@@ -27,19 +27,19 @@
 org.apache.ant
 ant-parent
 ../pom.xml
-1.9.10-SNAPSHOT
+1.9.10
   
   4.0.0
   http://ant.apache.org/
   org.apache.ant
   ant-apache-bsf
-  1.9.10-SNAPSHOT
+  1.9.10
   Apache Ant + BSF
   
 
   org.apache.ant
   ant
-  1.9.10-SNAPSHOT
+  1.9.10
   compile
 
 

http://git-wip-us.apache.org/repos/asf/ant/blob/528c94ee/src/etc/poms/ant-apache-log4j/pom.xml
--
diff --git a/src/etc/poms/ant-apache-log4j/pom.xml 
b/src/etc/poms/ant-apache-log4j/pom.xml
index b9b558e..1e621c4 100644
--- a/src/etc/poms/ant-apache-log4j/pom.xml
+++ b/src/etc/poms/ant-apache-log4j/pom.xml
@@ -26,19 +26,19 @@ xsi:schemaLocation=&q

[5/7] ant git commit: Merge tag 'rel/1.9.10' into 1.9.x and prepare next iteration

[bodewig]

Merge tag 'rel/1.9.10' into 1.9.x and prepare next iteration


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/146df361
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/146df361
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/146df361

Branch: refs/heads/master
Commit: 146df361556b499f2fa7d34f58a86508b9492652
Parents: 49d2f3e 528c94e
Author: Stefan Bodewig 
Authored: Tue Feb 6 18:55:27 2018 +0100
Committer: Stefan Bodewig 
Committed: Tue Feb 6 18:57:45 2018 +0100

--
 WHATSNEW |  3 +++
 build.xml|  6 +++---
 manual/cover.html|  6 +++---
 manual/credits.html  |  2 +-
 release/ivy.xml  |  2 +-
 src/etc/poms/ant-antlr/pom.xml   |  6 +++---
 src/etc/poms/ant-apache-bcel/pom.xml |  6 +++---
 src/etc/poms/ant-apache-bsf/pom.xml  |  6 +++---
 src/etc/poms/ant-apache-log4j/pom.xml|  6 +++---
 src/etc/poms/ant-apache-oro/pom.xml  |  6 +++---
 src/etc/poms/ant-apache-regexp/pom.xml   |  6 +++---
 src/etc/poms/ant-apache-resolver/pom.xml |  6 +++---
 src/etc/poms/ant-apache-xalan2/pom.xml   |  6 +++---
 src/etc/poms/ant-commons-logging/pom.xml |  6 +++---
 src/etc/poms/ant-commons-net/pom.xml |  6 +++---
 src/etc/poms/ant-jai/pom.xml |  6 +++---
 src/etc/poms/ant-javamail/pom.xml|  6 +++---
 src/etc/poms/ant-jdepend/pom.xml |  6 +++---
 src/etc/poms/ant-jmf/pom.xml |  6 +++---
 src/etc/poms/ant-jsch/pom.xml|  6 +++---
 src/etc/poms/ant-junit/pom.xml   |  6 +++---
 src/etc/poms/ant-junit4/pom.xml  |  6 +++---
 src/etc/poms/ant-launcher/pom.xml|  4 ++--
 src/etc/poms/ant-netrexx/pom.xml |  6 +++---
 src/etc/poms/ant-swing/pom.xml   |  6 +++---
 src/etc/poms/ant-testutil/pom.xml|  6 +++---
 src/etc/poms/ant/pom.xml |  6 +++---
 src/etc/poms/pom.xml |  2 +-
 src/etc/testcases/taskdefs/conditions/antversion.xml | 12 ++--
 29 files changed, 83 insertions(+), 80 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/146df361/WHATSNEW
--
diff --cc WHATSNEW
index 923f75a,923f75a..17e68ca
--- a/WHATSNEW
+++ b/WHATSNEW
@@@ -1,3 -1,3 +1,6 @@@
++Changes from Ant 1.9.10 TO Ant 1.9.11
++=
++
  Changes from Ant 1.9.9 TO Ant 1.9.10
  
  

http://git-wip-us.apache.org/repos/asf/ant/blob/146df361/build.xml
--
diff --cc build.xml
index 67d6705,f406504..102793a
--- a/build.xml
+++ b/build.xml
@@@ -33,10 -33,10 +33,10 @@@



-   
 -  
++  

-   
 -  
--  
++  
++  

  


http://git-wip-us.apache.org/repos/asf/ant/blob/146df361/manual/cover.html
--
diff --cc manual/cover.html
index 15ae811,15ae811..4612e52
--- a/manual/cover.html
+++ b/manual/cover.html
@@@ -19,14 -19,14 +19,14 @@@
  
  
  
--Apache Ant 1.9.10 User Manual
++Apache Ant 1.9.11 User Manual
  
  
  
   

--  Apache Ant™ 1.9.10 Manual
--  This is the manual for version 1.9.10 of
++  Apache Ant™ 1.9.11 Manual
++  This is the manual for version 1.9.11 of
http://ant.apache.org/index.html";>Apache Ant. 
  If your version 
  of Ant (as verified with ant -version) is older or newer than 
this 

http://git-wip-us.apache.org/repos/asf/ant/blob/146df361/manual/credits.html
--
diff --cc manual/credits.html
index 85e92b6,85e92b6..97fee5c
--- a/manual/credits.html
+++ b/manual/credits.html
@@@ -62,7 -62,7 +62,7 @@@
  
  
  
--Version: 1.9.10
++Version: 1.9.11
  
  
  

http://git-wip-us.apache.org/repos/asf/ant/blob/146df361/release/ivy.xml
--
diff --cc release/ivy.xml
index 2efe770,2efe770..005fa97
--- a/release/ivy.xml
+++ b/release/ivy.xml
@@@ -19,7 -19,7 +19,7 @@@
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
  
xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd";>

++module="ant" revision="1.9.11"/>

  
  

http://git-wip-us.apach

[4/7] ant git commit: Make JetBrains CI work

[bodewig]

Make JetBrains CI work

Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/49d2f3ef
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/49d2f3ef
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/49d2f3ef

Branch: refs/heads/master
Commit: 49d2f3ef9b334a1a849849eda2f47ba107c034dc
Parents: 536d0e6
Author: Gintas Grigelionis 
Authored: Sat Feb 3 18:45:23 2018 +0100
Committer: Gintas Grigelionis 
Committed: Sat Feb 3 18:45:23 2018 +0100

--
 build.xml | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/49d2f3ef/build.xml
--
diff --git a/build.xml b/build.xml
index 37476c0..67d6705 100644
--- a/build.xml
+++ b/build.xml
@@ -1936,6 +1936,9 @@ ${antunit.reports}
 
   
 
+  
+  
+
   
 
 

[7/7] ant git commit: Merge tag 'rel/1.10.2' and prepare for next iteration

[bodewig]

Merge tag 'rel/1.10.2' and prepare for next iteration


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/2b531039
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/2b531039
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/2b531039

Branch: refs/heads/master
Commit: 2b53103932031a1d2321f5dc890ede55a9833f95
Parents: a4a2cde 0eba7eb
Author: Stefan Bodewig 
Authored: Tue Feb 6 19:04:25 2018 +0100
Committer: Stefan Bodewig 
Committed: Tue Feb 6 19:07:10 2018 +0100

--
 WHATSNEW | 3 +++
 build.xml| 6 +++---
 manual/cover.html| 6 +++---
 manual/credits.html  | 2 +-
 release/ivy.xml  | 2 +-
 src/etc/poms/ant-antlr/pom.xml   | 6 +++---
 src/etc/poms/ant-apache-bcel/pom.xml | 6 +++---
 src/etc/poms/ant-apache-bsf/pom.xml  | 6 +++---
 src/etc/poms/ant-apache-log4j/pom.xml| 6 +++---
 src/etc/poms/ant-apache-oro/pom.xml  | 6 +++---
 src/etc/poms/ant-apache-regexp/pom.xml   | 6 +++---
 src/etc/poms/ant-apache-resolver/pom.xml | 6 +++---
 src/etc/poms/ant-apache-xalan2/pom.xml   | 6 +++---
 src/etc/poms/ant-commons-logging/pom.xml | 6 +++---
 src/etc/poms/ant-commons-net/pom.xml | 6 +++---
 src/etc/poms/ant-jai/pom.xml | 6 +++---
 src/etc/poms/ant-javamail/pom.xml| 6 +++---
 src/etc/poms/ant-jdepend/pom.xml | 6 +++---
 src/etc/poms/ant-jmf/pom.xml | 6 +++---
 src/etc/poms/ant-jsch/pom.xml| 6 +++---
 src/etc/poms/ant-junit/pom.xml   | 6 +++---
 src/etc/poms/ant-junit4/pom.xml  | 6 +++---
 src/etc/poms/ant-launcher/pom.xml| 4 ++--
 src/etc/poms/ant-netrexx/pom.xml | 6 +++---
 src/etc/poms/ant-swing/pom.xml   | 6 +++---
 src/etc/poms/ant-testutil/pom.xml| 6 +++---
 src/etc/poms/ant-xz/pom.xml  | 6 +++---
 src/etc/poms/ant/pom.xml | 6 +++---
 src/etc/poms/pom.xml | 2 +-
 src/etc/testcases/taskdefs/conditions/antversion.xml | 4 ++--
 30 files changed, 82 insertions(+), 79 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/2b531039/WHATSNEW
--
diff --cc WHATSNEW
index 92fbfdf,92fbfdf..541fbfa
--- a/WHATSNEW
+++ b/WHATSNEW
@@@ -1,3 -1,3 +1,6 @@@
++Changes from Ant 1.10.2 TO Ant 1.10.3
++=
++
  Changes from Ant 1.10.1 TO Ant 1.10.2
  =
  

http://git-wip-us.apache.org/repos/asf/ant/blob/2b531039/build.xml
--
diff --cc build.xml
index 98c47fd,31de619..f9096f3
--- a/build.xml
+++ b/build.xml
@@@ -33,10 -33,10 +33,10 @@@



-   
 -  
++  

-   
 -  
--  
++  
++  

  


http://git-wip-us.apache.org/repos/asf/ant/blob/2b531039/manual/cover.html
--
diff --cc manual/cover.html
index e4912d9,e4912d9..7075d60
--- a/manual/cover.html
+++ b/manual/cover.html
@@@ -19,14 -19,14 +19,14 @@@
  
  
  
--Apache Ant 1.10.2 User Manual
++Apache Ant 1.10.3 User Manual
  
  
  
   

--  Apache Ant™ 1.10.2 Manual
--  This is the manual for version 1.10.2 of
++  Apache Ant™ 1.10.3 Manual
++  This is the manual for version 1.10.3 of
http://ant.apache.org/index.html";>Apache Ant. 
  If your version 
  of Ant (as verified with ant -version) is older or newer than 
this 

http://git-wip-us.apache.org/repos/asf/ant/blob/2b531039/manual/credits.html
--
diff --cc manual/credits.html
index f6cd947,f6cd947..1d9e4bf
--- a/manual/credits.html
+++ b/manual/credits.html
@@@ -62,7 -62,7 +62,7 @@@
  
  
  
--Version: 1.10.2
++Version: 1.10.3
  
  
  

http://git-wip-us.apache.org/repos/asf/ant/blob/2b531039/release/ivy.xml
--
diff --cc release/ivy.xml
index ac8c9d7,ac8c9d7..0c6888f
--- a/release/ivy.xml
+++ b/release/ivy.xml
@@@ -19,7 -19,7 +19,7 @@@
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
  
xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd";>

++module="ant" revision="1.10.3"/>

  
  

http://git-wip-

[6/7] ant git commit: Merge branch '1.9.x'

[bodewig]

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/a4a2cdec
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/a4a2cdec
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/a4a2cdec

Branch: refs/heads/master
Commit: a4a2cdeceeabd4b8616b0f49c4c44f5bcc5c9452
Parents: a0a2bc3 146df36
Author: Stefan Bodewig 
Authored: Tue Feb 6 19:04:09 2018 +0100
Committer: Stefan Bodewig 
Committed: Tue Feb 6 19:04:09 2018 +0100

--

--

[2/7] ant git commit: prepare RC1 of Ant 1.10.2

[bodewig]

prepare RC1 of Ant 1.10.2


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/0eba7eb4
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/0eba7eb4
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/0eba7eb4

Branch: refs/heads/master
Commit: 0eba7eb4ab29653f631cda57a2af6b073e2c3989
Parents: 314eb43
Author: Stefan Bodewig 
Authored: Sat Feb 3 17:46:05 2018 +0100
Committer: Stefan Bodewig 
Committed: Sat Feb 3 17:46:05 2018 +0100

--
 build.xml| 4 ++--
 src/etc/poms/ant-antlr/pom.xml   | 6 +++---
 src/etc/poms/ant-apache-bcel/pom.xml | 6 +++---
 src/etc/poms/ant-apache-bsf/pom.xml  | 6 +++---
 src/etc/poms/ant-apache-log4j/pom.xml| 6 +++---
 src/etc/poms/ant-apache-oro/pom.xml  | 6 +++---
 src/etc/poms/ant-apache-regexp/pom.xml   | 6 +++---
 src/etc/poms/ant-apache-resolver/pom.xml | 6 +++---
 src/etc/poms/ant-apache-xalan2/pom.xml   | 6 +++---
 src/etc/poms/ant-commons-logging/pom.xml | 6 +++---
 src/etc/poms/ant-commons-net/pom.xml | 6 +++---
 src/etc/poms/ant-jai/pom.xml | 6 +++---
 src/etc/poms/ant-javamail/pom.xml| 6 +++---
 src/etc/poms/ant-jdepend/pom.xml | 6 +++---
 src/etc/poms/ant-jmf/pom.xml | 6 +++---
 src/etc/poms/ant-jsch/pom.xml| 6 +++---
 src/etc/poms/ant-junit/pom.xml   | 6 +++---
 src/etc/poms/ant-junit4/pom.xml  | 6 +++---
 src/etc/poms/ant-launcher/pom.xml| 4 ++--
 src/etc/poms/ant-netrexx/pom.xml | 6 +++---
 src/etc/poms/ant-swing/pom.xml   | 6 +++---
 src/etc/poms/ant-testutil/pom.xml| 6 +++---
 src/etc/poms/ant-xz/pom.xml  | 6 +++---
 src/etc/poms/ant/pom.xml | 6 +++---
 src/etc/poms/pom.xml | 2 +-
 25 files changed, 71 insertions(+), 71 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/0eba7eb4/build.xml
--
diff --git a/build.xml b/build.xml
index 62314dd..31de619 100644
--- a/build.xml
+++ b/build.xml
@@ -33,9 +33,9 @@
   
   
   
-  
+  
   
-  
+  
   
   
 

http://git-wip-us.apache.org/repos/asf/ant/blob/0eba7eb4/src/etc/poms/ant-antlr/pom.xml
--
diff --git a/src/etc/poms/ant-antlr/pom.xml b/src/etc/poms/ant-antlr/pom.xml
index f0b960c..a719674 100644
--- a/src/etc/poms/ant-antlr/pom.xml
+++ b/src/etc/poms/ant-antlr/pom.xml
@@ -27,13 +27,13 @@
 org.apache.ant
 ant-parent
 ../pom.xml
-1.10.2-SNAPSHOT
+1.10.2
   
   4.0.0
   http://ant.apache.org/
   org.apache.ant
   ant-antlr
-  1.10.2-SNAPSHOT
+  1.10.2
   Apache Ant + ANTLR
   antlr specific task.
 The implementation forks a java process, therefore the antlr jar file is 
only needed at runtime
@@ -41,7 +41,7 @@
 
   org.apache.ant
   ant
-  1.10.2-SNAPSHOT
+  1.10.2
   true
   compile
 

http://git-wip-us.apache.org/repos/asf/ant/blob/0eba7eb4/src/etc/poms/ant-apache-bcel/pom.xml
--
diff --git a/src/etc/poms/ant-apache-bcel/pom.xml 
b/src/etc/poms/ant-apache-bcel/pom.xml
index 11e068a..68558e7 100644
--- a/src/etc/poms/ant-apache-bcel/pom.xml
+++ b/src/etc/poms/ant-apache-bcel/pom.xml
@@ -27,19 +27,19 @@
 org.apache.ant
 ant-parent
 ../pom.xml
-1.10.2-SNAPSHOT
+1.10.2
   
   4.0.0
   http://ant.apache.org/
   org.apache.ant
   ant-apache-bcel
-  1.10.2-SNAPSHOT
+  1.10.2
   Apache Ant + BCEL
   
 
   org.apache.ant
   ant
-  1.10.2-SNAPSHOT
+  1.10.2
   compile
 
 

http://git-wip-us.apache.org/repos/asf/ant/blob/0eba7eb4/src/etc/poms/ant-apache-bsf/pom.xml
--
diff --git a/src/etc/poms/ant-apache-bsf/pom.xml 
b/src/etc/poms/ant-apache-bsf/pom.xml
index 5fdea3f..8735419 100644
--- a/src/etc/poms/ant-apache-bsf/pom.xml
+++ b/src/etc/poms/ant-apache-bsf/pom.xml
@@ -27,19 +27,19 @@
 org.apache.ant
 ant-parent
 ../pom.xml
-1.10.2-SNAPSHOT
+1.10.2
   
   4.0.0
   http://ant.apache.org/
   org.apache.ant
   ant-apache-bsf
-  1.10.2-SNAPSHOT
+  1.10.2
   Apache Ant + BSF
   
 
   org.apache.ant
   ant
-  1.10.2-SNAPSHOT
+  1.10.2
   compile
 
 

http://git-wip-us.apache.org/repos/asf/ant/blob/0eba7eb4/src/etc/poms/ant-apache-log4j/pom.xml
--
diff --git a/src/etc/poms/ant-apache-log4j/pom.xml 
b/src/etc/poms/ant-apache-log4j/pom.xml
index e85dd38..3948b74 100644
--- a/src/etc/poms/ant-apache-log4j/pom.xml
+++ b/src/etc/poms/ant-apache-log4j/pom.xml
@@ -26,19 +26,19 @@ xsi:schemaLocation="http://maven.apache.org/POM/

[4/5] ant-antlibs-compress git commit: make project description more current

[bodewig]

make project description more current


Project: http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/commit/9aa28d98
Tree: http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/tree/9aa28d98
Diff: http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/diff/9aa28d98

Branch: refs/heads/master
Commit: 9aa28d9846c5c96365fde414698a668b0e8e20b5
Parents: d282fff
Author: Stefan Bodewig 
Authored: Tue Feb 6 21:46:38 2018 +0100
Committer: Stefan Bodewig 
Committed: Tue Feb 6 21:46:38 2018 +0100

--
 project-template.pom | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/9aa28d98/project-template.pom
--
diff --git a/project-template.pom b/project-template.pom
index b2a1174..f3f7dc1 100644
--- a/project-template.pom
+++ b/project-template.pom
@@ -26,10 +26,10 @@
   Apache Compress Antlib
   http://ant.apache.org/antlibs/compress/
   
-Provides tasks and types that deal with AR, ARJ, CPIO, TAR,
-DUMP, 7Z and ZIP archives as well as BZIP2, PACK200, GZIP, LZMA,
-Snappy, LZ4, Brotli and XZ compressed files based on Apache
-Commons Compress.
+Provides tasks and types that deal with AR, ARJ, CPIO, TAR, DUMP,
+7Z and ZIP archives as well as BZIP2, PACK200, GZIP, LZMA, Snappy,
+LZ4, Brotli, DEFLATE, DEFLATE64, Zstandard, Unix compress and XZ
+compressed files based on Apache Commons Compress.
   
   
 

[2/5] ant-antlibs-compress git commit: forgot to update manual with Commons Compress version change

[bodewig]

forgot to update manual with Commons Compress version change


Project: http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/commit/576d0415
Tree: http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/tree/576d0415
Diff: http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/diff/576d0415

Branch: refs/heads/master
Commit: 576d0415ac43c13e24174121be664ff81df79ae9
Parents: bd4ddf0
Author: Stefan Bodewig 
Authored: Tue Feb 6 12:43:48 2018 +0100
Committer: Stefan Bodewig 
Committed: Tue Feb 6 17:51:08 2018 +0100

--
 docs/index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/576d0415/docs/index.html
--
diff --git a/docs/index.html b/docs/index.html
index 1208cf2..44c7e01 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -28,7 +28,7 @@
 This Antlib contains tasks and resources that provide
   compression/uncompression and archival/unarchival capabilities
   based on http://commons.apache.org/compress/";>Apache
-  Commons Compress.  Using Apache Commons Compress 1.14 this
+  Commons Compress.  Using Apache Commons Compress 1.16 this
   Antlib supports gzip, bzip2, lzma standalone, xz, .Z, DEFLATE, DEFLATE64,
   Snappy, LZ4, Brotli and pack200 compression and ar, arj, cpio,
   7z, Unix dump, tar and zip archives.  Support for arj, .Z,
@@ -126,7 +126,7 @@
 Installing and Using
 
 This Antlib requires Apache Ant 1.8.0 or higher, Apache
-  Commons Compress 1.14 or higher and Java7 or higher.
+  Commons Compress 1.16 or higher and Java7 or higher.
 
 In order to use LZMA, XZ or most of the 7z support
   the https://tukaani.org/xz/java.html";>XZ for Java

[1/5] ant-antlibs-compress git commit: typo

[bodewig]

Repository: ant-antlibs-compress
Updated Branches:
  refs/heads/master 405d27dc9 -> 2cb681358


typo


Project: http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/commit/bd4ddf05
Tree: http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/tree/bd4ddf05
Diff: http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/diff/bd4ddf05

Branch: refs/heads/master
Commit: bd4ddf05f48af8960cdb278a8fb861084dfb0be9
Parents: 405d27d
Author: Stefan Bodewig 
Authored: Tue Feb 6 12:43:04 2018 +0100
Committer: Stefan Bodewig 
Committed: Tue Feb 6 12:43:04 2018 +0100

--
 docs/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/bd4ddf05/docs/index.html
--
diff --git a/docs/index.html b/docs/index.html
index 065030a..1208cf2 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -134,7 +134,7 @@
 
 In order to use Brotli
   the https://github.com/google/brotli";>Brotli dec
-  library verision 0.1.2 or later is required.
+  library version 0.1.2 or later is required.
 
 If you are building the Antlib from sources, run
   the antlib target and you'll get a

[3/5] ant-antlibs-compress git commit: add Zstandard support

[bodewig]

add Zstandard support


Project: http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/commit/d282fff1
Tree: http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/tree/d282fff1
Diff: http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/diff/d282fff1

Branch: refs/heads/master
Commit: d282fff181fc597590abafe9b422e1a3300d1712
Parents: 576d041
Author: Stefan Bodewig 
Authored: Tue Feb 6 21:46:26 2018 +0100
Committer: Stefan Bodewig 
Committed: Tue Feb 6 21:46:26 2018 +0100

--
 .gitattributes  |   9 ++
 changes.xml |   6 +-
 docs/compresource.html  |  23 
 docs/index.html |   9 +-
 docs/pack.html  |   7 ++
 docs/unpack.html|   7 ++
 ivy.xml |   1 +
 src/main/org/apache/ant/compress/antlib.xml |  12 ++
 .../ant/compress/resources/ZstdResource.java|  37 +++
 .../apache/ant/compress/taskdefs/UnZstd.java|  33 ++
 .../org/apache/ant/compress/taskdefs/Zstd.java  |  42 +++
 .../ant/compress/util/ZstdStreamFactory.java|  53 +
 src/tests/antunit/unzstd-test.xml   |  65 +++
 src/tests/antunit/zstd-test.xml | 109 +++
 src/tests/antunit/zstdresource-test.xml |  41 +++
 src/tests/resources/asf-logo.gif.zstd   | Bin 0 -> 6972 bytes
 16 files changed, 452 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/d282fff1/.gitattributes
--
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000..38bc65e
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,9 @@
+*.arbinary
+*.arj   binary
+*.java  text diff=java
+*.mdtext
+*.txt   text
+*.xml   text
+*.yml   text
+*.zstd  binary
+.gitattributes  text

http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/d282fff1/changes.xml
--
diff --git a/changes.xml b/changes.xml
index e1875b4..f51f7a7 100644
--- a/changes.xml
+++ b/changes.xml
@@ -40,13 +40,17 @@
 
   
 The Apache Compress Antlib now requires Apache Commons
-Compress 1.16 or later for DEFLATE64 support.
+Compress 1.16 or later for DEFLATE64 and Zstandard support.
+zstd-jni 1.3.3-1 or later is required for Zstandard support.
   
   
 Added read-only support for the DEFLATE64 format. More
 importantly we can now read zip and 7z entries using this
 algorithm.
   
+  
+Added support for the Zstandard format.
+  
 
 
   

http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/d282fff1/docs/compresource.html
--
diff --git a/docs/compresource.html b/docs/compresource.html
index 57e85b3..3270a4c 100644
--- a/docs/compresource.html
+++ b/docs/compresource.html
@@ -313,3 +313,26 @@
 Represents the entry named some-file.txt in archive
   some-archive.tar.Z where the zresource provides
   the decompression of the archive.
+
+zstdresource
+
+Since Apache Compress Antlib 1.6.
+
+This is a compressed resource using
+  Zstandard compression.
+
+Examples
+
+
+<cmp:tarentry xmlns:cmp="antlib:org.apache.ant.compress"
+name="some-file.txt">
+  <cmp:zstdresource>
+<file file="some-archive.tar.zstd"/>
+  </cmp:zstdresource>
+</cmp:tarentry>
+
+
+Represents the entry named some-file.txt in archive
+  some-archive.tar.zstd where the zstdresource provides
+  the decompression of the archive.
+

http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/d282fff1/docs/index.html
--
diff --git a/docs/index.html b/docs/index.html
index 44c7e01..da9cc1b 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -30,7 +30,7 @@
   based on http://commons.apache.org/compress/";>Apache
   Commons Compress.  Using Apache Commons Compress 1.16 this
   Antlib supports gzip, bzip2, lzma standalone, xz, .Z, DEFLATE, DEFLATE64,
-  Snappy, LZ4, Brotli and pack200 compression and ar, arj, cpio,
+  Snappy, LZ4, Brotli, Zstandard and pack200 compression and ar, arj,

[5/5] ant-antlibs-compress git commit: update versions in POM as well

[bodewig]

update versions in POM as well


Project: http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/commit/2cb68135
Tree: http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/tree/2cb68135
Diff: http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/diff/2cb68135

Branch: refs/heads/master
Commit: 2cb681358beb2d7c2fdf51ecbfdb2bd11fffe0fc
Parents: 9aa28d9
Author: Stefan Bodewig 
Authored: Tue Feb 6 21:47:51 2018 +0100
Committer: Stefan Bodewig 
Committed: Tue Feb 6 21:47:51 2018 +0100

--
 project-template.pom | 10 --
 1 file changed, 8 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/2cb68135/project-template.pom
--
diff --git a/project-template.pom b/project-template.pom
index f3f7dc1..7d05426 100644
--- a/project-template.pom
+++ b/project-template.pom
@@ -51,12 +51,18 @@
 
   org.apache.commons
   commons-compress
-  1.14
+  1.16
 
 
   org.tukaani
   xz
-  1.6
+  1.8
+
+
+  com.github.luben
+  zstd-jni
+  1.3.3-1
+  true
 
 
   org.brotli

svn commit: r1823425 - in /ant/site/ant/sources: antnews.xml index.xml

[bodewig]

Author: bodewig
Date: Wed Feb  7 05:06:52 2018
New Revision: 1823425

URL: http://svn.apache.org/viewvc?rev=1823425&view=rev
Log:
add more flesh to announcemnet

Modified:
ant/site/ant/sources/antnews.xml
ant/site/ant/sources/index.xml

Modified: ant/site/ant/sources/antnews.xml
URL: 
http://svn.apache.org/viewvc/ant/site/ant/sources/antnews.xml?rev=1823425&r1=1823424&r2=1823425&view=diff
==
--- ant/site/ant/sources/antnews.xml (original)
+++ ant/site/ant/sources/antnews.xml Wed Feb  7 05:06:52 2018
@@ -46,7 +46,14 @@
   (like the apt task).
 
 Both releases are mostly bug fix releases with a few new
-features being added.
+features being added. A new javaversion condition can
+be used to detect the version of the JVM running Ant.
+
+The log4j listener has been deprecated as log4j 1.x is no
+longer actively developed and we've made sure the listener works
+when using the log4j2 logging bridge. In 1.10.2 the imaging tasks
+have been deprecated as JAI doesn't seem to work with Java9
+anymore.
 
   
 

Modified: ant/site/ant/sources/index.xml
URL: 
http://svn.apache.org/viewvc/ant/site/ant/sources/index.xml?rev=1823425&r1=1823424&r2=1823425&view=diff
==
--- ant/site/ant/sources/index.xml (original)
+++ ant/site/ant/sources/index.xml Wed Feb  7 05:06:52 2018
@@ -76,7 +76,14 @@
   (like the apt task).
 
 Both releases are mostly bug fix releases with a few new
-features being added.
+features being added. A new javaversion condition can
+be used to detect the version of the JVM running Ant.
+
+The log4j listener has been deprecated as log4j 1.x is no
+longer actively developed and we've made sure the listener works
+when using the log4j2 logging bridge. In 1.10.2 the imaging tasks
+have been deprecated as JAI doesn't seem to work with Java9
+anymore.
 
   
 

svn commit: r24772 - in /release/ant: README.html RELEASE-NOTES-1.9.10.html

[bodewig]

Author: bodewig
Date: Wed Feb  7 05:13:01 2018
New Revision: 24772

Log:
missed a line in release notes

Modified:
release/ant/README.html
release/ant/RELEASE-NOTES-1.9.10.html

Modified: release/ant/README.html
==
--- release/ant/README.html (original)
+++ release/ant/README.html Wed Feb  7 05:13:01 2018
@@ -19,6 +19,9 @@
 Changes from Ant 1.9.9 TO Ant 1.9.10
 
 
+Changes that could break older environments:
+---
+
  * The Log4jListener is marked as deprecated as the required log4j library
(in version 1.x) is not maintained any more.
 

Modified: release/ant/RELEASE-NOTES-1.9.10.html
==
--- release/ant/RELEASE-NOTES-1.9.10.html (original)
+++ release/ant/RELEASE-NOTES-1.9.10.html Wed Feb  7 05:13:01 2018
@@ -4,6 +4,9 @@
 Changes from Ant 1.9.9 TO Ant 1.9.10
 
 
+Changes that could break older environments:
+---
+
  * The Log4jListener is marked as deprecated as the required log4j library
(in version 1.x) is not maintained any more.
 

svn commit: r1823426 - in /ant/site/ant/production: ./ manual-1.9.x/ manual-1.9.x/Tasks/ manual-1.9.x/Types/ manual-1.9.x/api/ manual-1.9.x/api/org/apache/tools/ant/ manual-1.9.x/api/org/apache/tools/

[bodewig]

Author: bodewig
Date: Wed Feb  7 05:19:49 2018
New Revision: 1823426

URL: http://svn.apache.org/viewvc?rev=1823426&view=rev
Log:
re-generate site


[This commit notification would consist of 543 parts, 
which exceeds the limit of 50 ones, so it was shortened to the summary.]

svn commit: r24798 - in /release/ant: ./ binaries/ manual/ source/

[bodewig]

Author: bodewig
Date: Wed Feb  7 21:11:44 2018
New Revision: 24798

Log:
remove old releases

Removed:
release/ant/RELEASE-NOTES-1.10.1.html
release/ant/RELEASE-NOTES-1.9.9.html
release/ant/binaries/apache-ant-1.10.1-bin.tar.bz2
release/ant/binaries/apache-ant-1.10.1-bin.tar.bz2.asc
release/ant/binaries/apache-ant-1.10.1-bin.tar.bz2.md5
release/ant/binaries/apache-ant-1.10.1-bin.tar.bz2.sha1
release/ant/binaries/apache-ant-1.10.1-bin.tar.bz2.sha512
release/ant/binaries/apache-ant-1.10.1-bin.tar.gz
release/ant/binaries/apache-ant-1.10.1-bin.tar.gz.asc
release/ant/binaries/apache-ant-1.10.1-bin.tar.gz.md5
release/ant/binaries/apache-ant-1.10.1-bin.tar.gz.sha1
release/ant/binaries/apache-ant-1.10.1-bin.tar.gz.sha512
release/ant/binaries/apache-ant-1.10.1-bin.tar.xz
release/ant/binaries/apache-ant-1.10.1-bin.tar.xz.md5
release/ant/binaries/apache-ant-1.10.1-bin.tar.xz.sha1
release/ant/binaries/apache-ant-1.10.1-bin.tar.xz.sha512
release/ant/binaries/apache-ant-1.10.1-bin.zip
release/ant/binaries/apache-ant-1.10.1-bin.zip.asc
release/ant/binaries/apache-ant-1.10.1-bin.zip.md5
release/ant/binaries/apache-ant-1.10.1-bin.zip.sha1
release/ant/binaries/apache-ant-1.10.1-bin.zip.sha512
release/ant/binaries/apache-ant-1.9.9-bin.tar.bz2
release/ant/binaries/apache-ant-1.9.9-bin.tar.bz2.asc
release/ant/binaries/apache-ant-1.9.9-bin.tar.bz2.md5
release/ant/binaries/apache-ant-1.9.9-bin.tar.bz2.sha1
release/ant/binaries/apache-ant-1.9.9-bin.tar.bz2.sha512
release/ant/binaries/apache-ant-1.9.9-bin.tar.gz
release/ant/binaries/apache-ant-1.9.9-bin.tar.gz.asc
release/ant/binaries/apache-ant-1.9.9-bin.tar.gz.md5
release/ant/binaries/apache-ant-1.9.9-bin.tar.gz.sha1
release/ant/binaries/apache-ant-1.9.9-bin.tar.gz.sha512
release/ant/binaries/apache-ant-1.9.9-bin.zip
release/ant/binaries/apache-ant-1.9.9-bin.zip.asc
release/ant/binaries/apache-ant-1.9.9-bin.zip.md5
release/ant/binaries/apache-ant-1.9.9-bin.zip.sha1
release/ant/binaries/apache-ant-1.9.9-bin.zip.sha512
release/ant/manual/apache-ant-1.10.1-manual.tar.bz2
release/ant/manual/apache-ant-1.10.1-manual.tar.bz2.asc
release/ant/manual/apache-ant-1.10.1-manual.tar.bz2.md5
release/ant/manual/apache-ant-1.10.1-manual.tar.bz2.sha1
release/ant/manual/apache-ant-1.10.1-manual.tar.bz2.sha512
release/ant/manual/apache-ant-1.10.1-manual.tar.gz
release/ant/manual/apache-ant-1.10.1-manual.tar.gz.asc
release/ant/manual/apache-ant-1.10.1-manual.tar.gz.md5
release/ant/manual/apache-ant-1.10.1-manual.tar.gz.sha1
release/ant/manual/apache-ant-1.10.1-manual.tar.gz.sha512
release/ant/manual/apache-ant-1.10.1-manual.tar.xz
release/ant/manual/apache-ant-1.10.1-manual.tar.xz.md5
release/ant/manual/apache-ant-1.10.1-manual.tar.xz.sha1
release/ant/manual/apache-ant-1.10.1-manual.tar.xz.sha512
release/ant/manual/apache-ant-1.10.1-manual.zip
release/ant/manual/apache-ant-1.10.1-manual.zip.asc
release/ant/manual/apache-ant-1.10.1-manual.zip.md5
release/ant/manual/apache-ant-1.10.1-manual.zip.sha1
release/ant/manual/apache-ant-1.10.1-manual.zip.sha512
release/ant/manual/apache-ant-1.9.9-manual.tar.bz2
release/ant/manual/apache-ant-1.9.9-manual.tar.bz2.asc
release/ant/manual/apache-ant-1.9.9-manual.tar.bz2.md5
release/ant/manual/apache-ant-1.9.9-manual.tar.bz2.sha1
release/ant/manual/apache-ant-1.9.9-manual.tar.bz2.sha512
release/ant/manual/apache-ant-1.9.9-manual.tar.gz
release/ant/manual/apache-ant-1.9.9-manual.tar.gz.asc
release/ant/manual/apache-ant-1.9.9-manual.tar.gz.md5
release/ant/manual/apache-ant-1.9.9-manual.tar.gz.sha1
release/ant/manual/apache-ant-1.9.9-manual.tar.gz.sha512
release/ant/manual/apache-ant-1.9.9-manual.zip
release/ant/manual/apache-ant-1.9.9-manual.zip.asc
release/ant/manual/apache-ant-1.9.9-manual.zip.md5
release/ant/manual/apache-ant-1.9.9-manual.zip.sha1
release/ant/manual/apache-ant-1.9.9-manual.zip.sha512
release/ant/source/apache-ant-1.10.1-src.tar.bz2
release/ant/source/apache-ant-1.10.1-src.tar.bz2.asc
release/ant/source/apache-ant-1.10.1-src.tar.bz2.md5
release/ant/source/apache-ant-1.10.1-src.tar.bz2.sha1
release/ant/source/apache-ant-1.10.1-src.tar.bz2.sha512
release/ant/source/apache-ant-1.10.1-src.tar.gz
release/ant/source/apache-ant-1.10.1-src.tar.gz.asc
release/ant/source/apache-ant-1.10.1-src.tar.gz.md5
release/ant/source/apache-ant-1.10.1-src.tar.gz.sha1
release/ant/source/apache-ant-1.10.1-src.tar.gz.sha512
release/ant/source/apache-ant-1.10.1-src.tar.xz
release/ant/source/apache-ant-1.10.1-src.tar.xz.md5
release/ant/source/apache-ant-1.10.1-src.tar.xz.sha1
release/ant/source/apache-ant-1.10.1-src.tar.xz.sha512
release/ant/source/apache-ant-1.10.1-src.zip
release/ant/source/apache-ant-1.10.1-src.zip.asc
release

ant git commit: verify Bug 62086 doesn't affect the 1.9.x branch

[bodewig]

Repository: ant
Updated Branches:
  refs/heads/1.9.x 7f1685bde -> ee338052c


verify Bug 62086 doesn't affect the 1.9.x branch

https://bz.apache.org/bugzilla/show_bug.cgi?id=62086


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/ee338052
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/ee338052
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/ee338052

Branch: refs/heads/1.9.x
Commit: ee338052cee92ff258f50e015c4dace74533dc2e
Parents: 7f1685b
Author: Stefan Bodewig 
Authored: Fri Feb 9 17:47:41 2018 +0100
Committer: Stefan Bodewig 
Committed: Fri Feb 9 17:47:41 2018 +0100

--
 src/tests/junit/org/apache/tools/ant/types/MapperTest.java | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/ee338052/src/tests/junit/org/apache/tools/ant/types/MapperTest.java
--
diff --git a/src/tests/junit/org/apache/tools/ant/types/MapperTest.java 
b/src/tests/junit/org/apache/tools/ant/types/MapperTest.java
index 980f5cc..77c1811 100644
--- a/src/tests/junit/org/apache/tools/ant/types/MapperTest.java
+++ b/src/tests/junit/org/apache/tools/ant/types/MapperTest.java
@@ -35,6 +35,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
@@ -224,6 +225,9 @@ public class MapperTest {
 List list = Arrays.asList(targets);
 assertTrue("cannot find expected target \"def\"", 
list.contains("def"));
 assertTrue("cannot find expected target \"ghi\"", 
list.contains("ghi"));
+
+targets = fileNameMapper.mapFileName("z");
+assertNull(targets);
 }
 
 @Test

[1/2] ant git commit: verify Bug 62086 doesn't affect the 1.9.x branch

[bodewig]

Repository: ant
Updated Branches:
  refs/heads/master c8ea02ee7 -> 3bb66d938


verify Bug 62086 doesn't affect the 1.9.x branch

https://bz.apache.org/bugzilla/show_bug.cgi?id=62086


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/ee338052
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/ee338052
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/ee338052

Branch: refs/heads/master
Commit: ee338052cee92ff258f50e015c4dace74533dc2e
Parents: 7f1685b
Author: Stefan Bodewig 
Authored: Fri Feb 9 17:47:41 2018 +0100
Committer: Stefan Bodewig 
Committed: Fri Feb 9 17:47:41 2018 +0100

--
 src/tests/junit/org/apache/tools/ant/types/MapperTest.java | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/ee338052/src/tests/junit/org/apache/tools/ant/types/MapperTest.java
--
diff --git a/src/tests/junit/org/apache/tools/ant/types/MapperTest.java 
b/src/tests/junit/org/apache/tools/ant/types/MapperTest.java
index 980f5cc..77c1811 100644
--- a/src/tests/junit/org/apache/tools/ant/types/MapperTest.java
+++ b/src/tests/junit/org/apache/tools/ant/types/MapperTest.java
@@ -35,6 +35,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
@@ -224,6 +225,9 @@ public class MapperTest {
 List list = Arrays.asList(targets);
 assertTrue("cannot find expected target \"def\"", 
list.contains("def"));
 assertTrue("cannot find expected target \"ghi\"", 
list.contains("ghi"));
+
+targets = fileNameMapper.mapFileName("z");
+assertNull(targets);
 }
 
 @Test

[2/2] ant git commit: Merge branch '1.9.x'

[bodewig]

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/3bb66d93
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/3bb66d93
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/3bb66d93

Branch: refs/heads/master
Commit: 3bb66d93845260f90b7df456ac794d25ad1735e4
Parents: c8ea02e ee33805
Author: Stefan Bodewig 
Authored: Fri Feb 9 17:48:36 2018 +0100
Committer: Stefan Bodewig 
Committed: Fri Feb 9 17:48:36 2018 +0100

--

--

[2/3] ant git commit: ensure FileNameMapper implementations deal with null source names

[bodewig]

ensure FileNameMapper implementations deal with null source names

https://bz.apache.org/bugzilla/show_bug.cgi?id=62076


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/a3246562
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/a3246562
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/a3246562

Branch: refs/heads/1.9.x
Commit: a3246562ff3ac48ef32d75df688bc04e22bc7dd7
Parents: 801a44a
Author: Stefan Bodewig 
Authored: Fri Feb 9 18:37:58 2018 +0100
Committer: Stefan Bodewig 
Committed: Fri Feb 9 18:37:58 2018 +0100

--
 src/main/org/apache/tools/ant/types/mappers/CutDirsMapper.java | 3 +++
 src/main/org/apache/tools/ant/types/mappers/FilterMapper.java  | 3 +++
 src/main/org/apache/tools/ant/util/FlatFileNameMapper.java | 3 ++-
 src/main/org/apache/tools/ant/util/GlobPatternMapper.java  | 3 +++
 src/main/org/apache/tools/ant/util/RegexpPatternMapper.java| 3 +++
 5 files changed, 14 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/a3246562/src/main/org/apache/tools/ant/types/mappers/CutDirsMapper.java
--
diff --git a/src/main/org/apache/tools/ant/types/mappers/CutDirsMapper.java 
b/src/main/org/apache/tools/ant/types/mappers/CutDirsMapper.java
index ce8f39c..932f3ec 100644
--- a/src/main/org/apache/tools/ant/types/mappers/CutDirsMapper.java
+++ b/src/main/org/apache/tools/ant/types/mappers/CutDirsMapper.java
@@ -63,6 +63,9 @@ public class CutDirsMapper implements FileNameMapper {
 throw new BuildException("dirs must be set to a positive number");
 }
 final char fileSep = File.separatorChar;
+if (sourceFileName == null) {
+return null;
+}
 final String fileSepCorrected =
 sourceFileName.replace('/', fileSep).replace('\\', fileSep);
 int nthMatch = fileSepCorrected.indexOf(fileSep);

http://git-wip-us.apache.org/repos/asf/ant/blob/a3246562/src/main/org/apache/tools/ant/types/mappers/FilterMapper.java
--
diff --git a/src/main/org/apache/tools/ant/types/mappers/FilterMapper.java 
b/src/main/org/apache/tools/ant/types/mappers/FilterMapper.java
index 501da50..9ef922e 100644
--- a/src/main/org/apache/tools/ant/types/mappers/FilterMapper.java
+++ b/src/main/org/apache/tools/ant/types/mappers/FilterMapper.java
@@ -63,6 +63,9 @@ public class FilterMapper extends FilterChain implements 
FileNameMapper {
  *  the filterchain returns an empty string.
  */
 public String[] mapFileName(String sourceFileName) {
+if (sourceFileName == null) {
+return null;
+}
 try {
 Reader stringReader = new StringReader(sourceFileName);
 ChainReaderHelper helper = new ChainReaderHelper();

http://git-wip-us.apache.org/repos/asf/ant/blob/a3246562/src/main/org/apache/tools/ant/util/FlatFileNameMapper.java
--
diff --git a/src/main/org/apache/tools/ant/util/FlatFileNameMapper.java 
b/src/main/org/apache/tools/ant/util/FlatFileNameMapper.java
index 420ccc6..04d58be 100644
--- a/src/main/org/apache/tools/ant/util/FlatFileNameMapper.java
+++ b/src/main/org/apache/tools/ant/util/FlatFileNameMapper.java
@@ -49,6 +49,7 @@ public class FlatFileNameMapper implements FileNameMapper {
  * @return the file name in a one-element array.
  */
 public String[] mapFileName(String sourceFileName) {
-return new String[] {new java.io.File(sourceFileName).getName()};
+return sourceFileName == null ? null
+: new String[] {new java.io.File(sourceFileName).getName()};
 }
 }

http://git-wip-us.apache.org/repos/asf/ant/blob/a3246562/src/main/org/apache/tools/ant/util/GlobPatternMapper.java
--
diff --git a/src/main/org/apache/tools/ant/util/GlobPatternMapper.java 
b/src/main/org/apache/tools/ant/util/GlobPatternMapper.java
index ebba54e..a0f0ca9 100644
--- a/src/main/org/apache/tools/ant/util/GlobPatternMapper.java
+++ b/src/main/org/apache/tools/ant/util/GlobPatternMapper.java
@@ -154,6 +154,9 @@ public class GlobPatternMapper implements FileNameMapper {
  * @return a list of converted filenames
  */
 public String[] mapFileName(String sourceFileName) {
+if (sourceFileName == null) {
+return null;
+}
 String modName = modifyName(sourceFileName);
 if (fromPrefix == null
 || (sourceFileName.length() < (prefixLength + postfixLength))

http://git-wip-us.apache.org/repos/asf/ant/blob/a3246562/src/main/org/apache/tools/

[1/3] ant git commit: add some documentation hints

[bodewig]

Repository: ant
Updated Branches:
  refs/heads/1.9.x ee338052c -> 21b870006


add some documentation hints

see https://bz.apache.org/bugzilla/show_bug.cgi?id=62076


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/801a44a2
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/801a44a2
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/801a44a2

Branch: refs/heads/1.9.x
Commit: 801a44a2079d19479ddaed087dfe4a982ae955a3
Parents: ee33805
Author: Stefan Bodewig 
Authored: Fri Feb 9 18:36:20 2018 +0100
Committer: Stefan Bodewig 
Committed: Fri Feb 9 18:36:20 2018 +0100

--
 src/main/org/apache/tools/ant/util/ChainedMapper.java  | 3 +++
 src/main/org/apache/tools/ant/util/FileNameMapper.java | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/801a44a2/src/main/org/apache/tools/ant/util/ChainedMapper.java
--
diff --git a/src/main/org/apache/tools/ant/util/ChainedMapper.java 
b/src/main/org/apache/tools/ant/util/ChainedMapper.java
index 635a053..6e07aa6 100644
--- a/src/main/org/apache/tools/ant/util/ChainedMapper.java
+++ b/src/main/org/apache/tools/ant/util/ChainedMapper.java
@@ -35,6 +35,9 @@ public class ChainedMapper extends ContainerMapper {
 public String[] mapFileName(String sourceFileName) {
 List inputs = new ArrayList();
 List results = new ArrayList();
+// we do this even if the sourceFileName is null. Some
+// resources have a null name and users may use a mapper like
+// MergeMapper to provide a name for it.
 results.add(sourceFileName);
 FileNameMapper mapper = null;
 

http://git-wip-us.apache.org/repos/asf/ant/blob/801a44a2/src/main/org/apache/tools/ant/util/FileNameMapper.java
--
diff --git a/src/main/org/apache/tools/ant/util/FileNameMapper.java 
b/src/main/org/apache/tools/ant/util/FileNameMapper.java
index bbd8261..ec85f9d 100644
--- a/src/main/org/apache/tools/ant/util/FileNameMapper.java
+++ b/src/main/org/apache/tools/ant/util/FileNameMapper.java
@@ -52,7 +52,9 @@ public interface FileNameMapper {
  * omit the source file in question.
  *
  * @param sourceFileName the name of the source file relative to
- *   some given basedirectory.
+ *   some given basedirectory. Might be {@code
+ *   null} for resources that don't provide a
+ *   name.
  * @return an array of strings if the rule applies to the source file, or
  * null if it does not.
  */

[3/3] ant git commit: properly check return value of mapFileName

[bodewig]

properly check return value of mapFileName

https://bz.apache.org/bugzilla/show_bug.cgi?id=62076


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/21b87000
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/21b87000
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/21b87000

Branch: refs/heads/1.9.x
Commit: 21b870006b985713b76723e73a64607a0d7d63fe
Parents: a324656
Author: Stefan Bodewig 
Authored: Fri Feb 9 18:39:08 2018 +0100
Committer: Stefan Bodewig 
Committed: Fri Feb 9 18:39:08 2018 +0100

--
 src/main/org/apache/tools/ant/taskdefs/Copy.java| 5 -
 src/main/org/apache/tools/ant/taskdefs/CopyPath.java| 3 +++
 src/main/org/apache/tools/ant/taskdefs/Rmic.java| 3 +++
 .../org/apache/tools/ant/taskdefs/optional/Native2Ascii.java| 5 -
 4 files changed, 14 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/21b87000/src/main/org/apache/tools/ant/taskdefs/Copy.java
--
diff --git a/src/main/org/apache/tools/ant/taskdefs/Copy.java 
b/src/main/org/apache/tools/ant/taskdefs/Copy.java
index 42f7cb7..fab7379 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Copy.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Copy.java
@@ -788,6 +788,9 @@ public class Copy extends Task {
 for (int i = 0; i < toCopy.length; i++) {
 final File src = new File(fromDir, toCopy[i]);
 final String[] mappedFiles = mapper.mapFileName(toCopy[i]);
+if (mappedFiles == null || mappedFiles.length == 0) {
+continue;
+}
 
 if (!enableMultipleMappings) {
 map.put(src.getAbsolutePath(),
@@ -836,7 +839,7 @@ public class Copy extends Task {
 }
 for (int i = 0; i < toCopy.length; i++) {
 final String[] mappedFiles = 
mapper.mapFileName(toCopy[i].getName());
-if (mappedFiles == null) {
+if (mappedFiles == null || mappedFiles.length == 0) {
 throw new BuildException("Can't copy a resource without a"
 + " name if the mapper doesn't"
 + " provide one.");

http://git-wip-us.apache.org/repos/asf/ant/blob/21b87000/src/main/org/apache/tools/ant/taskdefs/CopyPath.java
--
diff --git a/src/main/org/apache/tools/ant/taskdefs/CopyPath.java 
b/src/main/org/apache/tools/ant/taskdefs/CopyPath.java
index 53596fd..bad9e5d 100644
--- a/src/main/org/apache/tools/ant/taskdefs/CopyPath.java
+++ b/src/main/org/apache/tools/ant/taskdefs/CopyPath.java
@@ -182,6 +182,9 @@ public class CopyPath extends Task {
 String sourceFileName = sourceFiles[sources];
 File sourceFile = new File(sourceFileName);
 String[] toFiles = (String[]) mapper.mapFileName(sourceFileName);
+if (toFiles == null) {
+continue;
+}
 
 for (int i = 0; i < toFiles.length; i++) {
 String destFileName = toFiles[i];

http://git-wip-us.apache.org/repos/asf/ant/blob/21b87000/src/main/org/apache/tools/ant/taskdefs/Rmic.java
--
diff --git a/src/main/org/apache/tools/ant/taskdefs/Rmic.java 
b/src/main/org/apache/tools/ant/taskdefs/Rmic.java
index d72c39e..0a54b3e 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Rmic.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Rmic.java
@@ -709,6 +709,9 @@ public class Rmic extends MatchingTask {
 String classFileName = classname.replace('.', File.separatorChar)
 + ".class";
 String[] generatedFiles = 
adapter.getMapper().mapFileName(classFileName);
+if (generatedFiles == null) {
+return;
+}
 
 for (int i = 0; i < generatedFiles.length; i++) {
 final String generatedFile = generatedFiles[i];

http://git-wip-us.apache.org/repos/asf/ant/blob/21b87000/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java
--
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java 
b/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java
index 664e574..1474cce 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java
@@ -255,7 +255,10 @@ public class Native2Ascii extends MatchingTask {
 + (count != 1 ? "s" : "") + " from ";
 log(message + srcDir + " to " + dest

[4/4] ant git commit: Merge branch '1.9.x'

[bodewig]

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/e90f7119
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/e90f7119
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/e90f7119

Branch: refs/heads/master
Commit: e90f71193adc819ee27d2067cbd662ce7efacaf4
Parents: 3bb66d9 21b8700
Author: Stefan Bodewig 
Authored: Fri Feb 9 18:49:52 2018 +0100
Committer: Stefan Bodewig 
Committed: Fri Feb 9 18:49:52 2018 +0100

--
 src/main/org/apache/tools/ant/taskdefs/Copy.java| 5 -
 src/main/org/apache/tools/ant/taskdefs/CopyPath.java| 3 +++
 src/main/org/apache/tools/ant/taskdefs/Rmic.java| 3 +++
 .../org/apache/tools/ant/taskdefs/optional/Native2Ascii.java| 5 -
 src/main/org/apache/tools/ant/types/mappers/CutDirsMapper.java  | 3 +++
 src/main/org/apache/tools/ant/types/mappers/FilterMapper.java   | 3 +++
 src/main/org/apache/tools/ant/util/ChainedMapper.java   | 3 +++
 src/main/org/apache/tools/ant/util/FileNameMapper.java  | 4 +++-
 src/main/org/apache/tools/ant/util/FlatFileNameMapper.java  | 2 ++
 src/main/org/apache/tools/ant/util/GlobPatternMapper.java   | 3 +++
 src/main/org/apache/tools/ant/util/RegexpPatternMapper.java | 3 +++
 11 files changed, 34 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/e90f7119/src/main/org/apache/tools/ant/taskdefs/Copy.java
--

http://git-wip-us.apache.org/repos/asf/ant/blob/e90f7119/src/main/org/apache/tools/ant/taskdefs/Rmic.java
--
diff --cc src/main/org/apache/tools/ant/taskdefs/Rmic.java
index c42ad41,0a54b3e..aa762b1
--- a/src/main/org/apache/tools/ant/taskdefs/Rmic.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Rmic.java
@@@ -705,8 -709,12 +705,11 @@@ public class Rmic extends MatchingTask 
  String classFileName = classname.replace('.', File.separatorChar)
  + ".class";
  String[] generatedFiles = 
adapter.getMapper().mapFileName(classFileName);
+ if (generatedFiles == null) {
+ return;
+ }
  
 -for (int i = 0; i < generatedFiles.length; i++) {
 -final String generatedFile = generatedFiles[i];
 +for (String generatedFile : generatedFiles) {
  if (!generatedFile.endsWith(".class")) {
  // don't know how to handle that - a IDL file doesn't
  // have a corresponding Java source for example.

http://git-wip-us.apache.org/repos/asf/ant/blob/e90f7119/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java
--

http://git-wip-us.apache.org/repos/asf/ant/blob/e90f7119/src/main/org/apache/tools/ant/types/mappers/CutDirsMapper.java
--

http://git-wip-us.apache.org/repos/asf/ant/blob/e90f7119/src/main/org/apache/tools/ant/types/mappers/FilterMapper.java
--
diff --cc src/main/org/apache/tools/ant/types/mappers/FilterMapper.java
index b4c07e9,9ef922e..3a0109b
--- a/src/main/org/apache/tools/ant/types/mappers/FilterMapper.java
+++ b/src/main/org/apache/tools/ant/types/mappers/FilterMapper.java
@@@ -64,8 -62,10 +64,11 @@@ public class FilterMapper extends Filte
   * @return  a one-element array of converted filenames, or null if
   *  the filterchain returns an empty string.
   */
 +@Override
  public String[] mapFileName(String sourceFileName) {
+ if (sourceFileName == null) {
+ return null;
+ }
  try {
  Reader stringReader = new StringReader(sourceFileName);
  ChainReaderHelper helper = new ChainReaderHelper();

http://git-wip-us.apache.org/repos/asf/ant/blob/e90f7119/src/main/org/apache/tools/ant/util/ChainedMapper.java
--
diff --cc src/main/org/apache/tools/ant/util/ChainedMapper.java
index 8b3e32f,6e07aa6..cec4f2e
--- a/src/main/org/apache/tools/ant/util/ChainedMapper.java
+++ b/src/main/org/apache/tools/ant/util/ChainedMapper.java
@@@ -30,13 -32,32 +30,16 @@@ import java.util.stream.Stream
  public class ChainedMapper extends ContainerMapper {
  
  /** {@inheritDoc}. */
 +@Override
  public String[] mapFileName(String sourceFileName) {
 -List inputs = new ArrayList();
 -List results = new ArrayList();
 -// we do this even if the sourceFileName is null. Some
++// we invoke the chain even if the sourceFileName is null. S

[2/4] ant git commit: ensure FileNameMapper implementations deal with null source names

[bodewig]

ensure FileNameMapper implementations deal with null source names

https://bz.apache.org/bugzilla/show_bug.cgi?id=62076


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/a3246562
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/a3246562
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/a3246562

Branch: refs/heads/master
Commit: a3246562ff3ac48ef32d75df688bc04e22bc7dd7
Parents: 801a44a
Author: Stefan Bodewig 
Authored: Fri Feb 9 18:37:58 2018 +0100
Committer: Stefan Bodewig 
Committed: Fri Feb 9 18:37:58 2018 +0100

--
 src/main/org/apache/tools/ant/types/mappers/CutDirsMapper.java | 3 +++
 src/main/org/apache/tools/ant/types/mappers/FilterMapper.java  | 3 +++
 src/main/org/apache/tools/ant/util/FlatFileNameMapper.java | 3 ++-
 src/main/org/apache/tools/ant/util/GlobPatternMapper.java  | 3 +++
 src/main/org/apache/tools/ant/util/RegexpPatternMapper.java| 3 +++
 5 files changed, 14 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/a3246562/src/main/org/apache/tools/ant/types/mappers/CutDirsMapper.java
--
diff --git a/src/main/org/apache/tools/ant/types/mappers/CutDirsMapper.java 
b/src/main/org/apache/tools/ant/types/mappers/CutDirsMapper.java
index ce8f39c..932f3ec 100644
--- a/src/main/org/apache/tools/ant/types/mappers/CutDirsMapper.java
+++ b/src/main/org/apache/tools/ant/types/mappers/CutDirsMapper.java
@@ -63,6 +63,9 @@ public class CutDirsMapper implements FileNameMapper {
 throw new BuildException("dirs must be set to a positive number");
 }
 final char fileSep = File.separatorChar;
+if (sourceFileName == null) {
+return null;
+}
 final String fileSepCorrected =
 sourceFileName.replace('/', fileSep).replace('\\', fileSep);
 int nthMatch = fileSepCorrected.indexOf(fileSep);

http://git-wip-us.apache.org/repos/asf/ant/blob/a3246562/src/main/org/apache/tools/ant/types/mappers/FilterMapper.java
--
diff --git a/src/main/org/apache/tools/ant/types/mappers/FilterMapper.java 
b/src/main/org/apache/tools/ant/types/mappers/FilterMapper.java
index 501da50..9ef922e 100644
--- a/src/main/org/apache/tools/ant/types/mappers/FilterMapper.java
+++ b/src/main/org/apache/tools/ant/types/mappers/FilterMapper.java
@@ -63,6 +63,9 @@ public class FilterMapper extends FilterChain implements 
FileNameMapper {
  *  the filterchain returns an empty string.
  */
 public String[] mapFileName(String sourceFileName) {
+if (sourceFileName == null) {
+return null;
+}
 try {
 Reader stringReader = new StringReader(sourceFileName);
 ChainReaderHelper helper = new ChainReaderHelper();

http://git-wip-us.apache.org/repos/asf/ant/blob/a3246562/src/main/org/apache/tools/ant/util/FlatFileNameMapper.java
--
diff --git a/src/main/org/apache/tools/ant/util/FlatFileNameMapper.java 
b/src/main/org/apache/tools/ant/util/FlatFileNameMapper.java
index 420ccc6..04d58be 100644
--- a/src/main/org/apache/tools/ant/util/FlatFileNameMapper.java
+++ b/src/main/org/apache/tools/ant/util/FlatFileNameMapper.java
@@ -49,6 +49,7 @@ public class FlatFileNameMapper implements FileNameMapper {
  * @return the file name in a one-element array.
  */
 public String[] mapFileName(String sourceFileName) {
-return new String[] {new java.io.File(sourceFileName).getName()};
+return sourceFileName == null ? null
+: new String[] {new java.io.File(sourceFileName).getName()};
 }
 }

http://git-wip-us.apache.org/repos/asf/ant/blob/a3246562/src/main/org/apache/tools/ant/util/GlobPatternMapper.java
--
diff --git a/src/main/org/apache/tools/ant/util/GlobPatternMapper.java 
b/src/main/org/apache/tools/ant/util/GlobPatternMapper.java
index ebba54e..a0f0ca9 100644
--- a/src/main/org/apache/tools/ant/util/GlobPatternMapper.java
+++ b/src/main/org/apache/tools/ant/util/GlobPatternMapper.java
@@ -154,6 +154,9 @@ public class GlobPatternMapper implements FileNameMapper {
  * @return a list of converted filenames
  */
 public String[] mapFileName(String sourceFileName) {
+if (sourceFileName == null) {
+return null;
+}
 String modName = modifyName(sourceFileName);
 if (fromPrefix == null
 || (sourceFileName.length() < (prefixLength + postfixLength))

http://git-wip-us.apache.org/repos/asf/ant/blob/a3246562/src/main/org/apache/tools/

[3/4] ant git commit: properly check return value of mapFileName

[bodewig]

properly check return value of mapFileName

https://bz.apache.org/bugzilla/show_bug.cgi?id=62076


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/21b87000
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/21b87000
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/21b87000

Branch: refs/heads/master
Commit: 21b870006b985713b76723e73a64607a0d7d63fe
Parents: a324656
Author: Stefan Bodewig 
Authored: Fri Feb 9 18:39:08 2018 +0100
Committer: Stefan Bodewig 
Committed: Fri Feb 9 18:39:08 2018 +0100

--
 src/main/org/apache/tools/ant/taskdefs/Copy.java| 5 -
 src/main/org/apache/tools/ant/taskdefs/CopyPath.java| 3 +++
 src/main/org/apache/tools/ant/taskdefs/Rmic.java| 3 +++
 .../org/apache/tools/ant/taskdefs/optional/Native2Ascii.java| 5 -
 4 files changed, 14 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/21b87000/src/main/org/apache/tools/ant/taskdefs/Copy.java
--
diff --git a/src/main/org/apache/tools/ant/taskdefs/Copy.java 
b/src/main/org/apache/tools/ant/taskdefs/Copy.java
index 42f7cb7..fab7379 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Copy.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Copy.java
@@ -788,6 +788,9 @@ public class Copy extends Task {
 for (int i = 0; i < toCopy.length; i++) {
 final File src = new File(fromDir, toCopy[i]);
 final String[] mappedFiles = mapper.mapFileName(toCopy[i]);
+if (mappedFiles == null || mappedFiles.length == 0) {
+continue;
+}
 
 if (!enableMultipleMappings) {
 map.put(src.getAbsolutePath(),
@@ -836,7 +839,7 @@ public class Copy extends Task {
 }
 for (int i = 0; i < toCopy.length; i++) {
 final String[] mappedFiles = 
mapper.mapFileName(toCopy[i].getName());
-if (mappedFiles == null) {
+if (mappedFiles == null || mappedFiles.length == 0) {
 throw new BuildException("Can't copy a resource without a"
 + " name if the mapper doesn't"
 + " provide one.");

http://git-wip-us.apache.org/repos/asf/ant/blob/21b87000/src/main/org/apache/tools/ant/taskdefs/CopyPath.java
--
diff --git a/src/main/org/apache/tools/ant/taskdefs/CopyPath.java 
b/src/main/org/apache/tools/ant/taskdefs/CopyPath.java
index 53596fd..bad9e5d 100644
--- a/src/main/org/apache/tools/ant/taskdefs/CopyPath.java
+++ b/src/main/org/apache/tools/ant/taskdefs/CopyPath.java
@@ -182,6 +182,9 @@ public class CopyPath extends Task {
 String sourceFileName = sourceFiles[sources];
 File sourceFile = new File(sourceFileName);
 String[] toFiles = (String[]) mapper.mapFileName(sourceFileName);
+if (toFiles == null) {
+continue;
+}
 
 for (int i = 0; i < toFiles.length; i++) {
 String destFileName = toFiles[i];

http://git-wip-us.apache.org/repos/asf/ant/blob/21b87000/src/main/org/apache/tools/ant/taskdefs/Rmic.java
--
diff --git a/src/main/org/apache/tools/ant/taskdefs/Rmic.java 
b/src/main/org/apache/tools/ant/taskdefs/Rmic.java
index d72c39e..0a54b3e 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Rmic.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Rmic.java
@@ -709,6 +709,9 @@ public class Rmic extends MatchingTask {
 String classFileName = classname.replace('.', File.separatorChar)
 + ".class";
 String[] generatedFiles = 
adapter.getMapper().mapFileName(classFileName);
+if (generatedFiles == null) {
+return;
+}
 
 for (int i = 0; i < generatedFiles.length; i++) {
 final String generatedFile = generatedFiles[i];

http://git-wip-us.apache.org/repos/asf/ant/blob/21b87000/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java
--
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java 
b/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java
index 664e574..1474cce 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java
@@ -255,7 +255,10 @@ public class Native2Ascii extends MatchingTask {
 + (count != 1 ? "s" : "") + " from ";
 log(message + srcDir + " to " + dest

[1/4] ant git commit: add some documentation hints

[bodewig]

Repository: ant
Updated Branches:
  refs/heads/master 3bb66d938 -> e90f71193


add some documentation hints

see https://bz.apache.org/bugzilla/show_bug.cgi?id=62076


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/801a44a2
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/801a44a2
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/801a44a2

Branch: refs/heads/master
Commit: 801a44a2079d19479ddaed087dfe4a982ae955a3
Parents: ee33805
Author: Stefan Bodewig 
Authored: Fri Feb 9 18:36:20 2018 +0100
Committer: Stefan Bodewig 
Committed: Fri Feb 9 18:36:20 2018 +0100

--
 src/main/org/apache/tools/ant/util/ChainedMapper.java  | 3 +++
 src/main/org/apache/tools/ant/util/FileNameMapper.java | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/801a44a2/src/main/org/apache/tools/ant/util/ChainedMapper.java
--
diff --git a/src/main/org/apache/tools/ant/util/ChainedMapper.java 
b/src/main/org/apache/tools/ant/util/ChainedMapper.java
index 635a053..6e07aa6 100644
--- a/src/main/org/apache/tools/ant/util/ChainedMapper.java
+++ b/src/main/org/apache/tools/ant/util/ChainedMapper.java
@@ -35,6 +35,9 @@ public class ChainedMapper extends ContainerMapper {
 public String[] mapFileName(String sourceFileName) {
 List inputs = new ArrayList();
 List results = new ArrayList();
+// we do this even if the sourceFileName is null. Some
+// resources have a null name and users may use a mapper like
+// MergeMapper to provide a name for it.
 results.add(sourceFileName);
 FileNameMapper mapper = null;
 

http://git-wip-us.apache.org/repos/asf/ant/blob/801a44a2/src/main/org/apache/tools/ant/util/FileNameMapper.java
--
diff --git a/src/main/org/apache/tools/ant/util/FileNameMapper.java 
b/src/main/org/apache/tools/ant/util/FileNameMapper.java
index bbd8261..ec85f9d 100644
--- a/src/main/org/apache/tools/ant/util/FileNameMapper.java
+++ b/src/main/org/apache/tools/ant/util/FileNameMapper.java
@@ -52,7 +52,9 @@ public interface FileNameMapper {
  * omit the source file in question.
  *
  * @param sourceFileName the name of the source file relative to
- *   some given basedirectory.
+ *   some given basedirectory. Might be {@code
+ *   null} for resources that don't provide a
+ *   name.
  * @return an array of strings if the rule applies to the source file, or
  * null if it does not.
  */

[2/2] ant git commit: bad merge

[bodewig]

bad merge


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/13249b71
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/13249b71
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/13249b71

Branch: refs/heads/master
Commit: 13249b7193d9f3944e59d708e2ad813150bc72d3
Parents: e90f711
Author: Stefan Bodewig 
Authored: Fri Feb 9 19:01:49 2018 +0100
Committer: Stefan Bodewig 
Committed: Fri Feb 9 19:02:15 2018 +0100

--
 src/main/org/apache/tools/ant/util/FlatFileNameMapper.java | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/13249b71/src/main/org/apache/tools/ant/util/FlatFileNameMapper.java
--
diff --git a/src/main/org/apache/tools/ant/util/FlatFileNameMapper.java 
b/src/main/org/apache/tools/ant/util/FlatFileNameMapper.java
index 37383b6..07ba4c6 100644
--- a/src/main/org/apache/tools/ant/util/FlatFileNameMapper.java
+++ b/src/main/org/apache/tools/ant/util/FlatFileNameMapper.java
@@ -52,7 +52,6 @@ public class FlatFileNameMapper implements FileNameMapper {
  */
 @Override
 public String[] mapFileName(String sourceFileName) {
-return new String[] { new java.io.File(sourceFileName).getName() };
 return sourceFileName == null ? null
 : new String[] {new java.io.File(sourceFileName).getName()};
 }

[1/2] ant git commit: in 1.9.x we skip unmappable resouces in MappedResourceCollection

[bodewig]

Repository: ant
Updated Branches:
  refs/heads/master e90f71193 -> 7ade15cb1


in 1.9.x we skip unmappable resouces in MappedResourceCollection


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/7ade15cb
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/7ade15cb
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/7ade15cb

Branch: refs/heads/master
Commit: 7ade15cb162cfb8ddeb9992445d1ae53ca434f3f
Parents: 13249b7
Author: Stefan Bodewig 
Authored: Fri Feb 9 18:56:57 2018 +0100
Committer: Stefan Bodewig 
Committed: Fri Feb 9 19:02:15 2018 +0100

--
 .../apache/tools/ant/types/resources/MappedResourceCollection.java | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/7ade15cb/src/main/org/apache/tools/ant/types/resources/MappedResourceCollection.java
--
diff --git 
a/src/main/org/apache/tools/ant/types/resources/MappedResourceCollection.java 
b/src/main/org/apache/tools/ant/types/resources/MappedResourceCollection.java
index c870cc1..2b2f4f1 100644
--- 
a/src/main/org/apache/tools/ant/types/resources/MappedResourceCollection.java
+++ 
b/src/main/org/apache/tools/ant/types/resources/MappedResourceCollection.java
@@ -20,6 +20,7 @@ package org.apache.tools.ant.types.resources;
 import java.io.File;
 import java.util.Collection;
 import java.util.Iterator;
+import java.util.Objects;
 import java.util.Stack;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -237,6 +238,7 @@ public class MappedResourceCollection
 if (enableMultipleMappings) {
 stream = nested.stream()
 .flatMap(r -> Stream.of(m.mapFileName(r.getName()))
+.filter(Objects::nonNull)
 .map(MergingMapper::new)
 .map(mm -> new MappedResource(r, mm)));
 } else {

ant git commit: Java8 refactoring has stripped encoding of DNs

[bodewig]

Repository: ant
Updated Branches:
  refs/heads/master f690f9908 -> debd9484f


Java8 refactoring has stripped encoding of DNs


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/debd9484
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/debd9484
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/debd9484

Branch: refs/heads/master
Commit: debd9484f8e210fd9a83562d8cf3c7028d4611f4
Parents: f690f99
Author: Stefan Bodewig 
Authored: Sat Feb 10 18:39:02 2018 +0100
Committer: Stefan Bodewig 
Committed: Sat Feb 10 18:39:37 2018 +0100

--
 src/main/org/apache/tools/ant/taskdefs/GenerateKey.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/debd9484/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java
--
diff --git a/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java 
b/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java
index 7270e67..9c9fc16 100644
--- a/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java
+++ b/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java
@@ -116,7 +116,7 @@ public class GenerateKey extends Task {
  */
 @Override
 public String toString() {
-return params.stream().map(p -> p.getName() + "=" + p.getValue())
+return params.stream().map(p -> encode(p.getName()) + "=" + 
encode(p.getValue()))
 .collect(Collectors.joining(", "));
 }
 

[2/2] ant git commit: whitespace

[bodewig]

whitespace


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/38fed1a2
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/38fed1a2
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/38fed1a2

Branch: refs/heads/master
Commit: 38fed1a2fab29373a3b2891f6612a7beb68f65c3
Parents: 4cacf92
Author: Stefan Bodewig 
Authored: Sat Feb 10 18:50:08 2018 +0100
Committer: Stefan Bodewig 
Committed: Sat Feb 10 18:59:19 2018 +0100

--
 .../org/apache/tools/ant/taskdefs/JDBCTask.java |  4 +--
 src/main/org/apache/tools/ant/taskdefs/Jar.java | 32 ++--
 2 files changed, 18 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/38fed1a2/src/main/org/apache/tools/ant/taskdefs/JDBCTask.java
--
diff --git a/src/main/org/apache/tools/ant/taskdefs/JDBCTask.java 
b/src/main/org/apache/tools/ant/taskdefs/JDBCTask.java
index 3b8dd46..5f3da78 100644
--- a/src/main/org/apache/tools/ant/taskdefs/JDBCTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/JDBCTask.java
@@ -349,8 +349,8 @@ public abstract class JDBCTask extends Task {
 info.put("password", getPassword());
 
 for (Property p : connectionProperties) {
-String name = p.getName();
-String value = p.getValue();
+String name = p.getName();
+String value = p.getValue();
 if (name == null || value == null) {
 log("Only name/value pairs are supported as connection 
properties.",
 Project.MSG_WARN);

http://git-wip-us.apache.org/repos/asf/ant/blob/38fed1a2/src/main/org/apache/tools/ant/taskdefs/Jar.java
--
diff --git a/src/main/org/apache/tools/ant/taskdefs/Jar.java 
b/src/main/org/apache/tools/ant/taskdefs/Jar.java
index 73a871f..3797e89 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Jar.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Jar.java
@@ -860,23 +860,23 @@ public class Jar extends Zip {
 log("Building MANIFEST-only jar: "
 + getDestFile().getAbsolutePath());
 
-try (ZipOutputStream zOut = new ZipOutputStream(getDestFile())) {
-zOut.setEncoding(getEncoding());
-zOut.setUseZip64(getZip64Mode().getMode());
-if (isCompress()) {
-zOut.setMethod(ZipOutputStream.DEFLATED);
-} else {
-zOut.setMethod(ZipOutputStream.STORED);
+try (ZipOutputStream zOut = new ZipOutputStream(getDestFile())) {
+zOut.setEncoding(getEncoding());
+zOut.setUseZip64(getZip64Mode().getMode());
+if (isCompress()) {
+zOut.setMethod(ZipOutputStream.DEFLATED);
+} else {
+zOut.setMethod(ZipOutputStream.STORED);
+}
+initZipOutputStream(zOut);
+finalizeZipOutputStream(zOut);
+} catch (IOException ioe) {
+throw new BuildException("Could not create almost empty JAR 
archive"
+ + " (" + ioe.getMessage() + ")", ioe,
+ getLocation());
+} finally {
+createEmpty = false;
 }
-initZipOutputStream(zOut);
-finalizeZipOutputStream(zOut);
-} catch (IOException ioe) {
-throw new BuildException("Could not create almost empty JAR 
archive"
- + " (" + ioe.getMessage() + ")", ioe,
- getLocation());
-} finally {
-createEmpty = false;
-}
 }
 return true;
 }

[1/2] ant git commit: Java8 refactoring made createEmptyZip ignore skipWriting flag

[bodewig]

Repository: ant
Updated Branches:
  refs/heads/master debd9484f -> 38fed1a2f


Java8 refactoring made createEmptyZip ignore skipWriting flag


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/4cacf923
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/4cacf923
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/4cacf923

Branch: refs/heads/master
Commit: 4cacf92330dc87847fed03e0d2f9a9a5a6c8b89e
Parents: debd948
Author: Stefan Bodewig 
Authored: Sat Feb 10 18:57:32 2018 +0100
Committer: Stefan Bodewig 
Committed: Sat Feb 10 18:58:18 2018 +0100

--
 src/main/org/apache/tools/ant/taskdefs/Jar.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/4cacf923/src/main/org/apache/tools/ant/taskdefs/Jar.java
--
diff --git a/src/main/org/apache/tools/ant/taskdefs/Jar.java 
b/src/main/org/apache/tools/ant/taskdefs/Jar.java
index f105cb4..73a871f 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Jar.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Jar.java
@@ -859,7 +859,7 @@ public class Jar extends Zip {
 if (!skipWriting) {
 log("Building MANIFEST-only jar: "
 + getDestFile().getAbsolutePath());
-}
+
 try (ZipOutputStream zOut = new ZipOutputStream(getDestFile())) {
 zOut.setEncoding(getEncoding());
 zOut.setUseZip64(getZip64Mode().getMode());
@@ -877,6 +877,7 @@ public class Jar extends Zip {
 } finally {
 createEmpty = false;
 }
+}
 return true;
 }
 

ant git commit: Java8 refactoring removed buffering

[bodewig]

Repository: ant
Updated Branches:
  refs/heads/master 38fed1a2f -> 7845e9f0a


Java8 refactoring removed buffering


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/7845e9f0
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/7845e9f0
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/7845e9f0

Branch: refs/heads/master
Commit: 7845e9f0afb601966f7fbf565c68fb7fa6b5b4e2
Parents: 38fed1a
Author: Stefan Bodewig 
Authored: Sun Feb 11 10:24:09 2018 +0100
Committer: Stefan Bodewig 
Committed: Sun Feb 11 10:24:09 2018 +0100

--
 src/main/org/apache/tools/ant/taskdefs/LoadProperties.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/7845e9f0/src/main/org/apache/tools/ant/taskdefs/LoadProperties.java
--
diff --git a/src/main/org/apache/tools/ant/taskdefs/LoadProperties.java 
b/src/main/org/apache/tools/ant/taskdefs/LoadProperties.java
index bc71660..b186eef 100644
--- a/src/main/org/apache/tools/ant/taskdefs/LoadProperties.java
+++ b/src/main/org/apache/tools/ant/taskdefs/LoadProperties.java
@@ -17,6 +17,7 @@
  */
 package org.apache.tools.ant.taskdefs;
 
+import java.io.BufferedInputStream;
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
@@ -177,7 +178,7 @@ public class LoadProperties extends Task {
 Charset charset = encoding == null ? Charset.defaultCharset() : 
Charset.forName(encoding);
 
 try (ChainReader instream = new ChainReaderHelper(getProject(),
-new InputStreamReader(src.getInputStream(), charset), filterChains)
+new InputStreamReader(new 
BufferedInputStream(src.getInputStream()), charset), filterChains)
 .getAssembledReader()) {
 
 String text = instream.readFully();

ant git commit: move checkstyle rule back where it belongs

[bodewig]

Repository: ant
Updated Branches:
  refs/heads/master 7845e9f0a -> c8b7af521


move checkstyle rule back where it belongs


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/c8b7af52
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/c8b7af52
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/c8b7af52

Branch: refs/heads/master
Commit: c8b7af521e66d8ef44a2f399286ce851dc39dd68
Parents: 7845e9f
Author: Stefan Bodewig 
Authored: Sun Feb 11 21:06:37 2018 +0100
Committer: Stefan Bodewig 
Committed: Sun Feb 11 21:06:37 2018 +0100

--
 .../tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/c8b7af52/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
--
diff --git 
a/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java 
b/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
index e6efc2c..a9ba55f 100644
--- 
a/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
+++ 
b/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
@@ -64,6 +64,7 @@ public abstract class DefaultCompilerAdapter
 //must keep for subclass BC, though unused:
 // CheckStyle:ConstantNameCheck OFF - bc
 protected static final String lSep = StringUtils.LINE_SEP;
+// CheckStyle:ConstantNameCheck ON
 
 protected Path src;
 protected File destDir;
@@ -92,7 +93,6 @@ public abstract class DefaultCompilerAdapter
 protected File[] compileList;
 protected Javac attributes;
 
-// CheckStyle:ConstantNameCheck ON
 // CheckStyle:VisibilityModifier ON
 
 /**

ant git commit: Java8 refactoring introdiced PrintWriter that we do not want to use

[bodewig]

Repository: ant
Updated Branches:
  refs/heads/master c8b7af521 -> 81882fe74


Java8 refactoring introdiced PrintWriter that we do not want to use

PrintWriter's `println` method swallows exceptions and we really want
to know when writing fails.


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/81882fe7
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/81882fe7
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/81882fe7

Branch: refs/heads/master
Commit: 81882fe7435a245293fe377b6c6224400519d603
Parents: c8b7af5
Author: Stefan Bodewig 
Authored: Mon Feb 12 10:18:54 2018 +0100
Committer: Stefan Bodewig 
Committed: Mon Feb 12 10:18:54 2018 +0100

--
 .../org/apache/tools/ant/taskdefs/optional/Cab.java | 12 +++-
 1 file changed, 7 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/81882fe7/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java
--
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java 
b/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java
index b94387d..ebc46e2 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java
@@ -23,7 +23,6 @@ import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.io.PrintWriter;
 import java.util.Collections;
 import java.util.Vector;
 
@@ -178,10 +177,13 @@ public class Cab extends MatchingTask {
 throws IOException {
 File listFile = FILE_UTILS.createTempFile("ant", "", null, true, true);
 
-try (PrintWriter writer =
-new PrintWriter(new BufferedWriter(new FileWriter(listFile {
-files.stream().map(f -> String.format("\"%s\"", f))
-.forEach(writer::println);
+try (BufferedWriter writer =
+new BufferedWriter(new FileWriter(listFile))) {
+for (String f : files) {
+String s = String.format("\"%s\"", f);
+writer.write(s);
+writer.newLine();
+}
 }
 return listFile;
 }

ant git commit: Java8 refactoring introduced the evil PrintWriter

[bodewig]

Repository: ant
Updated Branches:
  refs/heads/master 81882fe74 -> fb22a1a2e


Java8 refactoring introduced the evil PrintWriter


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/fb22a1a2
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/fb22a1a2
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/fb22a1a2

Branch: refs/heads/master
Commit: fb22a1a2eb68f7b7d997b0466b19d6163149e946
Parents: 81882fe
Author: Stefan Bodewig 
Authored: Tue Feb 13 18:29:34 2018 +0100
Committer: Stefan Bodewig 
Committed: Tue Feb 13 18:29:34 2018 +0100

--
 .../tools/ant/taskdefs/optional/depend/Depend.java  | 12 +++-
 1 file changed, 7 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/fb22a1a2/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java
--
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java 
b/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java
index 3b6d341..e31b496 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java
@@ -23,7 +23,6 @@ import java.io.File;
 import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
-import java.io.PrintWriter;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Enumeration;
@@ -222,12 +221,15 @@ public class Depend extends MatchingTask {
 if (cache != null) {
 cache.mkdirs();
 File depFile = new File(cache, CACHE_FILE_NAME);
-try (PrintWriter pw =
-new PrintWriter(new BufferedWriter(new FileWriter(depFile {
+try (BufferedWriter pw =
+new BufferedWriter(new FileWriter(depFile))) {
 for (Map.Entry> e : dependencyMap
 .entrySet()) {
-pw.printf("%s%s%n", CLASSNAME_PREPEND, e.getKey());
-e.getValue().forEach(pw::println);
+pw.write(String.format("%s%s%n", CLASSNAME_PREPEND, 
e.getKey()));
+for (String s : e.getValue()) {
+pw.write(s);
+pw.newLine();
+}
 }
 }
 }

ant git commit: Java8 refactoring removed call to DirectoryScanner.scan

[bodewig]

Repository: ant
Updated Branches:
  refs/heads/master fb22a1a2e -> eab7f04ca


Java8 refactoring removed call to DirectoryScanner.scan


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/eab7f04c
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/eab7f04c
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/eab7f04c

Branch: refs/heads/master
Commit: eab7f04cac436a670d83ac91b416aa2eab28f4b7
Parents: fb22a1a
Author: Stefan Bodewig 
Authored: Tue Feb 13 19:51:29 2018 +0100
Committer: Stefan Bodewig 
Committed: Tue Feb 13 19:51:29 2018 +0100

--
 .../tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java  | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/eab7f04c/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java
--
diff --git 
a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java
 
b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java
index 64672c9..223bc0a 100644
--- 
a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java
+++ 
b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java
@@ -520,6 +520,7 @@ public class GenericDeploymentTool implements 
EJBDeploymentTool {
 for (FileSet supportFileSet : config.supportFileSets) {
 File supportBaseDir = supportFileSet.getDir(project);
 DirectoryScanner supportScanner = 
supportFileSet.getDirectoryScanner(project);
+supportScanner.scan();
 for (String supportFile : supportScanner.getIncludedFiles()) {
 ejbFiles.put(supportFile, new File(supportBaseDir, 
supportFile));
 }

ant git commit: rephrase comment after it has been moved

[bodewig]

Repository: ant
Updated Branches:
  refs/heads/master eab7f04ca -> 6850ad2e6


rephrase comment after it has been moved


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/6850ad2e
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/6850ad2e
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/6850ad2e

Branch: refs/heads/master
Commit: 6850ad2e61257a0a8aaf2034f186af8e15d3b42b
Parents: eab7f04
Author: Stefan Bodewig 
Authored: Tue Feb 13 20:32:07 2018 +0100
Committer: Stefan Bodewig 
Committed: Tue Feb 13 20:32:07 2018 +0100

--
 .../ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/6850ad2e/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java
--
diff --git 
a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java
 
b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java
index 4b0116d..2eba14d 100644
--- 
a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java
+++ 
b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java
@@ -736,10 +736,9 @@ public class WeblogicDeploymentTool extends 
GenericDeploymentTool {
 }
 //Object class Changed   update it.
 replaceEntries.put(filepath, genericEntry);
-} else if (!genericEntry.getName()
-.equals("META-INF/MANIFEST.MF")) {
-// it is the manifest, so ignore it
-//File other then class changed   rebuild
+} else if 
(!"META-INF/MANIFEST.MF".equals(genericEntry.getName())) {
+// it is not the manifest, otherwise we'd 
ignore it
+// File other then class changed   rebuild
 log("Non class file " + genericEntry.getName()
 + " has changed", Project.MSG_VERBOSE);
 rebuild = true;

ant git commit: Java8 refactoring stripped null check on manifest.getMainAttributes

[bodewig]

Repository: ant
Updated Branches:
  refs/heads/master 6850ad2e6 -> c813b4d8d


Java8 refactoring stripped null check on manifest.getMainAttributes


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/c813b4d8
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/c813b4d8
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/c813b4d8

Branch: refs/heads/master
Commit: c813b4d8d8b72f6c1caf7611aa60771aa70405b3
Parents: 6850ad2
Author: Stefan Bodewig 
Authored: Tue Feb 13 20:42:32 2018 +0100
Committer: Stefan Bodewig 
Committed: Tue Feb 13 20:42:32 2018 +0100

--
 .../apache/tools/ant/taskdefs/optional/extension/Extension.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/c813b4d8/src/main/org/apache/tools/ant/taskdefs/optional/extension/Extension.java
--
diff --git 
a/src/main/org/apache/tools/ant/taskdefs/optional/extension/Extension.java 
b/src/main/org/apache/tools/ant/taskdefs/optional/extension/Extension.java
index a0c7e9d..f4bd77b 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/extension/Extension.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/Extension.java
@@ -20,6 +20,7 @@ package org.apache.tools.ant.taskdefs.optional.extension;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.StringTokenizer;
 import java.util.jar.Attributes;
 import java.util.jar.Manifest;
@@ -191,7 +192,8 @@ public final class Extension {
 return new Extension[0];
 }
 return Stream
-.concat(Stream.of(manifest.getMainAttributes()),
+.concat(Optional.ofNullable(manifest.getMainAttributes())
+.map(Stream::of).orElse(Stream.empty()),
 manifest.getEntries().values().stream())
 .map(attrs -> getExtension("", attrs)).filter(Objects::nonNull)
 .toArray(Extension[]::new);

ant git commit: Revert "Java8 refactoring removed call to DirectoryScanner.scan"

[bodewig]

Repository: ant
Updated Branches:
  refs/heads/master c813b4d8d -> 495c0ed8e


Revert "Java8 refactoring removed call to DirectoryScanner.scan"

the call to scan is redundant as supportFileSet.getDirectoryScanner
has already called scan internally.

This reverts commit eab7f04cac436a670d83ac91b416aa2eab28f4b7.


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/495c0ed8
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/495c0ed8
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/495c0ed8

Branch: refs/heads/master
Commit: 495c0ed8ee7b2c6a646f5037e9d678d5ad2023ab
Parents: c813b4d
Author: Stefan Bodewig 
Authored: Tue Feb 13 21:50:03 2018 +0100
Committer: Stefan Bodewig 
Committed: Tue Feb 13 21:50:03 2018 +0100

--
 .../tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java  | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/495c0ed8/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java
--
diff --git 
a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java
 
b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java
index 223bc0a..64672c9 100644
--- 
a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java
+++ 
b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java
@@ -520,7 +520,6 @@ public class GenericDeploymentTool implements 
EJBDeploymentTool {
 for (FileSet supportFileSet : config.supportFileSets) {
 File supportBaseDir = supportFileSet.getDir(project);
 DirectoryScanner supportScanner = 
supportFileSet.getDirectoryScanner(project);
-supportScanner.scan();
 for (String supportFile : supportScanner.getIncludedFiles()) {
 ejbFiles.put(supportFile, new File(supportBaseDir, 
supportFile));
 }

ant git commit: make sure destPath doesn't leak into dependency path

[bodewig]

Repository: ant
Updated Branches:
  refs/heads/master 495c0ed8e -> 1fbf71253


make sure destPath doesn't leak into dependency path


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/1fbf7125
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/1fbf7125
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/1fbf7125

Branch: refs/heads/master
Commit: 1fbf712537a179f9e1b3aa172e83cfef9a2eefe9
Parents: 495c0ed
Author: Stefan Bodewig 
Authored: Wed Feb 14 09:49:38 2018 +0100
Committer: Stefan Bodewig 
Committed: Wed Feb 14 09:49:38 2018 +0100

--
 .../tools/ant/taskdefs/optional/depend/Depend.java| 14 --
 1 file changed, 8 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/1fbf7125/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java
--
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java 
b/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java
index e31b496..0834dbe 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java
@@ -28,6 +28,7 @@ import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -44,8 +45,8 @@ import org.apache.tools.ant.taskdefs.rmic.DefaultRmicAdapter;
 import org.apache.tools.ant.taskdefs.rmic.WLRmic;
 import org.apache.tools.ant.types.Path;
 import org.apache.tools.ant.types.Reference;
+import org.apache.tools.ant.types.Resource;
 import org.apache.tools.ant.types.ResourceCollection;
-import org.apache.tools.ant.types.resources.Difference;
 import org.apache.tools.ant.types.resources.FileProvider;
 import org.apache.tools.ant.util.FileUtils;
 import org.apache.tools.ant.util.depend.DependencyAnalyzer;
@@ -244,16 +245,17 @@ public class Depend extends MatchingTask {
 if (dependClasspath == null) {
 return null;
 }
-Difference diff = new Difference();
-diff.add(destPath);
-diff.add(dependClasspath);
+
+Set dependNotInDest = new LinkedHashSet<>();
+dependClasspath.forEach(dependNotInDest::add);
+destPath.forEach(dependNotInDest::remove);
 
 Path p;
-if (diff.isEmpty()) {
+if (dependNotInDest.isEmpty()) {
 p = null;
 } else {
 p = new Path(getProject());
-p.add(diff);
+dependNotInDest.forEach(p::add);
 }
 
 log("Classpath without dest dir is " + p, Project.MSG_DEBUG);

[2/2] ant git commit: Java8 refactoring removed not-null guard

[bodewig]

Java8 refactoring removed not-null guard


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/9873bf6c
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/9873bf6c
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/9873bf6c

Branch: refs/heads/master
Commit: 9873bf6c8ae3fdd2cebe5c6083b6265827142b1c
Parents: 3721095
Author: Stefan Bodewig 
Authored: Wed Feb 14 14:31:03 2018 +0100
Committer: Stefan Bodewig 
Committed: Wed Feb 14 14:31:03 2018 +0100

--
 src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java| 5 -
 .../tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java  | 5 -
 2 files changed, 8 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/9873bf6c/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
--
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java 
b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
index 9aa1b49..3e36a2f 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
@@ -34,6 +34,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.StringTokenizer;
 import java.util.Vector;
@@ -1009,7 +1010,9 @@ public class FTP extends Task implements FTPTaskConfig {
 Predicate test =
 isCaseSensitive() ? lastpathelement::equals
 : lastpathelement::equalsIgnoreCase;
-return Stream.of(theFiles).filter(f -> test.test(f.getName()))
+return Stream.of(theFiles)
+.filter(Objects::nonNull)
+.filter(f -> test.test(f.getName()))
 .findFirst().orElse(null);
 }
 

http://git-wip-us.apache.org/repos/asf/ant/blob/9873bf6c/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java
--
diff --git 
a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java 
b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java
index 2ad81db..3bff2d9 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java
@@ -33,6 +33,7 @@ import java.util.HashSet;
 import java.util.Hashtable;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.StringTokenizer;
 import java.util.Vector;
@@ -913,7 +914,9 @@ public class FTPTaskMirrorImpl implements FTPTaskMirror {
 Predicate test =
 isCaseSensitive() ? lastpathelement::equals
 : lastpathelement::equalsIgnoreCase;
-return Stream.of(theFiles).filter(f -> test.test(f.getName()))
+return Stream.of(theFiles)
+.filter(Objects::nonNull)
+.filter(f -> test.test(f.getName()))
 .findFirst().orElse(null);
 }
 

[1/2] ant git commit: another evil PrintWriter introduced by Java8 refactoring

[bodewig]

Repository: ant
Updated Branches:
  refs/heads/master 1fbf71253 -> 9873bf6c8


another evil PrintWriter introduced by Java8 refactoring


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/37210954
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/37210954
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/37210954

Branch: refs/heads/master
Commit: 37210954e57bfe2614137fc98de2f50e81a3bf34
Parents: 1fbf712
Author: Stefan Bodewig 
Authored: Wed Feb 14 14:05:32 2018 +0100
Committer: Stefan Bodewig 
Committed: Wed Feb 14 14:07:36 2018 +0100

--
 .../taskdefs/optional/native2ascii/BuiltinNative2Ascii.java   | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/37210954/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/BuiltinNative2Ascii.java
--
diff --git 
a/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/BuiltinNative2Ascii.java
 
b/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/BuiltinNative2Ascii.java
index 6cdf903..54ddc0a 100644
--- 
a/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/BuiltinNative2Ascii.java
+++ 
b/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/BuiltinNative2Ascii.java
@@ -25,7 +25,6 @@ import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
 import java.io.Writer;
 import java.nio.file.Files;
 import java.util.function.UnaryOperator;
@@ -33,6 +32,7 @@ import java.util.function.UnaryOperator;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.taskdefs.optional.Native2Ascii;
 import org.apache.tools.ant.util.Native2AsciiUtils;
+import org.apache.tools.ant.util.StringUtils;
 
 /**
  * Encapsulates the built-in Native2Ascii implementation.
@@ -83,11 +83,10 @@ public class BuiltinNative2Ascii implements 
Native2AsciiAdapter {
 
 private void translate(BufferedReader input, Writer output,
 UnaryOperator translation) throws IOException {
-PrintWriter pw = new PrintWriter(output);
-
 for (String line : (Iterable) () -> input.lines()
 .map(translation).iterator()) {
-pw.println(line);
+output.write(line);
+output.write(StringUtils.LINE_SEP);
 }
 }
 }

ant git commit: separator in toString used to be ; before Java8 refactoring

[bodewig]

Repository: ant
Updated Branches:
  refs/heads/master 782ec7463 -> 6b8f2a5bc


separator in toString used to be ; before Java8 refactoring


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/6b8f2a5b
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/6b8f2a5b
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/6b8f2a5b

Branch: refs/heads/master
Commit: 6b8f2a5bcabb3f18eadb30a689313a73173fead4
Parents: 782ec74
Author: Stefan Bodewig 
Authored: Fri Feb 16 18:09:31 2018 +0100
Committer: Stefan Bodewig 
Committed: Fri Feb 16 18:09:31 2018 +0100

--
 src/main/org/apache/tools/ant/types/AbstractFileSet.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/6b8f2a5b/src/main/org/apache/tools/ant/types/AbstractFileSet.java
--
diff --git a/src/main/org/apache/tools/ant/types/AbstractFileSet.java 
b/src/main/org/apache/tools/ant/types/AbstractFileSet.java
index 7e1a3e4..568a1d7 100644
--- a/src/main/org/apache/tools/ant/types/AbstractFileSet.java
+++ b/src/main/org/apache/tools/ant/types/AbstractFileSet.java
@@ -887,7 +887,7 @@ public abstract class AbstractFileSet extends DataType
 }
 dieOnCircularReference();
 DirectoryScanner ds = getDirectoryScanner(getProject());
-return 
Stream.of(ds.getIncludedFiles()).collect(Collectors.joining(File.pathSeparator));
+return 
Stream.of(ds.getIncludedFiles()).collect(Collectors.joining(";"));
 }
 
 /**

ant git commit: resolveEntity was overwritten to remove exceptions before Java8 refactoring

[bodewig]

Repository: ant
Updated Branches:
  refs/heads/master 6b8f2a5bc -> 49e92364f


resolveEntity was overwritten to remove exceptions before Java8 refactoring


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/49e92364
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/49e92364
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/49e92364

Branch: refs/heads/master
Commit: 49e92364f740c8e2aae573ba4495b83f8c730115
Parents: 6b8f2a5
Author: Stefan Bodewig 
Authored: Fri Feb 16 18:35:25 2018 +0100
Committer: Stefan Bodewig 
Committed: Fri Feb 16 18:35:25 2018 +0100

--
 src/main/org/apache/tools/ant/types/XMLCatalog.java | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/49e92364/src/main/org/apache/tools/ant/types/XMLCatalog.java
--
diff --git a/src/main/org/apache/tools/ant/types/XMLCatalog.java 
b/src/main/org/apache/tools/ant/types/XMLCatalog.java
index 09dea53..b967a88 100644
--- a/src/main/org/apache/tools/ant/types/XMLCatalog.java
+++ b/src/main/org/apache/tools/ant/types/XMLCatalog.java
@@ -789,6 +789,8 @@ public class XMLCatalog extends DataType
  * the ExternalResolver strategy.
  */
 private interface CatalogResolver extends URIResolver, EntityResolver {
+@Override
+InputSource resolveEntity(String publicId, String systemId);
 }
 
 /**

ant git commit: use explicit Locale now that we use toLowerCase instead of equalsIgnoreCase

[bodewig]

Repository: ant
Updated Branches:
  refs/heads/master 49e92364f -> 3ae6f545d


use explicit Locale now that we use toLowerCase instead of equalsIgnoreCase


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/3ae6f545
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/3ae6f545
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/3ae6f545

Branch: refs/heads/master
Commit: 3ae6f545dcd126b71ee68c45a3fdf7dfa4566fb0
Parents: 49e9236
Author: Stefan Bodewig 
Authored: Fri Feb 16 20:48:17 2018 +0100
Committer: Stefan Bodewig 
Committed: Fri Feb 16 20:48:17 2018 +0100

--
 .../org/apache/tools/ant/types/optional/image/ColorMapper.java| 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/3ae6f545/src/main/org/apache/tools/ant/types/optional/image/ColorMapper.java
--
diff --git 
a/src/main/org/apache/tools/ant/types/optional/image/ColorMapper.java 
b/src/main/org/apache/tools/ant/types/optional/image/ColorMapper.java
index 14470fd..aa00d98 100644
--- a/src/main/org/apache/tools/ant/types/optional/image/ColorMapper.java
+++ b/src/main/org/apache/tools/ant/types/optional/image/ColorMapper.java
@@ -18,6 +18,7 @@
 package org.apache.tools.ant.types.optional.image;
 
 import java.awt.Color;
+import java.util.Locale;
 
 /**
  *
@@ -66,7 +67,7 @@ public final class ColorMapper {
  * @todo refactor to use an EnumeratedAttribute (maybe?)
  */
 public static Color getColorByName(String colorName) {
-switch (colorName.toLowerCase()) {
+switch (colorName.toLowerCase(Locale.ENGLISH)) {
 case COLOR_BLUE:
 return Color.blue;
 case COLOR_CYAN:

ant git commit: port image type bug fixes from Java8 refactoring in master

[bodewig]

Repository: ant
Updated Branches:
  refs/heads/1.9.x fc1ad4424 -> 2a5857c38


port image type bug fixes from Java8 refactoring in master


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/2a5857c3
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/2a5857c3
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/2a5857c3

Branch: refs/heads/1.9.x
Commit: 2a5857c384ef5a9e02b4264be44bf67f3a584d57
Parents: fc1ad44
Author: Stefan Bodewig 
Authored: Fri Feb 16 21:00:04 2018 +0100
Committer: Stefan Bodewig 
Committed: Fri Feb 16 21:00:04 2018 +0100

--
 .../org/apache/tools/ant/types/optional/image/Arc.java |  2 +-
 .../apache/tools/ant/types/optional/image/Ellipse.java |  2 +-
 .../tools/ant/types/optional/image/Rectangle.java  |  2 +-
 .../apache/tools/ant/types/optional/image/Text.java| 13 -
 4 files changed, 15 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/2a5857c3/src/main/org/apache/tools/ant/types/optional/image/Arc.java
--
diff --git a/src/main/org/apache/tools/ant/types/optional/image/Arc.java 
b/src/main/org/apache/tools/ant/types/optional/image/Arc.java
index 3d8b29b..ce29bfd 100644
--- a/src/main/org/apache/tools/ant/types/optional/image/Arc.java
+++ b/src/main/org/apache/tools/ant/types/optional/image/Arc.java
@@ -112,10 +112,10 @@ public class Arc extends BasicShape implements 
DrawOperation {
 PlanarImage img = ((DrawOperation) 
instr).executeDrawOperation();
 graphics.drawImage(img.getAsBufferedImage(), null, 0, 0);
 } else if (instr instanceof TransformOperation) {
-graphics = (Graphics2D) bi.getGraphics();
 PlanarImage image = ((TransformOperation) instr)
 
.executeTransformOperation(PlanarImage.wrapRenderedImage(bi));
 bi = image.getAsBufferedImage();
+graphics = (Graphics2D) bi.getGraphics();
 }
 }
 return PlanarImage.wrapRenderedImage(bi);

http://git-wip-us.apache.org/repos/asf/ant/blob/2a5857c3/src/main/org/apache/tools/ant/types/optional/image/Ellipse.java
--
diff --git a/src/main/org/apache/tools/ant/types/optional/image/Ellipse.java 
b/src/main/org/apache/tools/ant/types/optional/image/Ellipse.java
index 9fa1802..635d809 100644
--- a/src/main/org/apache/tools/ant/types/optional/image/Ellipse.java
+++ b/src/main/org/apache/tools/ant/types/optional/image/Ellipse.java
@@ -76,10 +76,10 @@ public class Ellipse extends BasicShape implements 
DrawOperation {
 PlanarImage img = ((DrawOperation) 
instr).executeDrawOperation();
 graphics.drawImage(img.getAsBufferedImage(), null, 0, 0);
 } else if (instr instanceof TransformOperation) {
-graphics = (Graphics2D) bi.getGraphics();
 PlanarImage image = ((TransformOperation) instr)
 
.executeTransformOperation(PlanarImage.wrapRenderedImage(bi));
 bi = image.getAsBufferedImage();
+graphics = (Graphics2D) bi.getGraphics();
 }
 }
 return PlanarImage.wrapRenderedImage(bi);

http://git-wip-us.apache.org/repos/asf/ant/blob/2a5857c3/src/main/org/apache/tools/ant/types/optional/image/Rectangle.java
--
diff --git a/src/main/org/apache/tools/ant/types/optional/image/Rectangle.java 
b/src/main/org/apache/tools/ant/types/optional/image/Rectangle.java
index e2d5bb1..836b6ca 100644
--- a/src/main/org/apache/tools/ant/types/optional/image/Rectangle.java
+++ b/src/main/org/apache/tools/ant/types/optional/image/Rectangle.java
@@ -107,11 +107,11 @@ public class Rectangle extends BasicShape implements 
DrawOperation {
 PlanarImage img = ((DrawOperation) 
instr).executeDrawOperation();
 graphics.drawImage(img.getAsBufferedImage(), null, 0, 0);
 } else if (instr instanceof TransformOperation) {
-graphics = (Graphics2D) bi.getGraphics();
 PlanarImage image
 = ((TransformOperation) instr)
 
.executeTransformOperation(PlanarImage.wrapRenderedImage(bi));
 bi = image.getAsBufferedImage();
+graphics = (Graphics2D) bi.getGraphics();
 }
 }
 return PlanarImage.wrapRenderedImage(bi);

http://git-wip-us.apache.org/repos/asf/ant/blob/2a5857c3/src/main/org/apache/tools/ant/types/optional/image/Text.java
--
diff --git a/src/main/org/apache/tools/ant/types/optional/image/Text.java

[2/2] ant git commit: Merge branch '1.9.x'

[bodewig]

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/acd33fa8
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/acd33fa8
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/acd33fa8

Branch: refs/heads/master
Commit: acd33fa8df8e7e8aac57a409856eacf0427bb2f7
Parents: 3ae6f54 2a5857c
Author: Stefan Bodewig 
Authored: Fri Feb 16 21:02:22 2018 +0100
Committer: Stefan Bodewig 
Committed: Fri Feb 16 21:02:22 2018 +0100

--
 src/main/org/apache/tools/ant/types/optional/image/Rectangle.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/acd33fa8/src/main/org/apache/tools/ant/types/optional/image/Rectangle.java
--
diff --cc src/main/org/apache/tools/ant/types/optional/image/Rectangle.java
index b15272f,836b6ca..d6392da
--- a/src/main/org/apache/tools/ant/types/optional/image/Rectangle.java
+++ b/src/main/org/apache/tools/ant/types/optional/image/Rectangle.java
@@@ -110,6 -111,7 +109,7 @@@ public class Rectangle extends BasicSha
  = ((TransformOperation) instr)
  
.executeTransformOperation(PlanarImage.wrapRenderedImage(bi));
  bi = image.getAsBufferedImage();
 -graphics = (Graphics2D) bi.getGraphics();
++graphics = bi.createGraphics();
  }
  }
  return PlanarImage.wrapRenderedImage(bi);

[1/2] ant git commit: port image type bug fixes from Java8 refactoring in master

[bodewig]

Repository: ant
Updated Branches:
  refs/heads/master 3ae6f545d -> acd33fa8d


port image type bug fixes from Java8 refactoring in master


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/2a5857c3
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/2a5857c3
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/2a5857c3

Branch: refs/heads/master
Commit: 2a5857c384ef5a9e02b4264be44bf67f3a584d57
Parents: fc1ad44
Author: Stefan Bodewig 
Authored: Fri Feb 16 21:00:04 2018 +0100
Committer: Stefan Bodewig 
Committed: Fri Feb 16 21:00:04 2018 +0100

--
 .../org/apache/tools/ant/types/optional/image/Arc.java |  2 +-
 .../apache/tools/ant/types/optional/image/Ellipse.java |  2 +-
 .../tools/ant/types/optional/image/Rectangle.java  |  2 +-
 .../apache/tools/ant/types/optional/image/Text.java| 13 -
 4 files changed, 15 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/2a5857c3/src/main/org/apache/tools/ant/types/optional/image/Arc.java
--
diff --git a/src/main/org/apache/tools/ant/types/optional/image/Arc.java 
b/src/main/org/apache/tools/ant/types/optional/image/Arc.java
index 3d8b29b..ce29bfd 100644
--- a/src/main/org/apache/tools/ant/types/optional/image/Arc.java
+++ b/src/main/org/apache/tools/ant/types/optional/image/Arc.java
@@ -112,10 +112,10 @@ public class Arc extends BasicShape implements 
DrawOperation {
 PlanarImage img = ((DrawOperation) 
instr).executeDrawOperation();
 graphics.drawImage(img.getAsBufferedImage(), null, 0, 0);
 } else if (instr instanceof TransformOperation) {
-graphics = (Graphics2D) bi.getGraphics();
 PlanarImage image = ((TransformOperation) instr)
 
.executeTransformOperation(PlanarImage.wrapRenderedImage(bi));
 bi = image.getAsBufferedImage();
+graphics = (Graphics2D) bi.getGraphics();
 }
 }
 return PlanarImage.wrapRenderedImage(bi);

http://git-wip-us.apache.org/repos/asf/ant/blob/2a5857c3/src/main/org/apache/tools/ant/types/optional/image/Ellipse.java
--
diff --git a/src/main/org/apache/tools/ant/types/optional/image/Ellipse.java 
b/src/main/org/apache/tools/ant/types/optional/image/Ellipse.java
index 9fa1802..635d809 100644
--- a/src/main/org/apache/tools/ant/types/optional/image/Ellipse.java
+++ b/src/main/org/apache/tools/ant/types/optional/image/Ellipse.java
@@ -76,10 +76,10 @@ public class Ellipse extends BasicShape implements 
DrawOperation {
 PlanarImage img = ((DrawOperation) 
instr).executeDrawOperation();
 graphics.drawImage(img.getAsBufferedImage(), null, 0, 0);
 } else if (instr instanceof TransformOperation) {
-graphics = (Graphics2D) bi.getGraphics();
 PlanarImage image = ((TransformOperation) instr)
 
.executeTransformOperation(PlanarImage.wrapRenderedImage(bi));
 bi = image.getAsBufferedImage();
+graphics = (Graphics2D) bi.getGraphics();
 }
 }
 return PlanarImage.wrapRenderedImage(bi);

http://git-wip-us.apache.org/repos/asf/ant/blob/2a5857c3/src/main/org/apache/tools/ant/types/optional/image/Rectangle.java
--
diff --git a/src/main/org/apache/tools/ant/types/optional/image/Rectangle.java 
b/src/main/org/apache/tools/ant/types/optional/image/Rectangle.java
index e2d5bb1..836b6ca 100644
--- a/src/main/org/apache/tools/ant/types/optional/image/Rectangle.java
+++ b/src/main/org/apache/tools/ant/types/optional/image/Rectangle.java
@@ -107,11 +107,11 @@ public class Rectangle extends BasicShape implements 
DrawOperation {
 PlanarImage img = ((DrawOperation) 
instr).executeDrawOperation();
 graphics.drawImage(img.getAsBufferedImage(), null, 0, 0);
 } else if (instr instanceof TransformOperation) {
-graphics = (Graphics2D) bi.getGraphics();
 PlanarImage image
 = ((TransformOperation) instr)
 
.executeTransformOperation(PlanarImage.wrapRenderedImage(bi));
 bi = image.getAsBufferedImage();
+graphics = (Graphics2D) bi.getGraphics();
 }
 }
 return PlanarImage.wrapRenderedImage(bi);

http://git-wip-us.apache.org/repos/asf/ant/blob/2a5857c3/src/main/org/apache/tools/ant/types/optional/image/Text.java
--
diff --git a/src/main/org/apache/tools/ant/types/optional/image/Text.java

ant git commit: tiny performance tweak

[bodewig]

Repository: ant
Updated Branches:
  refs/heads/master acd33fa8d -> c053271df


tiny performance tweak


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/c053271d
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/c053271d
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/c053271d

Branch: refs/heads/master
Commit: c053271df8e182f80e179ac8dd1c7c71a92cce4b
Parents: acd33fa
Author: Stefan Bodewig 
Authored: Sat Feb 17 07:54:01 2018 +0100
Committer: Stefan Bodewig 
Committed: Sat Feb 17 07:54:01 2018 +0100

--
 src/main/org/apache/tools/ant/types/resources/AllButFirst.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/c053271d/src/main/org/apache/tools/ant/types/resources/AllButFirst.java
--
diff --git a/src/main/org/apache/tools/ant/types/resources/AllButFirst.java 
b/src/main/org/apache/tools/ant/types/resources/AllButFirst.java
index f6bcf49..f49181b 100644
--- a/src/main/org/apache/tools/ant/types/resources/AllButFirst.java
+++ b/src/main/org/apache/tools/ant/types/resources/AllButFirst.java
@@ -42,7 +42,7 @@ public class AllButFirst extends SizeLimitCollection {
 
 @Override
 public synchronized int size() {
-return (int) 
getResourceCollection().stream().skip(getValidCount()).count();
+return Math.max(getResourceCollection().size() - getValidCount(), 0);
 }
 
 }

ant git commit: port granularity fixes from master branch

[bodewig]

Repository: ant
Updated Branches:
  refs/heads/1.9.x 2a5857c38 -> d9f60aab3


port granularity fixes from master branch


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/d9f60aab
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/d9f60aab
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/d9f60aab

Branch: refs/heads/1.9.x
Commit: d9f60aab39ffb55d5b8efbda08b4a4f09b2dbcb2
Parents: 2a5857c
Author: Stefan Bodewig 
Authored: Sat Feb 17 16:32:27 2018 +0100
Committer: Stefan Bodewig 
Committed: Sat Feb 17 16:32:27 2018 +0100

--
 src/main/org/apache/tools/ant/types/selectors/DateSelector.java| 2 +-
 src/main/org/apache/tools/ant/types/selectors/MappingSelector.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/d9f60aab/src/main/org/apache/tools/ant/types/selectors/DateSelector.java
--
diff --git a/src/main/org/apache/tools/ant/types/selectors/DateSelector.java 
b/src/main/org/apache/tools/ant/types/selectors/DateSelector.java
index c5ff5d5..f8db485 100644
--- a/src/main/org/apache/tools/ant/types/selectors/DateSelector.java
+++ b/src/main/org/apache/tools/ant/types/selectors/DateSelector.java
@@ -42,7 +42,7 @@ public class DateSelector extends BaseExtendSelector {
 private long millis = -1;
 private String dateTime = null;
 private boolean includeDirs = false;
-private long granularity = 0;
+private long granularity = FILE_UTILS.getFileTimestampGranularity();
 private String pattern;
 private TimeComparison when = TimeComparison.EQUAL;
 

http://git-wip-us.apache.org/repos/asf/ant/blob/d9f60aab/src/main/org/apache/tools/ant/types/selectors/MappingSelector.java
--
diff --git a/src/main/org/apache/tools/ant/types/selectors/MappingSelector.java 
b/src/main/org/apache/tools/ant/types/selectors/MappingSelector.java
index 1a27494..9360740 100644
--- a/src/main/org/apache/tools/ant/types/selectors/MappingSelector.java
+++ b/src/main/org/apache/tools/ant/types/selectors/MappingSelector.java
@@ -40,7 +40,7 @@ public abstract class MappingSelector extends BaseSelector {
 protected File targetdir = null;
 protected Mapper mapperElement = null;
 protected FileNameMapper map = null;
-protected int granularity = 0;
+protected int granularity = (int) FILE_UTILS.getFileTimestampGranularity();
 
 // CheckStyle:VisibilityModifier ON
 

[3/6] ant git commit: move cast back after type compatibility check

[bodewig]

move cast back after type compatibility check


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/e8117b6d
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/e8117b6d
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/e8117b6d

Branch: refs/heads/master
Commit: e8117b6d3c38e54ac8758d8da8e886639af4fb1b
Parents: e041e2a
Author: Stefan Bodewig 
Authored: Sat Feb 17 16:50:47 2018 +0100
Committer: Stefan Bodewig 
Committed: Sat Feb 17 16:50:47 2018 +0100

--
 .../ant/types/selectors/modifiedselector/ModifiedSelector.java  | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/e8117b6d/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java
--
diff --git 
a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java
 
b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java
index 3592041..f3b33e2 100644
--- 
a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java
+++ 
b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java
@@ -404,13 +404,12 @@ public class ModifiedSelector extends BaseExtendSelector
 clazz = Class.forName(classname);
 }
 
-@SuppressWarnings("unchecked")
-T rv = (T) clazz.newInstance();
+Object rv = clazz.newInstance();
 
 if (!type.isInstance(rv)) {
 throw new BuildException("Specified class (%s) %s", classname, 
msg);
 }
-return rv;
+return (T) rv;
 } catch (ClassNotFoundException e) {
 throw new BuildException("Specified class (%s) not found.", 
classname);
 } catch (Exception e) {

[4/6] ant git commit: Java8 refactoring also removed null check on mappers

[bodewig]

Java8 refactoring also removed null check on mappers


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/82f7d9be
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/82f7d9be
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/82f7d9be

Branch: refs/heads/master
Commit: 82f7d9be1dddb66d9e516ef636783dd11b7bbb0b
Parents: e8117b6
Author: Stefan Bodewig 
Authored: Sat Feb 17 16:58:32 2018 +0100
Committer: Stefan Bodewig 
Committed: Sat Feb 17 16:58:32 2018 +0100

--
 src/main/org/apache/tools/ant/util/ChainedMapper.java | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/82f7d9be/src/main/org/apache/tools/ant/util/ChainedMapper.java
--
diff --git a/src/main/org/apache/tools/ant/util/ChainedMapper.java 
b/src/main/org/apache/tools/ant/util/ChainedMapper.java
index cec4f2e..fcf64ae 100644
--- a/src/main/org/apache/tools/ant/util/ChainedMapper.java
+++ b/src/main/org/apache/tools/ant/util/ChainedMapper.java
@@ -36,6 +36,7 @@ public class ChainedMapper extends ContainerMapper {
 // resources have a null name and users may use a mapper like
 // MergeMapper to provide a name for it.
 String[] result = getMappers().stream()
+.filter(Objects::nonNull)
 .reduce(new String[] { sourceFileName }, (i, m) -> Stream.of(i)
 
.map(m::mapFileName).filter(Objects::nonNull).flatMap(Stream::of).toArray(String[]::new),
 (i, o) -> o);

[1/6] ant git commit: port granularity fixes from master branch

[bodewig]

Repository: ant
Updated Branches:
  refs/heads/master c053271df -> 0a3b2c002


port granularity fixes from master branch


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/d9f60aab
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/d9f60aab
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/d9f60aab

Branch: refs/heads/master
Commit: d9f60aab39ffb55d5b8efbda08b4a4f09b2dbcb2
Parents: 2a5857c
Author: Stefan Bodewig 
Authored: Sat Feb 17 16:32:27 2018 +0100
Committer: Stefan Bodewig 
Committed: Sat Feb 17 16:32:27 2018 +0100

--
 src/main/org/apache/tools/ant/types/selectors/DateSelector.java| 2 +-
 src/main/org/apache/tools/ant/types/selectors/MappingSelector.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/d9f60aab/src/main/org/apache/tools/ant/types/selectors/DateSelector.java
--
diff --git a/src/main/org/apache/tools/ant/types/selectors/DateSelector.java 
b/src/main/org/apache/tools/ant/types/selectors/DateSelector.java
index c5ff5d5..f8db485 100644
--- a/src/main/org/apache/tools/ant/types/selectors/DateSelector.java
+++ b/src/main/org/apache/tools/ant/types/selectors/DateSelector.java
@@ -42,7 +42,7 @@ public class DateSelector extends BaseExtendSelector {
 private long millis = -1;
 private String dateTime = null;
 private boolean includeDirs = false;
-private long granularity = 0;
+private long granularity = FILE_UTILS.getFileTimestampGranularity();
 private String pattern;
 private TimeComparison when = TimeComparison.EQUAL;
 

http://git-wip-us.apache.org/repos/asf/ant/blob/d9f60aab/src/main/org/apache/tools/ant/types/selectors/MappingSelector.java
--
diff --git a/src/main/org/apache/tools/ant/types/selectors/MappingSelector.java 
b/src/main/org/apache/tools/ant/types/selectors/MappingSelector.java
index 1a27494..9360740 100644
--- a/src/main/org/apache/tools/ant/types/selectors/MappingSelector.java
+++ b/src/main/org/apache/tools/ant/types/selectors/MappingSelector.java
@@ -40,7 +40,7 @@ public abstract class MappingSelector extends BaseSelector {
 protected File targetdir = null;
 protected Mapper mapperElement = null;
 protected FileNameMapper map = null;
-protected int granularity = 0;
+protected int granularity = (int) FILE_UTILS.getFileTimestampGranularity();
 
 // CheckStyle:VisibilityModifier ON
 

[6/6] ant git commit: bring back early exit that was there before Java8 refactoring

[bodewig]

bring back early exit that was there before Java8 refactoring


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/0a3b2c00
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/0a3b2c00
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/0a3b2c00

Branch: refs/heads/master
Commit: 0a3b2c002b018f6eca717e47c17bcacd881fd44c
Parents: 4d0a7d5
Author: Stefan Bodewig 
Authored: Sat Feb 17 17:49:02 2018 +0100
Committer: Stefan Bodewig 
Committed: Sat Feb 17 17:49:02 2018 +0100

--
 src/main/org/apache/tools/ant/util/ScriptRunnerBase.java | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/0a3b2c00/src/main/org/apache/tools/ant/util/ScriptRunnerBase.java
--
diff --git a/src/main/org/apache/tools/ant/util/ScriptRunnerBase.java 
b/src/main/org/apache/tools/ant/util/ScriptRunnerBase.java
index 6cf3962..707d154 100644
--- a/src/main/org/apache/tools/ant/util/ScriptRunnerBase.java
+++ b/src/main/org/apache/tools/ant/util/ScriptRunnerBase.java
@@ -222,6 +222,9 @@ public abstract class ScriptRunnerBase {
  */
 public void setSrc(File file) {
 String filename = file.getPath();
+if (!file.exists()) {
+throw new BuildException("file " + filename + " not found.");
+}
 
 try (InputStream in = Files.newInputStream(file.toPath())) {
 final Charset charset = null == encoding ? Charset.defaultCharset()

[2/6] ant git commit: Merge branch '1.9.x'

[bodewig]

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/e041e2ae
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/e041e2ae
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/e041e2ae

Branch: refs/heads/master
Commit: e041e2aefb35bafde833ea234de37eba8838149d
Parents: c053271 d9f60aa
Author: Stefan Bodewig 
Authored: Sat Feb 17 16:33:21 2018 +0100
Committer: Stefan Bodewig 
Committed: Sat Feb 17 16:33:21 2018 +0100

--

--

[5/6] ant git commit: frequency used to accept a null Collection before Java8 refactoring

[bodewig]

frequency used to accept a null Collection before Java8 refactoring


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/4d0a7d5f
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/4d0a7d5f
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/4d0a7d5f

Branch: refs/heads/master
Commit: 4d0a7d5f26d031f91224cfe988db070891f12a30
Parents: 82f7d9b
Author: Stefan Bodewig 
Authored: Sat Feb 17 17:03:41 2018 +0100
Committer: Stefan Bodewig 
Committed: Sat Feb 17 17:03:41 2018 +0100

--
 src/main/org/apache/tools/ant/util/CollectionUtils.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/4d0a7d5f/src/main/org/apache/tools/ant/util/CollectionUtils.java
--
diff --git a/src/main/org/apache/tools/ant/util/CollectionUtils.java 
b/src/main/org/apache/tools/ant/util/CollectionUtils.java
index 70b2810..2119a9e 100644
--- a/src/main/org/apache/tools/ant/util/CollectionUtils.java
+++ b/src/main/org/apache/tools/ant/util/CollectionUtils.java
@@ -252,7 +252,7 @@ public class CollectionUtils {
  */
 @Deprecated
 public static int frequency(Collection c, Object o) {
-return Collections.frequency(c, o);
+return c == null ? 0 : Collections.frequency(c, o);
 }
 
 private CollectionUtils() {

[2/2] ant git commit: Merge branch '1.9.x'

[bodewig]

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/107d2d1b
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/107d2d1b
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/107d2d1b

Branch: refs/heads/master
Commit: 107d2d1b7bedc8ffefdbc656911faafc32989da5
Parents: 0a3b2c0 3d6f8b0
Author: Stefan Bodewig 
Authored: Sun Feb 18 10:54:50 2018 +0100
Committer: Stefan Bodewig 
Committed: Sun Feb 18 10:54:50 2018 +0100

--
 src/tests/antunit/taskdefs/copy-test.xml | 16 
 1 file changed, 16 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/107d2d1b/src/tests/antunit/taskdefs/copy-test.xml
--

ant git commit: add test for copy example of Bugzilla 62076

[bodewig]

Repository: ant
Updated Branches:
  refs/heads/1.9.x d9f60aab3 -> 3d6f8b028


add test for copy example of Bugzilla 62076

https://bz.apache.org/bugzilla/show_bug.cgi?id=62076


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/3d6f8b02
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/3d6f8b02
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/3d6f8b02

Branch: refs/heads/1.9.x
Commit: 3d6f8b02837341761a4fce0d55656ae4fdd7c9ba
Parents: d9f60aa
Author: Stefan Bodewig 
Authored: Sun Feb 18 10:54:04 2018 +0100
Committer: Stefan Bodewig 
Committed: Sun Feb 18 10:54:04 2018 +0100

--
 src/tests/antunit/taskdefs/copy-test.xml | 16 
 1 file changed, 16 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/3d6f8b02/src/tests/antunit/taskdefs/copy-test.xml
--
diff --git a/src/tests/antunit/taskdefs/copy-test.xml 
b/src/tests/antunit/taskdefs/copy-test.xml
index e73e13a..5bca724 100644
--- a/src/tests/antunit/taskdefs/copy-test.xml
+++ b/src/tests/antunit/taskdefs/copy-test.xml
@@ -468,4 +468,20 @@ public class NullByteStreamResource extends Resource {
 
 
   
+
+
+  https://bz.apache.org/bugzilla/show_bug.cgi?id=62076";>
+
+
+
+
+
+  
+   
+   
+  
+
+
+  
 

[1/2] ant git commit: add test for copy example of Bugzilla 62076

[bodewig]

Repository: ant
Updated Branches:
  refs/heads/master 0a3b2c002 -> 107d2d1b7


add test for copy example of Bugzilla 62076

https://bz.apache.org/bugzilla/show_bug.cgi?id=62076


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/3d6f8b02
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/3d6f8b02
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/3d6f8b02

Branch: refs/heads/master
Commit: 3d6f8b02837341761a4fce0d55656ae4fdd7c9ba
Parents: d9f60aa
Author: Stefan Bodewig 
Authored: Sun Feb 18 10:54:04 2018 +0100
Committer: Stefan Bodewig 
Committed: Sun Feb 18 10:54:04 2018 +0100

--
 src/tests/antunit/taskdefs/copy-test.xml | 16 
 1 file changed, 16 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/3d6f8b02/src/tests/antunit/taskdefs/copy-test.xml
--
diff --git a/src/tests/antunit/taskdefs/copy-test.xml 
b/src/tests/antunit/taskdefs/copy-test.xml
index e73e13a..5bca724 100644
--- a/src/tests/antunit/taskdefs/copy-test.xml
+++ b/src/tests/antunit/taskdefs/copy-test.xml
@@ -468,4 +468,20 @@ public class NullByteStreamResource extends Resource {
 
 
   
+
+
+  https://bz.apache.org/bugzilla/show_bug.cgi?id=62076";>
+
+
+
+
+
+  
+   
+   
+  
+
+
+  
 

ant git commit: I wouldn't call the Saxon change a bug

[bodewig]

Repository: ant
Updated Branches:
  refs/heads/master 107d2d1b7 -> a29e35d62


I wouldn't call the Saxon change a bug


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/a29e35d6
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/a29e35d6
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/a29e35d6

Branch: refs/heads/master
Commit: a29e35d62391a934486c12ff7b0f1be023a9ddc2
Parents: 107d2d1
Author: Stefan Bodewig 
Authored: Sun Feb 18 10:56:03 2018 +0100
Committer: Stefan Bodewig 
Committed: Sun Feb 18 10:56:03 2018 +0100

--
 WHATSNEW | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/a29e35d6/WHATSNEW
--
diff --git a/WHATSNEW b/WHATSNEW
index d2eb5ca..6d15acc 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -19,6 +19,9 @@ Fixed bugs:
  * Fixed NullPointerException when a mappedresource is used in pathconvert
Bugzilla Report 62076
 
+Other changes:
+--
+
  * Allow Saxon to be used for junitreport XSL transformation
Github Pull Request #57
 

ant git commit: typo spotted by Al Le.

[bodewig]

Repository: ant
Updated Branches:
  refs/heads/1.9.x 3d6f8b028 -> 6c976614e


typo spotted by Al Le.


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/6c976614
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/6c976614
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/6c976614

Branch: refs/heads/1.9.x
Commit: 6c976614ee9fa9e6ddd05d71a595d8866069dcbd
Parents: 3d6f8b0
Author: Stefan Bodewig 
Authored: Mon Feb 19 13:23:07 2018 +0100
Committer: Stefan Bodewig 
Committed: Mon Feb 19 13:23:07 2018 +0100

--
 manual/develop.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/6c976614/manual/develop.html
--
diff --git a/manual/develop.html b/manual/develop.html
index 31add6a..aa4cfd7 100644
--- a/manual/develop.html
+++ b/manual/develop.html
@@ -108,7 +108,7 @@ good convention, though.
 instantiated and added to this task via its addXXX()
 methods, at run time.  Child elements corresponding
 to addConfiguredXXX() are created at this point but
-the actual addCondifgired method is not called.
+the actual addConfigured method is not called.
 
   All attributes of this task get set via their corresponding
 setXXX methods, at runtime.

[2/2] ant git commit: Merge branch '1.9.x'

[bodewig]

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/52a0ec8e
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/52a0ec8e
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/52a0ec8e

Branch: refs/heads/master
Commit: 52a0ec8ede947df7a1c0bd69b718fe3476b526ec
Parents: a29e35d 6c97661
Author: Stefan Bodewig 
Authored: Mon Feb 19 13:23:41 2018 +0100
Committer: Stefan Bodewig 
Committed: Mon Feb 19 13:23:41 2018 +0100

--
 manual/develop.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/52a0ec8e/manual/develop.html
--

[1/2] ant git commit: typo spotted by Al Le.

[bodewig]

Repository: ant
Updated Branches:
  refs/heads/master a29e35d62 -> 52a0ec8ed


typo spotted by Al Le.


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/6c976614
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/6c976614
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/6c976614

Branch: refs/heads/master
Commit: 6c976614ee9fa9e6ddd05d71a595d8866069dcbd
Parents: 3d6f8b0
Author: Stefan Bodewig 
Authored: Mon Feb 19 13:23:07 2018 +0100
Committer: Stefan Bodewig 
Committed: Mon Feb 19 13:23:07 2018 +0100

--
 manual/develop.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/6c976614/manual/develop.html
--
diff --git a/manual/develop.html b/manual/develop.html
index 31add6a..aa4cfd7 100644
--- a/manual/develop.html
+++ b/manual/develop.html
@@ -108,7 +108,7 @@ good convention, though.
 instantiated and added to this task via its addXXX()
 methods, at run time.  Child elements corresponding
 to addConfiguredXXX() are created at this point but
-the actual addCondifgired method is not called.
+the actual addConfigured method is not called.
 
   All attributes of this task get set via their corresponding
 setXXX methods, at runtime.

svn commit: r707360 - /ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/CopyPath.java

[bodewig]

Author: bodewig
Date: Thu Oct 23 05:33:14 2008
New Revision: 707360

URL: http://svn.apache.org/viewvc?rev=707360&view=rev
Log:
don't use copypath

Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/CopyPath.java

Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/CopyPath.java
URL: 
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/CopyPath.java?rev=707360&r1=707359&r2=707360&view=diff
==
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/CopyPath.java 
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/CopyPath.java Thu Oct 
23 05:33:14 2008
@@ -32,9 +32,12 @@
 /**
  * Copy the contents of a path to a destination, using the mapper of choice
  *
- * @since Ant 1.7
+ * @since Ant 1.7.0
  *
  * @ant.task category="filesystem"
+ * @deprecated this task should have never been released and was
+ * obsoleted by ResourceCollection support in Copy available since Ant
+ * 1.7.0.  Don't use it.
  */
 
 public class CopyPath extends Task {
@@ -162,6 +165,11 @@
  * if something goes wrong with the build.
  */
 public void execute() throws BuildException {
+log("This task should have never been released and was"
++ " obsoleted by ResourceCollection support in  available"
++ " since Ant 1.7.0.  Don't use it.",
+Project.MSG_ERR);
+
 validateAttributes();
 String[] sourceFiles = path.list();
 if (sourceFiles.length == 0) {

svn commit: r707368 - in /ant/core/trunk: ./ docs/manual/ docs/manual/CoreTasks/ src/main/org/apache/tools/ant/listener/ src/main/org/apache/tools/ant/taskdefs/email/

[bodewig]

Author: bodewig
Date: Thu Oct 23 06:13:36 2008
New Revision: 707368

URL: http://svn.apache.org/viewvc?rev=707368&view=rev
Log:
Add STARTTLS support to MimeMailer and use it in MailLogger and .  Part 
of PR 46063.

Modified:
ant/core/trunk/CONTRIBUTORS
ant/core/trunk/WHATSNEW
ant/core/trunk/contributors.xml
ant/core/trunk/docs/manual/CoreTasks/mail.html
ant/core/trunk/docs/manual/listeners.html
ant/core/trunk/src/main/org/apache/tools/ant/listener/MailLogger.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/email/Mailer.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java

Modified: ant/core/trunk/CONTRIBUTORS
URL: 
http://svn.apache.org/viewvc/ant/core/trunk/CONTRIBUTORS?rev=707368&r1=707367&r2=707368&view=diff
==
Binary files - no diff available.

Modified: ant/core/trunk/WHATSNEW
URL: 
http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=707368&r1=707367&r2=707368&view=diff
==
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Thu Oct 23 06:13:36 2008
@@ -482,6 +482,10 @@
.
Bugzilla Report 27419.
 
+ * MailLogger and  can now optionally enable support for
+   STARTTLS.
+   Bugzilla Report 46063.
+
 Changes from Ant 1.7.0 TO Ant 1.7.1
 =
 

Modified: ant/core/trunk/contributors.xml
URL: 
http://svn.apache.org/viewvc/ant/core/trunk/contributors.xml?rev=707368&r1=707367&r2=707368&view=diff
==
--- ant/core/trunk/contributors.xml (original)
+++ ant/core/trunk/contributors.xml Thu Oct 23 06:13:36 2008
@@ -221,6 +221,10 @@
   
   
 Craig
+Richardson
+  
+  
+Craig
 Sandvik
   
   

Modified: ant/core/trunk/docs/manual/CoreTasks/mail.html
URL: 
http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/CoreTasks/mail.html?rev=707368&r1=707367&r2=707368&view=diff
==
--- ant/core/trunk/docs/manual/CoreTasks/mail.html (original)
+++ ant/core/trunk/docs/manual/CoreTasks/mail.html Thu Oct 23 06:13:36 2008
@@ -179,6 +179,14 @@
   fail if neither is reachable.  Since Ant 1.8.0.
 No, default is false
   
+  
+enableStartTLS
+"true", "on" or "yes" accepted here
+  whether the STARTTLS command used to switch to an encrypted
+  connection for authentication should be supported.  Requires
+  JavaMail.  Since Ant 1.8.0
+No
+  
 
 
 Note regarding the attributes containing email addresses

Modified: ant/core/trunk/docs/manual/listeners.html
URL: 
http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/listeners.html?rev=707368&r1=707367&r2=707368&view=diff
==
--- ant/core/trunk/docs/manual/listeners.html (original)
+++ ant/core/trunk/docs/manual/listeners.html Thu Oct 23 06:13:36 2008
@@ -246,6 +246,12 @@
 No
   
   
+MailLogger.starttls.enable
+on or true if STARTTLS should be supported
+(requires JavaMail).  Since Ant 1.8.0
+No, default is false
+  
+  
 MailLogger.properties.file 
 Filename of properties file that will override other 
values.
 No

Modified: ant/core/trunk/src/main/org/apache/tools/ant/listener/MailLogger.java
URL: 
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/listener/MailLogger.java?rev=707368&r1=707367&r2=707368&view=diff
==
--- ant/core/trunk/src/main/org/apache/tools/ant/listener/MailLogger.java 
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/listener/MailLogger.java Thu 
Oct 23 06:13:36 2008
@@ -73,6 +73,8 @@
  *mail body for a successful build, default is to send the logfile
  * MailLogger.mimeType [default: text/plain] - MIME-Type of email
  * MailLogger.charset [no default] - character set of email
+ * Maillogger.starttls.enable [default: false] - on or true if
+ *STARTTLS should be supported (requires JavaMail)
  * MailLogger.properties.file [no default] - Filename of
  *properties file that will override other values.
  *  
@@ -142,6 +144,8 @@
 .password(getValue(properties, "password", ""))
 .ssl(Project.toBoolean(getValue(properties,
 "ssl", "off")))
+.starttls(Project.toBoolean(getValue(properties,
+ "starttls.enable", 
"off")))
 .from(getValue(properties, &

svn commit: r707398 - in /ant/core/trunk: WHATSNEW src/main/org/apache/tools/ant/IntrospectionHelper.java src/main/org/apache/tools/ant/UnknownElement.java src/tests/antunit/core/nested-elements-test.

[bodewig]

Author: bodewig
Date: Thu Oct 23 08:47:35 2008
New Revision: 707398

URL: http://svn.apache.org/viewvc?rev=707398&view=rev
Log:
make tasks with add(Foo) method play nice with TaskContainer.  PR 41647.

Added:
ant/core/trunk/src/tests/antunit/core/nested-elements-test.xml   (with 
props)
Modified:
ant/core/trunk/WHATSNEW
ant/core/trunk/src/main/org/apache/tools/ant/IntrospectionHelper.java
ant/core/trunk/src/main/org/apache/tools/ant/UnknownElement.java

Modified: ant/core/trunk/WHATSNEW
URL: 
http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=707398&r1=707397&r2=707398&view=diff
==
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Thu Oct 23 08:47:35 2008
@@ -266,6 +266,10 @@
multiple modules have been specified.
Bugzilla Report 35301.
 
+ * Tasks with a "public void add(SomeType)" method failed to work as
+   TaskContainers at the same time.
+   Bugzilla Report 41647.
+
 Other changes:
 --
 

Modified: ant/core/trunk/src/main/org/apache/tools/ant/IntrospectionHelper.java
URL: 
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/IntrospectionHelper.java?rev=707398&r1=707397&r2=707398&view=diff
==
--- ant/core/trunk/src/main/org/apache/tools/ant/IntrospectionHelper.java 
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/IntrospectionHelper.java Thu 
Oct 23 08:47:35 2008
@@ -518,22 +518,15 @@
 if (nc == null) {
 nc = createAddTypeCreator(project, parent, elementName);
 }
-if (nc == null && parent instanceof DynamicElementNS) {
-DynamicElementNS dc = (DynamicElementNS) parent;
+if (nc == null &&
+(parent instanceof DynamicElementNS
+ || parent instanceof DynamicElement)
+) {
 String qName = child == null ? name : child.getQName();
-final Object nestedElement = dc.createDynamicElement(
-child == null ? "" : child.getNamespace(), name, qName);
-if (nestedElement != null) {
-nc = new NestedCreator(null) {
-Object create(Project project, Object parent, Object 
ignore) {
-return nestedElement;
-}
-};
-}
-}
-if (nc == null && parent instanceof DynamicElement) {
-DynamicElement dc = (DynamicElement) parent;
-final Object nestedElement = 
dc.createDynamicElement(name.toLowerCase(Locale.US));
+final Object nestedElement =
+createDynamicElement(parent,
+ child == null ? "" : child.getNamespace(),
+ name, qName);
 if (nestedElement != null) {
 nc = new NestedCreator(null) {
 Object create(Project project, Object parent, Object 
ignore) {
@@ -549,6 +542,27 @@
 }
 
 /**
+ * Invokes the "correct" createDynamicElement method on parent in
+ * order to obtain a child element by name.
+ *
+ * @since Ant 1.8.0.
+ */
+private Object createDynamicElement(Object parent, String ns,
+String localName, String qName) {
+Object nestedElement = null;
+if (parent instanceof DynamicElementNS) {
+DynamicElementNS dc = (DynamicElementNS) parent;
+nestedElement = dc.createDynamicElement(ns, localName, qName);
+}
+if (nestedElement == null && parent instanceof DynamicElement) {
+DynamicElement dc = (DynamicElement) parent;
+nestedElement =
+dc.createDynamicElement(localName.toLowerCase(Locale.US));
+}
+return nestedElement;
+}
+
+/**
  * Creates a named nested element. Depending on the results of the
  * initial introspection, either a method in the given parent instance
  * or a simple no-arg constructor is used to create an instance of the
@@ -654,6 +668,12 @@
  * Indicate if this element supports a nested element of the
  * given name.
  *
+ * Note that this method will always return true if the
+ * introspected class is [EMAIL PROTECTED] #isDynamic dynamic} or contains 
a
+ * method named "add" with void return type and a single argument.
+ * To ge a more thorough answer, use the four-arg version of this
+ * method instead.
+ *
  * @param parentUri   the uri of the parent
  * @param elementName the name of the nested element being checked
  *
@@ -667,6 +687,48 @@
 }
 
 /**
+ * Indicate if this element supports a nested element of the
+ * given name.
+ *
+ * @param parentUri   the ur

svn commit: r708204 - in /ant/core/trunk: WHATSNEW src/main/org/apache/tools/ant/IntrospectionHelper.java src/main/org/apache/tools/ant/UnknownElement.java src/tests/antunit/core/nested-elements-test.

[bodewig]

Author: bodewig
Date: Mon Oct 27 07:49:00 2008
New Revision: 708204

URL: http://svn.apache.org/viewvc?rev=708204&view=rev
Log:
allow TaskContainer and DynamicElement(NS) to coexist.  Hijacked PR 41647 for 
this.

Modified:
ant/core/trunk/WHATSNEW
ant/core/trunk/src/main/org/apache/tools/ant/IntrospectionHelper.java
ant/core/trunk/src/main/org/apache/tools/ant/UnknownElement.java
ant/core/trunk/src/tests/antunit/core/nested-elements-test.xml

Modified: ant/core/trunk/WHATSNEW
URL: 
http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=708204&r1=708203&r2=708204&view=diff
==
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Mon Oct 27 07:49:00 2008
@@ -270,6 +270,10 @@
TaskContainers at the same time.
Bugzilla Report 41647.
 
+ * Tasks that implementes DynamicElemen or DynamicElementNS failed to
+   work as TaskContainers at the same time.
+   Bugzilla Report 41647.
+
 Other changes:
 --
 

Modified: ant/core/trunk/src/main/org/apache/tools/ant/IntrospectionHelper.java
URL: 
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/IntrospectionHelper.java?rev=708204&r1=708203&r2=708204&view=diff
==
--- ant/core/trunk/src/main/org/apache/tools/ant/IntrospectionHelper.java 
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/IntrospectionHelper.java Mon 
Oct 27 07:49:00 2008
@@ -475,6 +475,21 @@
 }
 
 /**
+ * part of the error message created by [EMAIL PROTECTED] 
#throwNotSupported
+ * throwNotSupported}.
+ * @since Ant 1.8.0
+ */
+protected static final String NOT_SUPPORTED_CHILD_PREFIX =
+" doesn't support the nested \"";
+
+/**
+ * part of the error message created by [EMAIL PROTECTED] 
#throwNotSupported
+ * throwNotSupported}.
+ * @since Ant 1.8.0
+ */
+protected static final String NOT_SUPPORTED_CHILD_POSTFIX = "\" element.";
+
+/**
  * Utility method to throw a NotSupported exception
  *
  * @param project the Project instance.
@@ -483,7 +498,8 @@
  */
 public void throwNotSupported(Project project, Object parent, String 
elementName) {
 String msg = project.getElementName(parent)
-+ " doesn't support the nested \"" + elementName + "\" 
element.";
++ NOT_SUPPORTED_CHILD_PREFIX + elementName
++ NOT_SUPPORTED_CHILD_POSTFIX;
 throw new UnsupportedElementException(msg, elementName);
 }
 
@@ -690,42 +706,26 @@
  * Indicate if this element supports a nested element of the
  * given name.
  *
+ * Note that this method will always return true if the
+ * introspected class is [EMAIL PROTECTED] #isDynamic dynamic}, so be
+ * prepared to catch an exception about unsupported children when
+ * calling [EMAIL PROTECTED] #getElementCreator getElementCreator}.
+ *
  * @param parentUri   the uri of the parent
  * @param elementName the name of the nested element being checked
  * @param project currently executing project instance
- * @param parent  the parent element (an instance of the introspected 
class)
- * @param childQName QName of the child element, may be null
+ * @param parent the parent element
  *
  * @return true if the given nested element is supported
  * @since Ant 1.8.0.
  */
 public boolean supportsNestedElement(String parentUri, String elementName,
- Project project, Object parent,
- String childQName) {
+ Project project, Object parent) {
 if (addTypeMethods.size() > 0
 && createAddTypeCreator(project, parent, elementName) != null) {
 return true;
 }
-if (isDynamic()) {
-/*
-  breaks several tests, in particular EchoXML because it
-  creates additional empty child elements in XMLFragment
-
-String localName =
-ProjectHelper.extractNameFromComponentName(elementName);
-String uri = 
ProjectHelper.extractUriFromComponentName(elementName);
-if (uri.equals(ProjectHelper.ANT_CORE_URI)) {
-uri = "";
-}
-if (createDynamicElement(parent, uri, localName,
- childQName == null ? localName : 
childQName)
-!= null) {
-return true;
-}
-*/
-return true;
-}
-return supportsReflectElement(parentUri, elementName);
+return isDynamic() || supportsReflectElement(parentUri, elementName);
 }
 
 /**

Modified: ant/core/trunk/src/main/o

svn commit: r708217 - in /ant/core/trunk: WHATSNEW src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java

[bodewig]

Author: bodewig
Date: Mon Oct 27 08:16:14 2008
New Revision: 708217

URL: http://svn.apache.org/viewvc?rev=708217&view=rev
Log:
Make  work for SSL + authentication with javamail 1.4.1.  PR 46063.  
Submitted by Craig Richardson

Modified:
ant/core/trunk/WHATSNEW
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java

Modified: ant/core/trunk/WHATSNEW
URL: 
http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=708217&r1=708216&r2=708217&view=diff
==
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Mon Oct 27 08:16:14 2008
@@ -274,6 +274,10 @@
work as TaskContainers at the same time.
Bugzilla Report 41647.
 
+ * combining SSL and authentication in  and MailLogger failed in
+   some setups.
+   Bugzilla Report 46063.
+
 Other changes:
 --
 

Modified: 
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java
URL: 
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java?rev=708217&r1=708216&r2=708217&view=diff
==
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java 
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java 
Mon Oct 27 08:16:14 2008
@@ -247,7 +247,10 @@
 }
 msg.setContent(attachments);
 try {
-Transport.send(msg);
+// Send the message using SMTP, or SMTPS if the host uses SSL
+Transport transport = sesh.getTransport(SSL ? "smtps" : 
"smtp");
+transport.connect(host, user, password);
+transport.sendMessage(msg, msg.getAllRecipients());
 } catch (SendFailedException sfe) {
 if (!shouldIgnoreInvalidRecipients()) {
 throw new BuildException(GENERIC_ERROR, sfe);

svn commit: r708571 - in /ant/core/trunk: docs/faq.html xdocs/faq.xml

[bodewig]

Author: bodewig
Date: Tue Oct 28 06:39:32 2008
New Revision: 708571

URL: http://svn.apache.org/viewvc?rev=708571&view=rev
Log:
turn PR 45499 into a FAQ since there is a workaround.

Modified:
ant/core/trunk/docs/faq.html
ant/core/trunk/xdocs/faq.xml

Modified: ant/core/trunk/docs/faq.html
URL: 
http://svn.apache.org/viewvc/ant/core/trunk/docs/faq.html?rev=708571&r1=708570&r2=708571&view=diff
==
--- ant/core/trunk/docs/faq.html (original)
+++ ant/core/trunk/docs/faq.html Tue Oct 28 06:39:32 2008
@@ -453,6 +453,12 @@
 worked fine with JDK 1.4.
   
   
+
+  
+Ant runs into an infinite loop/throws an OutOufMemoryError
+when I compile my project under Mac OS X.
+  
+  
 
 
   Answers
@@ -2204,6 +2210,50 @@
 to use this task with JDK 1.5 in older versions of Ant.
 Starting with Ant 1.6.2 
<junitreport>
 supports JDK 1.5.
+
+  
+  
+Ant runs into an infinite loop/throws an OutOufMemoryError
+when I compile my project under Mac OS X.
+  
+
+  Apple's Java VMs reside
+in 
/System/Library/Frameworks/JavaVM.framework/Versions/X.Y.Z
+  and JAVA_HOME will usually be something
+like 
/System/Library/Frameworks/JavaVM.framework/Versions/X.Y.Z/Home.
+Inside this home directory there is a symbolic link
+named shared_bundle that links three levels up,
+i.e. to /System/Library/Frameworks/JavaVM.framework.
+If your build file contains a fileset 
like
+
+<fileset dir="${java.home}" includes="**/*.jar"/>
+
+Ant is going to follow the 
shared_bundle
+symlink and ends up recursing into all your installed VMs.
+Even worse, it will
+enter 
/System/Library/Frameworks/JavaVM.framework/Versions/X.Y.Z/Home
+  and will once again follow the same symlink.
+Ant versions after Ant 1.7.1 will detect the 
infinite loop
+they are in, but the resulting fileset may still be too big to
+deal with, in particular if you have many different VM
+versions installed.  The problem is amplified by the fact that
+each installed version has a shared_bundle
+symlink in it.
+One solution is to not allow the fileset to follow 
symbolic
+  links at all, like in
+
+<fileset dir="${java.home}" includes="**/*.jar" 
followsymlinks="false"/>
+
+another one excludes the shared_bundle
+directories:
+
+<fileset dir="${java.home}" includes="**/*.jar" 
excludes="**/shared_bundle/**"/>
+
+For Ant 1.7.1 and earlier
+excluding shared_bundle may not be enough since
+there is another symlink bundle that points to
+the Home directory and will cause infite
+recursions as well.
 
   
 

Modified: ant/core/trunk/xdocs/faq.xml
URL: 
http://svn.apache.org/viewvc/ant/core/trunk/xdocs/faq.xml?rev=708571&r1=708570&r2=708571&view=diff
==
--- ant/core/trunk/xdocs/faq.xml (original)
+++ ant/core/trunk/xdocs/faq.xml Tue Oct 28 06:39:32 2008
@@ -1950,6 +1950,58 @@
 
   
 
+
+
+  
+Ant runs into an infinite loop/throws an OutOufMemoryError
+when I compile my project under Mac OS X.
+  
+
+  
+Apple's Java VMs reside
+in 
/System/Library/Frameworks/JavaVM.framework/Versions/X.Y.Z
+  and JAVA_HOME will usually be something
+like 
/System/Library/Frameworks/JavaVM.framework/Versions/X.Y.Z/Home.
+
+Inside this home directory there is a symbolic link
+named shared_bundle that links three levels up,
+i.e. to /System/Library/Frameworks/JavaVM.framework.
+
+If your build file contains a fileset like
+
+Ant is going to follow the shared_bundle
+symlink and ends up recursing into all your installed VMs.
+Even worse, it will
+enter 
/System/Library/Frameworks/JavaVM.framework/Versions/X.Y.Z/Home
+  and will once again follow the same symlink.
+
+Ant versions after Ant 1.7.1 will detect the infinite loop
+they are in, but the resulting fileset may still be too big to
+deal with, in particular if you have many different VM
+versions installed.  The problem is amplified by the fact that
+each installed version has a shared_bundle
+symlink in it.
+
+One solution is to not allow the fileset to follow symbolic

svn commit: r708584 - in /ant/core/trunk: WHATSNEW src/main/org/apache/tools/ant/Main.java

[bodewig]

Author: bodewig
Date: Tue Oct 28 07:32:23 2008
New Revision: 708584

URL: http://svn.apache.org/viewvc?rev=708584&view=rev
Log:
At least try to log the real reason of an error.  PR 26086

Modified:
ant/core/trunk/WHATSNEW
ant/core/trunk/src/main/org/apache/tools/ant/Main.java

Modified: ant/core/trunk/WHATSNEW
URL: 
http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=708584&r1=708583&r2=708584&view=diff
==
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Tue Oct 28 07:32:23 2008
@@ -278,6 +278,10 @@
some setups.
Bugzilla Report 46063.
 
+ * if an error occurs while logging the buildFinished event, the
+   original error is now logged to System.err.
+   Bugzilla Report 25086.
+
 Other changes:
 --
 

Modified: ant/core/trunk/src/main/org/apache/tools/ant/Main.java
URL: 
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/Main.java?rev=708584&r1=708583&r2=708584&view=diff
==
--- ant/core/trunk/src/main/org/apache/tools/ant/Main.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/Main.java Tue Oct 28 07:32:23 
2008
@@ -792,7 +792,21 @@
 throw e;
 } finally {
 if (!projectHelp) {
-project.fireBuildFinished(error);
+try {
+project.fireBuildFinished(error);
+} catch (Throwable t) {
+// yes, I know it is bad style to catch Throwable,
+// but if we don't, we lose valuable information
+System.err.println("Caught an exception while logging the"
+   + " end of the build.  Exception was:");
+t.printStackTrace();
+if (error != null) {
+System.err.println("There has been an error prior to"
+   + " that:");
+error.printStackTrace();
+}
+throw new BuildException(t);
+}
 } else if (error != null) {
 project.log(error.toString(), Project.MSG_ERR);
 }

svn commit: r708608 - /ant/core/trunk/src/tests/antunit/taskdefs/zip-test.xml

[bodewig]

Author: bodewig
Date: Tue Oct 28 09:59:43 2008
New Revision: 708608

URL: http://svn.apache.org/viewvc?rev=708608&view=rev
Log:
test for PR 41464

Added:
ant/core/trunk/src/tests/antunit/taskdefs/zip-test.xml   (with props)

Added: ant/core/trunk/src/tests/antunit/taskdefs/zip-test.xml
URL: 
http://svn.apache.org/viewvc/ant/core/trunk/src/tests/antunit/taskdefs/zip-test.xml?rev=708608&view=auto
==
--- ant/core/trunk/src/tests/antunit/taskdefs/zip-test.xml (added)
+++ ant/core/trunk/src/tests/antunit/taskdefs/zip-test.xml Tue Oct 28 09:59:43 
2008
@@ -0,0 +1,30 @@
+
+
+
+  
+
+  
+
+
+
+  
+
+
+
+  
+

Propchange: ant/core/trunk/src/tests/antunit/taskdefs/zip-test.xml
--
svn:eol-style = native