[gradle] 01/01: New patch: maven_testng.diff

[Kai-Chung Yan]

This is an automated email from the git hooks/post-receive script.

seamlik-guest pushed a commit to branch master
in repository gradle.

commit 804cbb18f092cb68596d3f02520bb2179bfbd90c
Author: Kai-Chung Yan <seamlikok at gmail.com>
Date:   Thu Jul 9 17:39:47 2015 +0800

    New patch: maven_testng.diff
---
 debian/changelog                                   |  4 +--
 .../{jcommander.diff => maven_depends.diff}        |  4 +--
 debian/patches/maven_testng.diff                   | 31 ++++++++++++++++++++++
 debian/patches/series                              |  3 ++-
 4 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3585c03..49172fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,8 +29,8 @@ gradle (2.5-1) UNRELEASED; urgency=low
     - disable_aws.diff: AWS SDK for Java is not in Debian
     - disable_java9.diff: java9.gradle causes errors
     - taskOrdering.diff: shouldRunAfter() is not in Gradle 1.5
-    - jcommander.diff: Gradle uses jcommander but does not declare the
-      dependency
+    - maven_depends.diff: Maven module uses jcommander but does not declare
+    - maven_testng.diff: Maven module uses a deprecated API from testng
     - nekohtml.diff: Fix nekohtml usage
     - relax_warnings.diff: strictCompile.gradle is too strict
   * gradle-doc no longer provides Gradle User Guide and DSL Reference because
diff --git a/debian/patches/jcommander.diff b/debian/patches/maven_depends.diff
similarity index 75%
rename from debian/patches/jcommander.diff
rename to debian/patches/maven_depends.diff
index 2aba2a0..cb61f2b 100644
--- a/debian/patches/jcommander.diff
+++ b/debian/patches/maven_depends.diff
@@ -1,6 +1,6 @@
-Description: Gradle uses jcommander but does not declare the dependency.
+Description: Maven module uses jcommander but does not declare.
 Author: Kai-Chung Yan <seamlikok at gmail.com>
-Last-Update: 2015-07-03
+Last-Update: 2015-07-09
 --- a/subprojects/maven/maven.gradle
 +++ b/subprojects/maven/maven.gradle
 @@ -29,6 +29,8 @@
diff --git a/debian/patches/maven_testng.diff b/debian/patches/maven_testng.diff
new file mode 100644
index 0000000..de619e8
--- /dev/null
+++ b/debian/patches/maven_testng.diff
@@ -0,0 +1,31 @@
+Description: Maven module uses a deprecated API from testng.
+Author: Kai-Chung Yan <seamlikok at gmail.com>
+Last-Update: 2015-07-09
+--- a/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/pom/ProjectDependencyArtifactIdExtractorHack.java
++++ b/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/pom/ProjectDependencyArtifactIdExtractorHack.java
+@@ -26,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;
+@@ -35,7 +34,7 @@
+  * Given a project dependency, determines the artifact ID that the depended-on project
+  * can be referred to from a Maven POM. Falls back to project.name if the artifact ID
+  * used for publishing the depended-on project cannot be determined with certainty.
+- * 
++ *
+  * The main goal of this class is to fix GRADLE-443 without changing any other existing
+  * behavior (e.g. when a project that gets published to a Maven repo depends on a
+  * project published to an Ivy repo).
+@@ -96,7 +95,7 @@
+     }
+ 
+     private Set<String> getArtifactIds(Collection<MavenDeployer> deployers) {
+-        Set<String> result = Sets.newHashSet();
++        Set<String> result = new java.util.HashSet<String>();
+         for (MavenDeployer deployer : deployers) {
+             result.add(deployer.getPom().getArtifactId());
+         }
diff --git a/debian/patches/series b/debian/patches/series
index df701e8..322f248 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,7 +15,8 @@ search_system_jar.diff
 26_disable_commitid.diff
 disable_aws.diff
 taskOrdering.diff
-jcommander.diff
+maven_depends.diff
 nekohtml.diff
 relax_warnings.diff
 disable_java9.diff
+maven_testng.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/gradle.git