[pkg-java] r17503 - in trunk/maven-plugin-testing/debian: . patches

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2013-11-23 00:09:26 +0000 (Sat, 23 Nov 2013)
New Revision: 17503

Added:
   trunk/maven-plugin-testing/debian/patches/0001-easymock-upgrade.patch
Modified:
   trunk/maven-plugin-testing/debian/changelog
   trunk/maven-plugin-testing/debian/patches/series
Log:
Added a patch to ensure the compatibility with EasyMock 3.0 (Closes: #718874)



Modified: trunk/maven-plugin-testing/debian/changelog
===================================================================
--- trunk/maven-plugin-testing/debian/changelog	2013-11-22 23:45:52 UTC (rev 17502)
+++ trunk/maven-plugin-testing/debian/changelog	2013-11-23 00:09:26 UTC (rev 17503)
@@ -1,4 +1,4 @@
-maven-plugin-testing (1.3-1) UNRELEASED; urgency=low
+maven-plugin-testing (1.3-1) unstable; urgency=low
 
   * Team upload.
   * New upstream release
@@ -9,11 +9,13 @@
     - Use canonical URLs for the Vcs-* fields
     - Build depend on libplexus-maven-plugin-java (>= 1.3.8-9)
       to fix a build failure
+  * Added a patch to ensure the compatibility with EasyMock 3.0
+    (Closes: #718874)
   * Switch to debhelper level 9
   * Use XZ compression for the upstream tarball
   * debian/copyright: Updated to the Copyright Format 1.0
 
- -- Emmanuel Bourg <ebourg at apache.org>  Fri, 22 Nov 2013 15:14:38 +0100
+ -- Emmanuel Bourg <ebourg at apache.org>  Sat, 23 Nov 2013 01:08:25 +0100
 
 maven-plugin-testing (1.2-3) unstable; urgency=low
 

Added: trunk/maven-plugin-testing/debian/patches/0001-easymock-upgrade.patch
===================================================================
--- trunk/maven-plugin-testing/debian/patches/0001-easymock-upgrade.patch	                        (rev 0)
+++ trunk/maven-plugin-testing/debian/patches/0001-easymock-upgrade.patch	2013-11-23 00:09:26 UTC (rev 17503)
@@ -0,0 +1,48 @@
+Description: Replaces the MockControl class removed from EasyMock 3.0
+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;
+ import java.util.List;
+ 
+-import org.easymock.MockControl;
++import org.easymock.IMocksControl;
+ 
+ /**
+  * Manager of MockControl
+  *
+  * @version $Id: MockManager.java 677117 2008-07-16 00:29:56Z vsiveton $
+- * @see MockControl
++ * @see IMocksControl
+  */
+ public class MockManager
+ {
+@@ -38,7 +38,7 @@
+     /**
+      * @param control to be add to the manager
+      */
+-    public void add( MockControl control )
++    public void add( IMocksControl control )
+     {
+         mockControls.add( control );
+     }
+@@ -58,7 +58,7 @@
+     {
+         for ( Iterator it = mockControls.iterator(); it.hasNext(); )
+         {
+-            MockControl control = (MockControl) it.next();
++            IMocksControl control = (IMocksControl) it.next();
+ 
+             control.replay();
+         }
+@@ -71,7 +71,7 @@
+     {
+         for ( Iterator it = mockControls.iterator(); it.hasNext(); )
+         {
+-            MockControl control = (MockControl) it.next();
++            IMocksControl control = (IMocksControl) it.next();
+ 
+             control.verify();
+         }

Modified: trunk/maven-plugin-testing/debian/patches/series
===================================================================
--- trunk/maven-plugin-testing/debian/patches/series	2013-11-22 23:45:52 UTC (rev 17502)
+++ trunk/maven-plugin-testing/debian/patches/series	2013-11-23 00:09:26 UTC (rev 17503)
@@ -1 +1,2 @@
+0001-easymock-upgrade.patch
 0002-fix-dependency-on-maven-test-tools.patch