This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository gradle.
commit 06db322f75e620279d147d14a3a95c2b6f917afd Author: Emmanuel Bourg <ebo...@apache.org> Date: Wed Oct 8 09:37:16 2014 +0200 Fixed a build failure caused by the transition of libspock-java to cglib3 --- debian/changelog | 7 +++++++ debian/patches/01_use_debian_jars.diff | 17 ++++++++++++----- debian/patches/24_pegdown.diff | 2 +- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index e1482e9..3bd8f1d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +gradle (1.5-2) UNRELEASED; urgency=medium + + * Team upload. + * Fixed a build failure caused by the transition of libspock-java to cglib3 + + -- Emmanuel Bourg <ebo...@apache.org> Wed, 08 Oct 2014 09:36:19 +0200 + gradle (1.5-1) unstable; urgency=medium [ Emmanuel Bourg ] diff --git a/debian/patches/01_use_debian_jars.diff b/debian/patches/01_use_debian_jars.diff index f85c1e5..dcf2134 100644 --- a/debian/patches/01_use_debian_jars.diff +++ b/debian/patches/01_use_debian_jars.diff @@ -44,7 +44,7 @@ Last-Update: 2012-08-18 apply plugin: 'groovy' apply plugin: 'checkstyle' -@@ -21,16 +22,22 @@ +@@ -21,17 +22,23 @@ apply plugin: 'eclipse' repositories { @@ -67,10 +67,12 @@ Last-Update: 2012-08-18 compile 'commons-lang:commons-lang:2.6@jar' groovy localGroovy() - testCompile 'junit:junit:4.11@jar' +- testCompile 'org.spockframework:spock-core:0.7-groovy-1.8@jar', 'cglib:cglib-nodep:2.2', 'org.objenesis:objenesis:1.2' + testCompile 'junit:junit4:4.x@jar' - testCompile 'org.spockframework:spock-core:0.7-groovy-1.8@jar', 'cglib:cglib-nodep:2.2', 'org.objenesis:objenesis:1.2' ++ testCompile 'org.spockframework:spock-core:0.7-groovy-1.8@jar', 'cglib:cglib3-nodep:3.x', 'org.objenesis:objenesis:1.2' compile "org.pegdown:pegdown:1.1.0" + compile "org.jsoup:jsoup:1.6.3" --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -25,16 +25,16 @@ @@ -170,8 +172,12 @@ Last-Update: 2012-08-18 //eather: dependency "org.sonatype.aether:aether-api:1.13.1@jar" -@@ -137,11 +139,11 @@ - 'cglib:cglib-nodep:2.2.2' +@@ -134,14 +136,14 @@ + 'org.spockframework:spock-core:0.7-groovy-1.8@jar', + libraries.groovy, + libraries.objenesis, +- 'cglib:cglib-nodep:2.2.2' ++ 'cglib:cglib-nodep:3.x' ] libraries.jmock = [ - 'org.jmock:jmock:2.5.1', @@ -183,7 +189,8 @@ Last-Update: 2012-08-18 + dependencies.create('org.jmock:jmock2-junit4:2.5.1') { exclude group: 'junit', module: 'junit-dep' }, //junit-dep pulls old definitions of core junit types. + 'org.jmock:jmock2-legacy:2.5.1', libraries.objenesis, - 'cglib:cglib-nodep:2.2' +- 'cglib:cglib-nodep:2.2' ++ 'cglib:cglib-nodep:3.x' ] --- a/subprojects/core/core.gradle +++ b/subprojects/core/core.gradle diff --git a/debian/patches/24_pegdown.diff b/debian/patches/24_pegdown.diff index 9b6c275..b92a445 100644 --- a/debian/patches/24_pegdown.diff +++ b/debian/patches/24_pegdown.diff @@ -11,7 +11,7 @@ Last-Update: 2012-08-18 +++ b/buildSrc/build.gradle @@ -40,7 +40,6 @@ testCompile 'junit:junit4:4.x@jar' - testCompile 'org.spockframework:spock-core:0.7-groovy-1.8@jar', 'cglib:cglib-nodep:2.2', 'org.objenesis:objenesis:1.2' + testCompile 'org.spockframework:spock-core:0.7-groovy-1.8@jar', 'cglib:cglib3-nodep:3.x', 'org.objenesis:objenesis:1.2' - compile "org.pegdown:pegdown:1.1.0" compile "org.jsoup:jsoup:1.6.3" -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/gradle.git _______________________________________________ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits