[pkg-java] r15878 - in trunk/surefire/debian: . patches

[Tony Mancill]

Author: tmancill
Date: 2012-03-26 18:31:48 +0000 (Mon, 26 Mar 2012)
New Revision: 15878

Modified:
   trunk/surefire/debian/changelog
   trunk/surefire/debian/patches/fix-junit-provider-selection.patch
Log:
patch for #665796

Modified: trunk/surefire/debian/changelog
===================================================================
--- trunk/surefire/debian/changelog	2012-03-26 05:12:54 UTC (rev 15877)
+++ trunk/surefire/debian/changelog	2012-03-26 18:31:48 UTC (rev 15878)
@@ -1,3 +1,11 @@
+surefire (2.10-4) unstable; urgency=low
+
+  * Team upload.
+  * Apply updated JUnit 4 detection patch.  (Closes: #665796)
+    - Thanks to James Page.
+
+ -- tony mancill <tmancill at debian.org>  Mon, 26 Mar 2012 11:27:25 -0700
+
 surefire (2.10-3) unstable; urgency=low
 
   * Team upload.

Modified: trunk/surefire/debian/patches/fix-junit-provider-selection.patch
===================================================================
--- trunk/surefire/debian/patches/fix-junit-provider-selection.patch	2012-03-26 05:12:54 UTC (rev 15877)
+++ trunk/surefire/debian/patches/fix-junit-provider-selection.patch	2012-03-26 18:31:48 UTC (rev 15878)
@@ -10,21 +10,21 @@
 Index: surefire/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
 ===================================================================
 --- surefire.orig/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java	2012-03-19 15:06:03.310108598 +0000
-+++ surefire/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java	2012-03-19 15:12:27.376393271 +0000
++++ surefire/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java	2012-03-26 09:34:20.549223250 +0100
 @@ -311,12 +311,14 @@
  
      private boolean isJunit47Compatible( Artifact artifact )
      {
 -        return dependencyResolver.isWithinVersionSpec( artifact, "[4.7,)" );
 +        return ( dependencyResolver.isWithinVersionSpec( artifact, "[4.7,)" ) ||
-+                 "4.x".equals( artifact.getVersion() ) );
++                 ( artifact != null && "4.x".equals( artifact.getVersion() ) ) );
      }
  
      private boolean isAnyJunit4( Artifact artifact )
      {
 -        return dependencyResolver.isWithinVersionSpec( artifact, "[4.0,)" );
 +        return ( dependencyResolver.isWithinVersionSpec( artifact, "[4.0,)" ) ||
-+                 "4.x".equals( artifact.getVersion() ) );
++                 ( artifact != null && "4.x".equals( artifact.getVersion() ) ) );
      }
  
      boolean isForkModeNever()