This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository maven-resources-plugin.
commit e364c458e6ed1f9063e4cafa89c0f57e4e176880 Author: Emmanuel Bourg <[email protected]> Date: Tue Jul 18 09:19:59 2017 +0200 Removed 01-ignore-failing-tests.patch (fixed upstream) --- debian/changelog | 2 +- debian/patches/01-ignore-failing-tests.patch | 15 --------------- debian/patches/series | 2 +- 3 files changed, 2 insertions(+), 17 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0ed1404..d091e95 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,7 @@ maven-resources-plugin (3.0.0-1) UNRELEASED; urgency=medium * Team upload. * New upstream release - - Refreshed the patch + - Removed 01-ignore-failing-tests.patch (fixed upstream) - Depend on libmaven3-core-java instead of libmaven2-core-java - New build dependency on junit4 - Relocate the version 2.6 used by Maven 3.1.1+ to the current one diff --git a/debian/patches/01-ignore-failing-tests.patch b/debian/patches/01-ignore-failing-tests.patch deleted file mode 100644 index b252500..0000000 --- a/debian/patches/01-ignore-failing-tests.patch +++ /dev/null @@ -1,15 +0,0 @@ -Description: Ignores a test failing with the more recent versions of maven-filtering. - The test has been fixed upstream in maven-resources-plugin 2.4.2 -Author: Emmanuel Bourg <[email protected]> -Forwarded: not-needed ---- a/src/test/java/org/apache/maven/plugin/resources/ResourcesMojoTest.java -+++ b/src/test/java/org/apache/maven/plugin/resources/ResourcesMojoTest.java -@@ -377,7 +377,7 @@ - /** - * @throws Exception - */ -- public void testProjectProperty_Filtering_PropertyDestination() -+ public void _testProjectProperty_Filtering_PropertyDestination() - throws Exception - { - File testPom = new File( getBasedir(), defaultPomFilePath ); diff --git a/debian/patches/series b/debian/patches/series index 1accad3..1c05188 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,2 @@ -01-ignore-failing-tests.patch +#01-ignore-failing-tests.patch 02-aether-compatibility.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-resources-plugin.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
