This is an automated email from the git hooks/post-receive script. seamlik-guest pushed a commit to branch master in repository gradle-1.12.
commit 5c9d98f8fbf1d2e6186aca665f8bf2359fae57cd Author: Emmanuel Bourg <[email protected]> Date: Thu Jun 4 23:35:31 2015 +0200 Fixed a compatibility issue with testng 6.9 --- debian/changelog | 7 +++++++ debian/patches/37_replace_internal_testng_api.diff | 21 +++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 29 insertions(+) diff --git a/debian/changelog b/debian/changelog index 43d7966..2da1368 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +gradle (1.5-3) UNRELEASED; urgency=medium + + * Team upload. + * Fixed a compatibility issue with testng 6.9 + + -- Emmanuel Bourg <[email protected]> Thu, 04 Jun 2015 23:33:33 +0200 + gradle (1.5-2) unstable; urgency=medium * Team upload. diff --git a/debian/patches/37_replace_internal_testng_api.diff b/debian/patches/37_replace_internal_testng_api.diff new file mode 100644 index 0000000..97f6e46 --- /dev/null +++ b/debian/patches/37_replace_internal_testng_api.diff @@ -0,0 +1,21 @@ +Description: Import the Sets class from Guava instead of testng (the class has been removed from testng 6.9.0) +Author: Emmanuel Bourg <[email protected]> +Bug: https://github.com/gradle/gradle/pull/470 +--- a/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/ant/ProjectDependencyArtifactIdExtractorHack.java ++++ b/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/ant/ProjectDependencyArtifactIdExtractorHack.java +@@ -17,6 +17,7 @@ + package org.gradle.api.publication.maven.internal.ant; + + import com.google.common.collect.Lists; ++import com.google.common.collect.Sets; + import org.gradle.api.Nullable; + import org.gradle.api.Project; + import org.gradle.api.artifacts.ProjectDependency; +@@ -25,7 +26,6 @@ + import org.gradle.api.artifacts.repositories.ArtifactRepository; + import org.gradle.api.plugins.BasePluginConvention; + import org.gradle.api.tasks.Upload; +-import org.testng.internal.annotations.Sets; + + import java.util.Collection; + import java.util.Set; diff --git a/debian/patches/series b/debian/patches/series index b73c6de..0d12c3c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -16,3 +16,4 @@ 34_disable_code_quality.diff 35_ivy_23.diff 36_java8_compatibility.diff +37_replace_internal_testng_api.diff -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/gradle-1.12.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
