[maven-resources-plugin] 16/24: Added a patch to ignore a test in ResourcesMojoTest failing with the latest versions of maven-filtering

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

commit 2208b552c2ba08def480043e2c04016910913d9e
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Nov 25 23:27:20 2013 +0000

    Added a patch to ignore a test in ResourcesMojoTest failing with the latest versions of maven-filtering
---
 debian/changelog                             |  8 +++++---
 debian/compat                                |  2 +-
 debian/control                               |  4 ++--
 debian/patches/01-ignore-failing-tests.patch | 15 +++++++++++++++
 debian/patches/series                        |  1 +
 5 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3fbdff4..7db883d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,15 +1,17 @@
-maven-resources-plugin (2.3-8) UNRELEASED; urgency=low
+maven-resources-plugin (2.3-8) unstable; urgency=low
 
   * Team upload.
+  * Added a patch to ignore a test in ResourcesMojoTest failing
+    with the latest versions of maven-filtering
   * debian/control:
-    - Updated Standards-Version to 3.9.4 (no changes)
+    - Updated Standards-Version to 3.9.5 (no changes)
     - Use canonical URLs for the Vcs-* fields
   * debian/copyright: Updated to the Copyright Format 1.0
   * Build depend on debhelper >= 9
   * Use XZ compression for the upstream tarball
   * Documented the procedure to update the core Maven plugins in README.source
 
- -- Emmanuel Bourg <ebourg at apache.org>  Fri, 18 Oct 2013 23:53:52 +0200
+ -- Emmanuel Bourg <ebourg at apache.org>  Tue, 26 Nov 2013 00:20:40 +0100
 
 maven-resources-plugin (2.3-7) unstable; urgency=low
 
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 1e78a5e..16c1488 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Torsten Werner <twerner at debian.org>
-Build-Depends: cdbs, debhelper (>= 7), default-jdk, maven-debian-helper (>= 1.4)
+Build-Depends: cdbs, debhelper (>= 9), default-jdk, maven-debian-helper (>= 1.4)
 Build-Depends-Indep: default-jdk-doc,
                      libmaven-filtering-java,
                      libmaven-javadoc-plugin-java,
@@ -13,7 +13,7 @@ Build-Depends-Indep: default-jdk-doc,
                      libmaven2-core-java-doc,
                      libplexus-utils-java,
                      libplexus-utils-java-doc
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/maven-resources-plugin
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/maven-resources-plugin/
 Homepage: http://maven.apache.org/plugins/maven-resources-plugin/
diff --git a/debian/patches/01-ignore-failing-tests.patch b/debian/patches/01-ignore-failing-tests.patch
new file mode 100644
index 0000000..6ead8e8
--- /dev/null
+++ b/debian/patches/01-ignore-failing-tests.patch
@@ -0,0 +1,15 @@
+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 <ebourg at apache.org>
+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
+@@ -365,7 +365,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
new file mode 100644
index 0000000..6e075d2
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-ignore-failing-tests.patch

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