[ant] 03/17: Removed 0008-junit4-replace-assumeFalse.patch

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository ant.

commit bad89c72a424c750d36cb763f5d1958fa92ee05c
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Jan 12 09:51:02 2017 +0100

    Removed 0008-junit4-replace-assumeFalse.patch
---
 debian/changelog                                   |  1 +
 .../patches/0008-junit4-replace-assumeFalse.patch  | 25 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 98e3dc3..15147a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ ant (1.9.8-2) UNRELEASED; urgency=medium
   * Team upload.
   * Removed activation.jar and inetlib.jar from the build classpath
   * Fixed a typo in the man pages
+  * Removed 0008-junit4-replace-assumeFalse.patch
 
  -- Emmanuel Bourg <ebourg at apache.org>  Wed, 11 Jan 2017 17:46:06 +0100
 
diff --git a/debian/patches/0008-junit4-replace-assumeFalse.patch b/debian/patches/0008-junit4-replace-assumeFalse.patch
deleted file mode 100644
index dd2b085..0000000
--- a/debian/patches/0008-junit4-replace-assumeFalse.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Replaces Assume.assumeFalse() introduced in JUnit 4.11 with assumeTrue()
- to facilitate the backporting to the stable distribution where only JUnit 4.10
- is available.
-Author: Emmanuel Bourg <ebourg at apache.org>
-Forwarded: not-needed
---- a/src/tests/junit/org/example/junit/JUnit4Skippable.java
-+++ b/src/tests/junit/org/example/junit/JUnit4Skippable.java
-@@ -40,7 +40,7 @@
- 
-     @Test
-     public void implicitlyIgnoreTest() {
--        Assume.assumeFalse("This test will be ignored", true);
-+        Assume.assumeTrue(false); // This test will be ignored 
-         fail("I told you, this test should have been ignored!");
-     }
- 
-@@ -52,7 +52,7 @@
- 
-     @Test
-     public void implicitlyIgnoreTestNoMessage() {
--        Assume.assumeFalse(true);
-+        Assume.assumeTrue(false);
-         fail("I told you, this test should have been ignored!");
-     }
- 
diff --git a/debian/patches/series b/debian/patches/series
index 3247671..3c4d544 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,6 @@
 0002-do-not-build-test-jars.patch
 0006-fix-ANT_HOME-path.patch
 0007-use-build.classpath.patch
-0008-junit4-replace-assumeFalse.patch
 0009-reproducible-timestamp-task.patch
 0010-reproducible-javadoc-task.patch
 0011-reproducible-propertyfile-task.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/ant.git