[pkg-java] r17720 - in trunk/maven-scm/debian: . patches

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2014-01-29 15:18:22 +0000 (Wed, 29 Jan 2014)
New Revision: 17720

Added:
   trunk/maven-scm/debian/patches/0002-fix-perforce-tests.patch
Modified:
   trunk/maven-scm/debian/changelog
   trunk/maven-scm/debian/maven.properties
   trunk/maven-scm/debian/patches/series
Log:
Fixed the tests to run with the latest version of JUnit (Closes: #719393)



Modified: trunk/maven-scm/debian/changelog
===================================================================
--- trunk/maven-scm/debian/changelog	2014-01-29 15:12:10 UTC (rev 17719)
+++ trunk/maven-scm/debian/changelog	2014-01-29 15:18:22 UTC (rev 17720)
@@ -1,6 +1,7 @@
 maven-scm (1.3-5) UNRELEASED; urgency=low
 
   * Team upload.
+  * Fixed the tests to run with the latest version of JUnit (Closes: #719393)
   * debian/control:
     - Standards-Version updated to 3.9.5 (no changes)
     - Use canonical URLs for the Vcs-* fields

Modified: trunk/maven-scm/debian/maven.properties
===================================================================
--- trunk/maven-scm/debian/maven.properties	2014-01-29 15:12:10 UTC (rev 17719)
+++ trunk/maven-scm/debian/maven.properties	2014-01-29 15:18:22 UTC (rev 17720)
@@ -2,3 +2,4 @@
 # For example:
 # maven.test.skip=true
 
+project.build.sourceEncoding=ISO-8859-1

Added: trunk/maven-scm/debian/patches/0002-fix-perforce-tests.patch
===================================================================
--- trunk/maven-scm/debian/patches/0002-fix-perforce-tests.patch	                        (rev 0)
+++ trunk/maven-scm/debian/patches/0002-fix-perforce-tests.patch	2014-01-29 15:18:22 UTC (rev 17720)
@@ -0,0 +1,20 @@
+Description: Fixes the Perfoce tests to run with the latest version of JUnit (backported from maven-scm 1.9)
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: yes
+--- a/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/changelog/PerforceChangeLogCommandTest.java
++++ b/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/changelog/PerforceChangeLogCommandTest.java
+@@ -43,6 +43,14 @@
+ 
+     private static final String cmdPrefix = "p4 -d " + workingDirectory.getAbsolutePath();
+ 
++    @Override
++    protected void tearDown()
++        throws Exception
++    {
++        // Some tests don't expect this property, so when tests are executed in random order these might fail
++        System.clearProperty( PerforceScmProvider.DEFAULT_CLIENTSPEC_PROPERTY );
++    }
++
+     public void testGetCommandLine()
+         throws Exception
+     {

Modified: trunk/maven-scm/debian/patches/series
===================================================================
--- trunk/maven-scm/debian/patches/series	2014-01-29 15:12:10 UTC (rev 17719)
+++ trunk/maven-scm/debian/patches/series	2014-01-29 15:18:22 UTC (rev 17720)
@@ -1 +1,2 @@
 0001-do-not-build-vss-module.patch
+0002-fix-perforce-tests.patch