Package: surefire Version: 2.10-2 Severity: normal Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu precise ubuntu-patch
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Dear Maintainer, In Ubuntu, the attached patch was applied to achieve the following: * d/patches/fix-junit-provider-selection.patch: Updated patch to deal maven projects which don't have any unit tests/don't depend on junit which caused a NPE (LP: #965061). Thanks for considering the patch. - -- System Information: Debian Release: wheezy/sid APT prefers precise-updates APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500, 'precise') Architecture: amd64 (x86_64) Kernel: Linux 3.2.0-20-generic (SMP w/8 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAEBCAAGBQJPcC7/AAoJEL/srsug59jD8WsP/RhFasDK+pjUeXOGiPvvfa98 W51uuNCbkXd3x7bILRLTRsszOjV5yn+lBWPuk1wsJGC9rMm9y2IT5+Mv1mcqDbix 2IVmPRw+aqxGmW/aGzFFB/ii2fpGt9z6QEhP4foDco8k1qbxc75zFS+IuMgnYj/5 XajgSk0G3Fjtju+IYy/sfsE2iLxFGJL4vwcjVF9baYgzTMZS/+jQbTmQijl/ICdO 9DBkJfkA8HYkLbJFEuI4U2+PzcDlMmGd796XPYWg5fUwWT5PNVpnucKC6rkqITpY K1we7tinIwfkQ0Q9TusHVbe+KuLluY0LRfZ15HMxFVgFjLVYqPBC5KpVeNiUd6EZ bA92XaizCSmA8GJV6fBx50mvs3OvT0DxqpYO2QrTrlZgYW03fUwdCwW3+EHAbT19 zjcEo135Fio/53D1TEPOHKIwxFya4b+kr1uP1z0yN1vWBAfIVR+A/WZ8DaoosypZ GjO7hx1D6irS1JqC4lA799CipG4rKR/E6v1AMBl3aLu9v6aVPKrNuYpLu4D3vIkM xxhbTODdrIMmBRVH6i2S05dCTwWfZbEu6rvtkrVNXV605Wd9fp7NQU19UXf3tnko //qT2bxanBQzZSmmYqNVli2ia5vVRkL8C+JTJWnAJhComTCnt7hPw5rqcSGNJS8u AgDoLOc1Vl6sLpGoiYIE =u9af -----END PGP SIGNATURE-----
diff -Nru surefire-2.10/debian/changelog surefire-2.10/debian/changelog diff -Nru surefire-2.10/debian/patches/fix-junit-provider-selection.patch surefire-2.10/debian/patches/fix-junit-provider-selection.patch --- surefire-2.10/debian/patches/fix-junit-provider-selection.patch 2012-03-19 15:17:26.000000000 +0000 +++ surefire-2.10/debian/patches/fix-junit-provider-selection.patch 2012-03-26 09:34:29.000000000 +0100 @@ -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()