[pkg-java] r17514 - in trunk/maven-resources-plugin/debian: . patches

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2013-11-25 23:27:20 +0000 (Mon, 25 Nov 2013)
New Revision: 17514

Added:
   trunk/maven-resources-plugin/debian/patches/
   trunk/maven-resources-plugin/debian/patches/01-ignore-failing-tests.patch
   trunk/maven-resources-plugin/debian/patches/series
Modified:
   trunk/maven-resources-plugin/debian/changelog
   trunk/maven-resources-plugin/debian/compat
   trunk/maven-resources-plugin/debian/control
Log:
Added a patch to ignore a test in ResourcesMojoTest failing with the latest versions of maven-filtering



Modified: trunk/maven-resources-plugin/debian/changelog
===================================================================
--- trunk/maven-resources-plugin/debian/changelog	2013-11-25 14:48:47 UTC (rev 17513)
+++ trunk/maven-resources-plugin/debian/changelog	2013-11-25 23:27:20 UTC (rev 17514)
@@ -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
 

Modified: trunk/maven-resources-plugin/debian/compat
===================================================================
--- trunk/maven-resources-plugin/debian/compat	2013-11-25 14:48:47 UTC (rev 17513)
+++ trunk/maven-resources-plugin/debian/compat	2013-11-25 23:27:20 UTC (rev 17514)
@@ -1 +1 @@
-7
+9

Modified: trunk/maven-resources-plugin/debian/control
===================================================================
--- trunk/maven-resources-plugin/debian/control	2013-11-25 14:48:47 UTC (rev 17513)
+++ trunk/maven-resources-plugin/debian/control	2013-11-25 23:27:20 UTC (rev 17514)
@@ -3,7 +3,7 @@
 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 @@
                      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/

Added: trunk/maven-resources-plugin/debian/patches/01-ignore-failing-tests.patch
===================================================================
--- trunk/maven-resources-plugin/debian/patches/01-ignore-failing-tests.patch	                        (rev 0)
+++ trunk/maven-resources-plugin/debian/patches/01-ignore-failing-tests.patch	2013-11-25 23:27:20 UTC (rev 17514)
@@ -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 );

Added: trunk/maven-resources-plugin/debian/patches/series
===================================================================
--- trunk/maven-resources-plugin/debian/patches/series	                        (rev 0)
+++ trunk/maven-resources-plugin/debian/patches/series	2013-11-25 23:27:20 UTC (rev 17514)
@@ -0,0 +1 @@
+01-ignore-failing-tests.patch