[maven-plugin-testing] 24/28: Refreshed the patches

[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-plugin-testing.

commit 17cbe8458ed926ce2b1519debf0e4be85061ec97
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Jul 18 01:21:29 2017 +0200

    Refreshed the patches
---
 debian/changelog                                   |  3 +-
 debian/patches/0001-easymock-upgrade.patch         | 33 +++++++++++-----------
 .../0002-fix-dependency-on-maven-test-tools.patch  | 22 ---------------
 debian/patches/series                              |  1 -
 4 files changed, 18 insertions(+), 41 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7949bd0..a73d6f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
-maven-plugin-testing (2.0-1) UNRELEASED; urgency=medium
+maven-plugin-testing (2.1-1) UNRELEASED; urgency=medium
 
   * Team upload.
   * New upstream release
+    - Refreshed the patches
     - Build depend on junit4 instead of junit
   * Build with the DH sequencer instead of CDBS
   * Moved the package to Git
diff --git a/debian/patches/0001-easymock-upgrade.patch b/debian/patches/0001-easymock-upgrade.patch
index b93e284..e0266aa 100644
--- a/debian/patches/0001-easymock-upgrade.patch
+++ b/debian/patches/0001-easymock-upgrade.patch
@@ -3,8 +3,8 @@ Author: Emmanuel Bourg <ebourg at apache.org>
 Bug: https://github.com/apache/maven-plugin-testing/pull/2
 --- a/maven-test-tools/src/main/java/org/apache/maven/shared/tools/easymock/MockManager.java
 +++ b/maven-test-tools/src/main/java/org/apache/maven/shared/tools/easymock/MockManager.java
-@@ -23,13 +23,13 @@
- import java.util.Iterator;
+@@ -22,7 +22,7 @@
+ import java.util.ArrayList;
  import java.util.List;
  
 -import org.easymock.MockControl;
@@ -12,14 +12,13 @@ Bug: https://github.com/apache/maven-plugin-testing/pull/2
  
  /**
   * Manager of MockControl
-  *
-  * @version $Id: MockManager.java 677117 2008-07-16 00:29:56Z vsiveton $
-- * @see MockControl
-+ * @see IMocksControl
+@@ -32,12 +32,12 @@
   */
  public class MockManager
  {
-@@ -38,7 +38,7 @@
+-    private List<MockControl> mockControls = new ArrayList<MockControl>();
++    private List<IMocksControl> mockControls = new ArrayList<IMocksControl>();
+ 
      /**
       * @param control to be add to the manager
       */
@@ -28,21 +27,21 @@ Bug: https://github.com/apache/maven-plugin-testing/pull/2
      {
          mockControls.add( control );
      }
-@@ -58,7 +58,7 @@
+@@ -55,7 +55,7 @@
+      */
+     public void replayAll()
      {
-         for ( Iterator it = mockControls.iterator(); it.hasNext(); )
+-        for ( MockControl control : mockControls )
++        for ( IMocksControl control : mockControls )
          {
--            MockControl control = (MockControl) it.next();
-+            IMocksControl control = (IMocksControl) it.next();
- 
              control.replay();
          }
-@@ -71,7 +71,7 @@
+@@ -66,7 +66,7 @@
+      */
+     public void verifyAll()
      {
-         for ( Iterator it = mockControls.iterator(); it.hasNext(); )
+-        for ( MockControl control : mockControls )
++        for ( IMocksControl control : mockControls )
          {
--            MockControl control = (MockControl) it.next();
-+            IMocksControl control = (IMocksControl) it.next();
- 
              control.verify();
          }
diff --git a/debian/patches/0002-fix-dependency-on-maven-test-tools.patch b/debian/patches/0002-fix-dependency-on-maven-test-tools.patch
deleted file mode 100644
index 9e50320..0000000
--- a/debian/patches/0002-fix-dependency-on-maven-test-tools.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Torsten Werner <twerner at debian.org>
-Date: Tue, 23 Aug 2011 22:58:07 +0200
-Subject: [PATCH] fix dependency on maven-test-tools
-
----
- maven-plugin-testing-tools/pom.xml |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
---- a/maven-plugin-testing-tools/pom.xml
-+++ b/maven-plugin-testing-tools/pom.xml
-@@ -73,9 +73,9 @@
-       <version>2.0.9</version>
-     </dependency>
-     <dependency>
--      <groupId>org.apache.maven.shared</groupId>
-+      <groupId>org.apache.maven.plugin-testing</groupId>
-       <artifactId>maven-test-tools</artifactId>
--      <version>1.0-alpha-2</version>
-+      <version>1.3</version>
-       <scope>test</scope>
-     </dependency>
-   </dependencies>
diff --git a/debian/patches/series b/debian/patches/series
index b43cae1..8b71572 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 0001-easymock-upgrade.patch
-0002-fix-dependency-on-maven-test-tools.patch

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