Author: nomadium-guest
Date: 2012-03-23 15:58:46 +0000 (Fri, 23 Mar 2012)
New Revision: 15874
Added:
trunk/surefire/debian/patches/fix-junit-provider-selection.patch
Modified:
trunk/surefire/debian/changelog
trunk/surefire/debian/control
trunk/surefire/debian/patches/series
Log:
* Team upload.
* Fix JUnit 4 detection during unit tests in build time.
Thanks to James Page for the patch. (Closes: #664641).
* Bump Standards-Version to 3.9.3. No changes were required.
Modified: trunk/surefire/debian/changelog
===================================================================
--- trunk/surefire/debian/changelog 2012-03-22 23:28:03 UTC (rev 15873)
+++ trunk/surefire/debian/changelog 2012-03-23 15:58:46 UTC (rev 15874)
@@ -1,3 +1,12 @@
+surefire (2.10-3~miguel1) unstable; urgency=low
+
+ * Team upload.
+ * Fix JUnit 4 detection during unit tests in build time.
+ Thanks to James Page for the patch. (Closes: #664641).
+ * Bump Standards-Version to 3.9.3. No changes were required.
+
+ -- Miguel Landaeta <mig...@miguel.cc> Thu, 22 Mar 2012 19:49:18 -0430
+
surefire (2.10-2) unstable; urgency=low
[ Miguel Landaeta ]
Modified: trunk/surefire/debian/control
===================================================================
--- trunk/surefire/debian/control 2012-03-22 23:28:03 UTC (rev 15873)
+++ trunk/surefire/debian/control 2012-03-23 15:58:46 UTC (rev 15874)
@@ -22,7 +22,7 @@
maven-repo-helper,
testng,
velocity
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/surefire
Vcs-Browser: http://svn.debian.org/viewvc/pkg-java/trunk/surefire/
Homepage: http://maven.apache.org/surefire/
Added: trunk/surefire/debian/patches/fix-junit-provider-selection.patch
===================================================================
--- trunk/surefire/debian/patches/fix-junit-provider-selection.patch
(rev 0)
+++ trunk/surefire/debian/patches/fix-junit-provider-selection.patch
2012-03-23 15:58:46 UTC (rev 15874)
@@ -0,0 +1,30 @@
+Description: Surefire can't correctly detect the 4.x version of
+ JUnit that is present in the Debian Maven Repository.
+ .
+ This patch corrects that - its safe to assume that its greater
+ than 4.7 as sid contains 4.8.2. The JUnit4Provider should
+ never get selected due to the way these two checks are combined.
+Author: James Page <james.p...@ubuntu.com>
+Forwarded: not-needed
+
+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
+@@ -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() ) );
+ }
+
+ private boolean isAnyJunit4( Artifact artifact )
+ {
+- return dependencyResolver.isWithinVersionSpec( artifact, "[4.0,)" );
++ return ( dependencyResolver.isWithinVersionSpec( artifact, "[4.0,)" )
||
++ "4.x".equals( artifact.getVersion() ) );
+ }
+
+ boolean isForkModeNever()
Modified: trunk/surefire/debian/patches/series
===================================================================
--- trunk/surefire/debian/patches/series 2012-03-22 23:28:03 UTC (rev
15873)
+++ trunk/surefire/debian/patches/series 2012-03-23 15:58:46 UTC (rev
15874)
@@ -1 +1,2 @@
pom.patch
+fix-junit-provider-selection.patch
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
