Author: ebourg-guest
Date: 2013-10-17 23:11:20 +0000 (Thu, 17 Oct 2013)
New Revision: 17339
Added:
trunk/surefire/debian/patches/bypass-testng-version-check.patch
Modified:
trunk/surefire/debian/changelog
trunk/surefire/debian/patches/series
Log:
Don't check the version of TestNG to make the 'debian' version usable
Modified: trunk/surefire/debian/changelog
===================================================================
--- trunk/surefire/debian/changelog 2013-10-17 21:31:31 UTC (rev 17338)
+++ trunk/surefire/debian/changelog 2013-10-17 23:11:20 UTC (rev 17339)
@@ -1,6 +1,7 @@
-surefire (2.10-5) UNRELEASED; urgency=low
+surefire (2.10-5) unstable; urgency=low
* Team upload.
+ * Don't check the version of TestNG to make the 'debian' version usable.
* debian/control:
- Use canonical URLs for the Vcs-* fields
- Updated Standards-Version to 3.9.4 (no changes)
Added: trunk/surefire/debian/patches/bypass-testng-version-check.patch
===================================================================
--- trunk/surefire/debian/patches/bypass-testng-version-check.patch
(rev 0)
+++ trunk/surefire/debian/patches/bypass-testng-version-check.patch
2013-10-17 23:11:20 UTC (rev 17339)
@@ -0,0 +1,35 @@
+Description: Bypass the verification of the version of TestNG since it doesn't
+ work with the modified version installed in Debian. TestNG in Debian has
+ always been above the minimum version required by Surefire anyway.
+Author: Emmanuel Bourg <[email protected]>
+Forwarded: not-needed
+---
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
++++
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
+@@ -531,16 +531,6 @@
+ // TODO: this is pretty manual, but I'd rather not require the plugin
> dependencies section right now
+ Artifact artifact = (Artifact) getProjectArtifactMap().get(
getTestNGArtifactName() );
+
+- if ( artifact != null )
+- {
+- VersionRange range = VersionRange.createFromVersionSpec( "[4.7,)"
);
+- if ( !range.containsVersion( new DefaultArtifactVersion(
artifact.getVersion() ) ) )
+- {
+- throw new MojoFailureException(
+- "TestNG support requires version 4.7 or above. You have
declared version " +
+- artifact.getVersion() );
+- }
+- }
+ return artifact;
+
+ }
+---
a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java
++++
b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java
+@@ -143,7 +143,7 @@
+ return new TestNGMapConfigurator();
+ }
+
+- throw new TestSetFailedException( "Unknown TestNG version " +
version );
++ return new TestNGMapConfigurator();
+ }
+ catch ( InvalidVersionSpecificationException invsex )
+ {
Modified: trunk/surefire/debian/patches/series
===================================================================
--- trunk/surefire/debian/patches/series 2013-10-17 21:31:31 UTC (rev
17338)
+++ trunk/surefire/debian/patches/series 2013-10-17 23:11:20 UTC (rev
17339)
@@ -1,2 +1,3 @@
pom.patch
fix-junit-provider-selection.patch
+bypass-testng-version-check.patch
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
