This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository surefire.
commit dfa482ad248b07887a55355725a7bf95d60add9b Author: Emmanuel Bourg <[email protected]> Date: Thu Jul 20 11:27:27 2017 +0200 Fixed a compilation issue caused by Surefire 2.17 classes found on the classpath when compiling the plugin --- debian/changelog | 2 + debian/patches/series | 1 + ...refire-execution-parameters-compatibility.patch | 48 ++++++++++++++++++++++ 3 files changed, 51 insertions(+) diff --git a/debian/changelog b/debian/changelog index b23f2b5..17d73b0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ surefire (2.19.1-1) UNRELEASED; urgency=medium - New build dependency on libmaven-dependency-plugin-java, libfest-assert-java and libmockito-java - Relocate the version 2.17 of the plugin to the current one + - Fixed a compilation issue caused by Surefire 2.17 classes found + on the classpath when compiling the plugin -- Emmanuel Bourg <[email protected]> Thu, 20 Jul 2017 10:05:17 +0200 diff --git a/debian/patches/series b/debian/patches/series index cc96cd1..044dc1e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ fix-junit-provider-selection.patch bypass-testng-version-check.patch dependency-plugin-configuration.patch +surefire-execution-parameters-compatibility.patch diff --git a/debian/patches/surefire-execution-parameters-compatibility.patch b/debian/patches/surefire-execution-parameters-compatibility.patch new file mode 100644 index 0000000..45a89e1 --- /dev/null +++ b/debian/patches/surefire-execution-parameters-compatibility.patch @@ -0,0 +1,48 @@ +Description: For some reason SurefirePlugin.java is compiled against the old SurefireExecutionParameters + from Surefire 2.17, and the compilation fails due to incompatible changes in the interface. This patch + restores the binary compatibility but doesn't fix the underlying classpath issue. The compilation errors + are likely to go away once the updated Surefire is in Debian. +Author: Emmanuel Bourg <[email protected]> +Forwarded: not-needed +--- a/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java ++++ b/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java +@@ -437,6 +437,11 @@ + return test; + } + ++ public String getTestMethod() ++ { ++ return null; ++ } ++ + public boolean isUseSystemClassLoader() + { + return useSystemClassLoader; +@@ -467,6 +472,11 @@ + this.failIfNoSpecifiedTests = failIfNoSpecifiedTests; + } + ++ public void setFailIfNoSpecifiedTests( Boolean failIfNoSpecifiedTests ) ++ { ++ this.failIfNoSpecifiedTests = failIfNoSpecifiedTests; ++ } ++ + public int getSkipAfterFailureCount() + { + return skipAfterFailureCount; +@@ -598,13 +608,13 @@ + return excludesFile; + } + +- @Override ++ //@Override + protected final List<File> suiteXmlFiles() + { + return hasSuiteXmlFiles() ? Arrays.asList( suiteXmlFiles ) : Collections.<File>emptyList(); + } + +- @Override ++ //@Override + protected final boolean hasSuiteXmlFiles() + { + return suiteXmlFiles != null && suiteXmlFiles.length != 0; -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/surefire.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
