diff --git a/debian/changelog b/debian/changelog index 5dc76df47d83a058110ea7b6fbe561b44830f7e7..6de62d17950ad7179be4a93c9f59e61cffa2ce73 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +gradle (4.4-3) unstable; urgency=medium + + * Team upload. + * Fixed the build failure with asm/6.2.1 + + -- Emmanuel Bourg <ebourg@apache.org> Mon, 01 Oct 2018 15:12:33 +0200 + gradle (4.4-2) unstable; urgency=medium * Team upload. diff --git a/debian/patches/disable-binary-compatibility.patch b/debian/patches/disable-binary-compatibility.patch index 1a6a26247f2f8ea19b3952f605f68a7fe96e8abc..3a88618fb7e8acd4bf3eab69a824a83e245bcef2 100644 --- a/debian/patches/disable-binary-compatibility.patch +++ b/debian/patches/disable-binary-compatibility.patch @@ -11,7 +11,7 @@ Forwarded: not-needed +sourceSets.main.groovy { exclude 'org/gradle/binarycompatibility/**' } + dependencies { - compile 'org.ow2.asm:asm-all:5.0.3' + compile 'org.ow2.asm:asm-all:6.2.1@jar' compile gradleApi() @@ -46,9 +48,6 @@ testCompile 'junit:junit:4.12@jar' diff --git a/debian/patches/gradle-4-compatibility.patch b/debian/patches/gradle-4-compatibility.patch index 45c1354ab0a9cc3f487014182e77026214e51760..7b9aee82abdf989e4ea565199a6bd6c848e22724 100644 --- a/debian/patches/gradle-4-compatibility.patch +++ b/debian/patches/gradle-4-compatibility.patch @@ -46,7 +46,7 @@ Forwarded: not-needed +sourceSets.main.groovy { exclude '**/GenerateDefaultImportsTask.*' } dependencies { - compile 'org.ow2.asm:asm-all:5.0.3' + compile 'org.ow2.asm:asm-all:6.2.1@jar' @@ -45,6 +46,8 @@ compile 'com.google.guava:guava:14.0.1@jar' compile 'commons-lang:commons-lang:2.6@jar' diff --git a/debian/patches/use-local-artifacts.patch b/debian/patches/use-local-artifacts.patch index dcbe93c87c56c86713f6acbdadaabde59824e690..9664f303bf78dd3685b3e3664369a167f352d8c9 100644 --- a/debian/patches/use-local-artifacts.patch +++ b/debian/patches/use-local-artifacts.patch @@ -46,9 +46,12 @@ Forwarded: not-needed } sourceSets { test { groovy { exclude '**' } } } -@@ -42,7 +40,7 @@ +@@ -40,9 +38,9 @@ + } + dependencies { - compile 'org.ow2.asm:asm-all:5.0.3' +- compile 'org.ow2.asm:asm-all:5.0.3' ++ compile 'org.ow2.asm:asm-all:6.2.1@jar' compile gradleApi() - compile 'com.google.guava:guava-jdk5:14.0.1@jar' + compile 'com.google.guava:guava:14.0.1@jar' @@ -57,6 +60,15 @@ Forwarded: not-needed testCompile 'junit:junit:4.12@jar' --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle +@@ -35,7 +35,7 @@ + dependency "org.apache.ant:ant-launcher:${versions.ant}@jar" + } + +-libraries.asm = 'org.ow2.asm:asm-debug-all:6.0_ALPHA' ++libraries.asm = 'org.ow2.asm:asm-all:6.0_ALPHA' + libraries.cglib = 'cglib:cglib:3.2.5' + libraries.bndlib = dependencies.module('biz.aQute.bnd:biz.aQute.bndlib:3.4.0') + libraries.commons_cli = 'commons-cli:commons-cli:1.2@jar' @@ -91,7 +91,7 @@ libraries += [ jatl: 'com.googlecode.jatl:jatl:0.2.2',