[gradle] 02/02: Replace libcglib-java with libcglib3-java

[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 cd981902d95120503c291a2a4e8b3d970b3cce60
Author: Kai-Chung Yan <seamlikok at gmail.com>
Date:   Wed Oct 7 00:36:36 2015 +0800

    Replace libcglib-java with libcglib3-java
---
 debian/changelog                        |  2 +-
 debian/control                          |  2 +-
 debian/patches/use_local_artifacts.diff | 17 ++++++++++++++---
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bd69c14..9adced7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,7 +10,7 @@ gradle (2.7-1) UNRELEASED; urgency=low
     - Add checkstyle to Recommends
     - Add dh-exec to Build-Depends
     - Add java6-runtime-headless to Depends as an option
-    - Replace dependencies of libservlet2.5-java and libtomcat7-java to
+    - Replace dependencies of libservlet2.5-java and libtomcat7-java with
       libservlet3.1-java and libtomcat8-java
     - Add default-jre to Suggests and document it in the description
   * d/rules: No need to copy gradle-core codes to buildSrc
diff --git a/debian/control b/debian/control
index 7ad6f47..84eff29 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,7 @@ Build-Depends: ant,
                libasm4-java (>= 5),
                libatinject-jsr330-api-java,
                libbcpg-java,
-               libcglib-java,
+               libcglib3-java,
                libclassworlds-java,
                libclassycle-java,
                libcommons-cli-java,
diff --git a/debian/patches/use_local_artifacts.diff b/debian/patches/use_local_artifacts.diff
index 55cd977..6960a0f 100644
--- a/debian/patches/use_local_artifacts.diff
+++ b/debian/patches/use_local_artifacts.diff
@@ -93,7 +93,7 @@ Last-Update: 2015-07-08
  libraries.jetty_util = dependencies.module("org.mortbay.jetty:jetty-util:6.1.25") {
      dependency libraries.slf4j_api
      dependency libraries.servlet_api
-@@ -73,65 +73,65 @@
+@@ -73,72 +73,72 @@
      dependency "org.apache.httpcomponents:httpcore:4.2.2 at jar"
      dependency libraries.jcl_to_slf4j
      dependency "commons-codec:commons-codec:1.6 at jar"
@@ -192,9 +192,20 @@ Last-Update: 2015-07-08
  }
  
  libraries.spock = [
-@@ -149,14 +149,14 @@
+     'org.spockframework:spock-core:0.7-groovy-2.0 at jar',
+     libraries.groovy,
      libraries.objenesis,
-     'cglib:cglib-nodep:2.2'
+-    'cglib:cglib-nodep:2.2.2'
++    'cglib:cglib3-nodep'
+ ]
+ libraries.jmock = [
+     'org.jmock:jmock:2.5.1',
+@@ -147,16 +147,16 @@
+     dependencies.create('org.jmock:jmock-junit4:2.5.1') { exclude group: 'junit', module: 'junit-dep' }, //junit-dep pulls old definitions of core junit types.
+     'org.jmock:jmock-legacy:2.5.1',
+     libraries.objenesis,
+-    'cglib:cglib-nodep:2.2'
++    'cglib:cglib3-nodep'
  ]
 -libraries.gson = "com.google.code.gson:gson:2.2.4"
 +libraries.gson = "com.google.code.gson:gson"

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