[gradle] 13/16: Update maven_jcommander.diff to jcommander.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 2289414dc4ac693b4e4c978d1e6db3de12bb0576
Author: Kai-Chung Yan <seamlikok at gmail.com>
Date:   Wed Sep 30 07:34:30 2015 +0800

    Update maven_jcommander.diff to jcommander.diff
---
 debian/changelog                     |  1 +
 debian/patches/jcommander.diff       | 24 ++++++++++++++++++++++++
 debian/patches/maven_jcommander.diff | 14 --------------
 debian/patches/series                |  2 +-
 4 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fd1ce20..5ded5ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ gradle (2.7-1) UNRELEASED; urgency=low
     - Build-Depends on gradle (>= 2.5)
   * d/rules: No need to copy gradle-core codes to buildSrc
   * Remove fix_DocGenerationException.diff: No longer needed
+  * Update maven_jcommander.diff to jcommander.diff
 
  -- Kai-Chung Yan <seamlikok at gmail.com>  Wed, 30 Sep 2015 04:37:18 +0800
 
diff --git a/debian/patches/jcommander.diff b/debian/patches/jcommander.diff
new file mode 100644
index 0000000..d24f914
--- /dev/null
+++ b/debian/patches/jcommander.diff
@@ -0,0 +1,24 @@
+Description: Various modules use jcommander but do not declare.
+Author: Kai-Chung Yan <seamlikok at gmail.com>
+Last-Update: 2015-09-30
+--- a/subprojects/maven/maven.gradle
++++ b/subprojects/maven/maven.gradle
+@@ -29,6 +29,8 @@
+     compile "org.codehaus.plexus:plexus-component-annotations-1.5"
+
+     testCompile libraries.xmlunit
++
++    compile "com.beust:jcommander"
+ }
+
+ useTestFixtures()
+--- a/subprojects/antlr/antlr.gradle
++++ b/subprojects/antlr/antlr.gradle
+@@ -22,6 +22,7 @@
+     provided "antlr:antlr"
+
+     compile libraries.slf4j_api
++    compile "com.beust:jcommander"
+ }
+
+ useTestFixtures()
diff --git a/debian/patches/maven_jcommander.diff b/debian/patches/maven_jcommander.diff
deleted file mode 100644
index cb61f2b..0000000
--- a/debian/patches/maven_jcommander.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Maven module uses jcommander but does not declare.
-Author: Kai-Chung Yan <seamlikok at gmail.com>
-Last-Update: 2015-07-09
---- a/subprojects/maven/maven.gradle
-+++ b/subprojects/maven/maven.gradle
-@@ -29,6 +29,8 @@
-     compile "org.codehaus.plexus:plexus-component-annotations-1.5"
- 
-     testCompile libraries.xmlunit
-+
-+    compile "com.beust:jcommander"
- }
- 
- useTestFixtures()
diff --git a/debian/patches/series b/debian/patches/series
index 92b1e75..3eb2c13 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,7 +14,7 @@ search_system_jar.diff
 26_disable_commitid.diff
 disable_aws.diff
 taskOrdering.diff
-maven_jcommander.diff
+jcommander.diff
 nekohtml.diff
 relax_warnings.diff
 disable_java9.diff

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