[gradle] 01/03: Set the version of jcommander to "1.x" rather than "debian"

[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 f3aaa35f72f9d7255c75f2373238e02672d858c8
Author: Kai-Chung Yan (殷啟聰) <seamlikok at gmail.com>
Date:   Thu Sep 8 19:56:01 2016 +0800

    Set the version of jcommander to "1.x" rather than "debian"
---
 debian/maven.rules             |  1 +
 debian/patches/jcommander.diff | 12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/debian/maven.rules b/debian/maven.rules
index a194db2..b9fc754 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -16,6 +16,7 @@ org.apache.maven.wagon s/wagon-file-2\.x/wagon-file/
 org.apache.maven.wagon s/wagon-http-2\.x/wagon-http/                                     * * * *
 org.apache.maven.wagon s/wagon-http-shared-2\.x/wagon-http-shared/                       * * * *
 org.apache.maven.wagon s/wagon-provider-api-2\.x/wagon-provider-api/                     * * * *
+com.beust              jcommander                                                        s/.*/1\.x/ * * *
 org.codehaus.plexus    s/plexus-classworlds2/plexus-classworlds/                         * * * *
 org.codehaus.plexus    s/plexus-component-annotations-1\.5/plexus-component-annotations/ * * * *
 org.eclipse.sisu       s/sisu-inject/org.eclipse.sisu.inject/                            * * * *
diff --git a/debian/patches/jcommander.diff b/debian/patches/jcommander.diff
index 4d1cad6..fcea1c0 100644
--- a/debian/patches/jcommander.diff
+++ b/debian/patches/jcommander.diff
@@ -1,6 +1,6 @@
 Description: Various modules use jcommander but do not declare.
-Author: Kai-Chung Yan <seamlikok at gmail.com>
-Last-Update: 2015-09-30
+Author: Kai-Chung Yan (殷啟聰)
+Last-Update: 2016-09-08
 Forwarded: not-needed
 --- a/subprojects/maven/maven.gradle
 +++ b/subprojects/maven/maven.gradle
@@ -9,7 +9,7 @@ Forwarded: not-needed
  
      testCompile libraries.xmlunit
 +
-+    compile "com.beust:jcommander"
++    compile 'com.beust:jcommander:1.x'
  }
  
  useTestFixtures()
@@ -19,7 +19,7 @@ Forwarded: not-needed
      provided "antlr:antlr:2.7.7 at jar"
  
      compile libraries.slf4j_api
-+    compile "com.beust:jcommander"
++    compile 'com.beust:jcommander:1.x'
  }
  
  useTestFixtures()
@@ -29,7 +29,7 @@ Forwarded: not-needed
      compile project(':testingJvm')
      compile project(':launcher')
      compile project(':toolingApi')
-+    compile "com.beust:jcommander"
++    compile 'com.beust:jcommander:1.x'
  }
  
  useClassycle()
@@ -39,7 +39,7 @@ Forwarded: not-needed
      compile libraries.commons_io
      compile libraries.commons_lang
      compile libraries.slf4j_api
-+    compile "com.beust:jcommander"
++    compile 'com.beust:jcommander:1.x'
  
      runtime libraries.commons_cli
  

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