You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by ja...@apache.org on 2018/02/10 04:28:39 UTC

[1/2] ant git commit: Change the copy-test#testResourceWithoutName to no longer expect a BuildException when the resource's name is null.

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


Change the copy-test#testResourceWithoutName to no longer expect a BuildException when the resource's name is null.

Detailed dev list discussion https://www.mail-archive.com/dev@ant.apache.org/msg46634.html


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

Branch: refs/heads/master
Commit: fc1ad4424dd42a5aad1a6f3013f45ab8bdb0f2f0
Parents: 21b8700
Author: Jaikiran Pai <ja...@apache.org>
Authored: Sat Feb 10 09:16:35 2018 +0530
Committer: Jaikiran Pai <ja...@apache.org>
Committed: Sat Feb 10 09:16:54 2018 +0530

----------------------------------------------------------------------
 WHATSNEW                                 |  9 +++++++++
 src/tests/antunit/taskdefs/copy-test.xml | 12 ++++++------
 2 files changed, 15 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ant/blob/fc1ad442/WHATSNEW
----------------------------------------------------------------------
diff --git a/WHATSNEW b/WHATSNEW
index 2d4b6f1..8c2af62 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -1,6 +1,15 @@
 Changes from Ant 1.9.10 TO Ant 1.9.11
 =====================================
 
+Changes that could break older environments:
+-------------------------------------------
+
+ * Previous versions of Ant's copy task would throw a BuildException
+   if the "name" of the resource to copy was null. Starting
+   this version, the copy task instead silently skips such resources
+   and no longer throws an exception.
+   ant-dev list https://www.mail-archive.com/dev@ant.apache.org/msg46634.html
+
 Fixed bugs:
 -----------
 

http://git-wip-us.apache.org/repos/asf/ant/blob/fc1ad442/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 51c6277..e73e13a 100644
--- a/src/tests/antunit/taskdefs/copy-test.xml
+++ b/src/tests/antunit/taskdefs/copy-test.xml
@@ -83,12 +83,12 @@ public class NullByteStreamResource extends Resource {
   </target>
 
   <target name="testResourceWithoutName"
-          depends="-setupNullByteStreamResource">
-    <au:expectfailure>
-      <copy todir="${output}">
-        <nullstream/>
-      </copy>
-    </au:expectfailure>
+          depends="-setupNullByteStreamResource" description="Tests that a
+          copy operation, of a resource without a name, doesn't run into (NPE)
+           exceptions. The resource itself will however be silently ignored">
+    <copy todir="${output}">
+      <nullstream/>
+    </copy>
   </target>
 
   <target name="testResourceWithoutNameWithMergeMapper"


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

Posted by ja...@apache.org.
Merge 1.9.x branch into master


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

Branch: refs/heads/master
Commit: f690f9908ee5702928f528d5dca4e016198b83f2
Parents: 7ade15c fc1ad44
Author: Jaikiran Pai <ja...@apache.org>
Authored: Sat Feb 10 09:55:47 2018 +0530
Committer: Jaikiran Pai <ja...@apache.org>
Committed: Sat Feb 10 09:55:47 2018 +0530

----------------------------------------------------------------------
 WHATSNEW                                 |  9 +++++++++
 src/tests/antunit/taskdefs/copy-test.xml | 12 ++++++------
 2 files changed, 15 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ant/blob/f690f990/WHATSNEW
----------------------------------------------------------------------
diff --cc WHATSNEW
index da5b9d4,8c2af62..d2eb5ca
--- a/WHATSNEW
+++ b/WHATSNEW
@@@ -1,6 -1,15 +1,15 @@@
 -Changes from Ant 1.9.10 TO Ant 1.9.11
 +Changes from Ant 1.10.2 TO Ant 1.10.3
  =====================================
  
+ Changes that could break older environments:
+ -------------------------------------------
+ 
+  * Previous versions of Ant's copy task would throw a BuildException
+    if the "name" of the resource to copy was null. Starting
+    this version, the copy task instead silently skips such resources
+    and no longer throws an exception.
+    ant-dev list https://www.mail-archive.com/dev@ant.apache.org/msg46634.html
+ 
  Fixed bugs:
  -----------
  

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