[gradle] 03/03: Depend on libcglib-nodep-java instead of libcglib3-java

[Emmanuel Bourg]

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

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

commit a1c349c27bad98d9dbcdb4601b697bd98d76e496
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sun Apr 24 19:41:49 2016 +0200

    Depend on libcglib-nodep-java instead of libcglib3-java
---
 debian/changelog                        |  1 +
 debian/control                          |  2 +-
 debian/patches/use_local_artifacts.diff | 21 +--------------------
 3 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1cb9dc9..e7dd95b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ gradle (2.10-3) UNRELEASED; urgency=medium
   * Team upload.
   * Removed the unused dependency on libclassworlds-java
   * Depend on libasm-java instead of libasm4-java
+  * Depend on libcglib-nodep-java instead of libcglib3-java
 
  -- Emmanuel Bourg <ebourg at apache.org>  Sun, 24 Apr 2016 19:27:30 +0200
 
diff --git a/debian/control b/debian/control
index 0482416..7d037dd 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,7 @@ Build-Depends: ant,
                libasm-java (>= 5.0),
                libatinject-jsr330-api-java,
                libbcpg-java,
-               libcglib3-java,
+               libcglib-nodep-java,
                libclassycle-java,
                libcommons-cli-java,
                libcommons-collections3-java,
diff --git a/debian/patches/use_local_artifacts.diff b/debian/patches/use_local_artifacts.diff
index 879b0ce..5546c66 100644
--- a/debian/patches/use_local_artifacts.diff
+++ b/debian/patches/use_local_artifacts.diff
@@ -37,8 +37,7 @@ Last-Update: 2015-07-08
      compile 'commons-lang:commons-lang:2.6 at jar'
      compile localGroovy()
      testCompile 'junit:junit:4.12 at jar'
--    testCompile 'org.spockframework:spock-core:1.0-groovy-2.4 at jar', 'cglib:cglib-nodep:2.2', 'org.objenesis:objenesis:1.2'
-+    testCompile 'org.spockframework:spock-core:1.0-groovy-2.4 at jar', 'cglib:cglib3-nodep', 'org.objenesis:objenesis:1.2'
+     testCompile 'org.spockframework:spock-core:1.0-groovy-2.4 at jar', 'cglib:cglib-nodep:2.2', 'org.objenesis:objenesis:1.2'
  
 -    compile "org.pegdown:pegdown:1.1.0"
 +    compile "org.pegdown:pegdown:[1.1.0, )"
@@ -150,24 +149,6 @@ Last-Update: 2015-07-08
  
      //eather:
      dependency "org.sonatype.aether:aether-api:1.13.1 at jar"
-@@ -139,7 +139,7 @@
-     'org.spockframework:spock-core:0.7-groovy-2.0 at jar',
-     libraries.groovy,
-     libraries.objenesis,
--    'cglib:cglib-nodep:2.2.2'
-+    'cglib:cglib3-nodep'
- ]
- libraries.jmock = [
-     'org.jmock:jmock:2.5.1',
-@@ -148,7 +148,7 @@
-     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.sshd = dependencies.module("org.apache.sshd:sshd-core:0.13.0") {
 @@ -156,8 +156,8 @@
      dependency "org.apache.mina:mina-core:2.0.8"
  }

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