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-1.3.
commit e1ce24eb288a37e923ea9f424c34b7d42bcacbbb Author: Emmanuel Bourg <[email protected]> Date: Sat Nov 23 00:09:26 2013 +0000 Added a patch to ensure the compatibility with EasyMock 3.0 (Closes: #718874) --- debian/changelog | 6 ++-- debian/patches/0001-easymock-upgrade.patch | 48 ++++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 53 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1e80165..ca2c3d5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 @@ maven-plugin-testing (1.3-1) UNRELEASED; urgency=low - 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 <[email protected]> Fri, 22 Nov 2013 15:14:38 +0100 + -- Emmanuel Bourg <[email protected]> Sat, 23 Nov 2013 01:08:25 +0100 maven-plugin-testing (1.2-3) unstable; urgency=low diff --git a/debian/patches/0001-easymock-upgrade.patch b/debian/patches/0001-easymock-upgrade.patch new file mode 100644 index 0000000..b93e284 --- /dev/null +++ b/debian/patches/0001-easymock-upgrade.patch @@ -0,0 +1,48 @@ +Description: Replaces the MockControl class removed from EasyMock 3.0 +Author: Emmanuel Bourg <[email protected]> +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(); + } diff --git a/debian/patches/series b/debian/patches/series index 82e8ae2..b43cae1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ +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-1.3.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
