[maven-scm] 15/34: Removed 0002-fix-perforce-tests.patch (fixed upstream)

[Emmanuel Bourg]

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

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

commit 4e98dece27d43b9f770fc1f734d8e880d9bf7444
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Jul 26 12:59:25 2017 +0200

    Removed 0002-fix-perforce-tests.patch (fixed upstream)
---
 debian/changelog                             |  3 ++-
 debian/patches/0002-fix-perforce-tests.patch | 20 --------------------
 debian/patches/series                        |  1 -
 3 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e276d3f..8f54c4c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
-maven-scm (1.8.1-1) UNRELEASED; urgency=medium
+maven-scm (1.9-1) UNRELEASED; urgency=medium
 
   * Team upload.
   * New upstream release
+    - Removed 0002-fix-perforce-tests.patch (fixed upstream)
     - Build depend on junit4 instead of junit
     - New build dependency on libmockito-java
     - Build depend on libplexus-component-metadata-java
diff --git a/debian/patches/0002-fix-perforce-tests.patch b/debian/patches/0002-fix-perforce-tests.patch
deleted file mode 100644
index a4a92c9..0000000
--- a/debian/patches/0002-fix-perforce-tests.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Fixes the Perfoce tests to run with the latest version of JUnit (backported from maven-scm 1.9)
-Author: Emmanuel Bourg <ebourg at apache.org>
-Forwarded: yes
---- a/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/changelog/PerforceChangeLogCommandTest.java
-+++ b/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/changelog/PerforceChangeLogCommandTest.java
-@@ -43,6 +43,14 @@
- 
-     private static final String cmdPrefix = "p4 -d " + workingDirectory.getAbsolutePath();
- 
-+    @Override
-+    protected void tearDown()
-+        throws Exception
-+    {
-+        // Some tests don't expect this property, so when tests are executed in random order these might fail
-+        System.clearProperty( PerforceScmProvider.DEFAULT_CLIENTSPEC_PROPERTY );
-+    }
-+
-     public void testGetCommandLine()
-         throws Exception
-     {
diff --git a/debian/patches/series b/debian/patches/series
index c5616de..c2bd04b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-0002-fix-perforce-tests.patch
 0003-junit-dependency.patch

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