[Git][java-team/gradle][master] Fixed the build failure with asm/6.2.1

[Emmanuel Bourg]

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / gradle


Commits:
ddefa8f7 by Emmanuel Bourg at 2018-10-01T13:12:37Z
Fixed the build failure with asm/6.2.1

- - - - -


4 changed files:

- debian/changelog
- debian/patches/disable-binary-compatibility.patch
- debian/patches/gradle-4-compatibility.patch
- debian/patches/use-local-artifacts.patch


Changes:

=====================================
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 at apache.org>  Mon, 01 Oct 2018 15:12:33 +0200
+
 gradle (4.4-2) unstable; urgency=medium
 
   * Team upload.


=====================================
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 at jar'
      compile gradleApi()
 @@ -46,9 +48,6 @@
      testCompile 'junit:junit:4.12 at jar'


=====================================
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 at jar'
 @@ -45,6 +46,8 @@
      compile 'com.google.guava:guava:14.0.1 at jar'
      compile 'commons-lang:commons-lang:2.6 at jar'


=====================================
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 at jar'
      compile gradleApi()
 -    compile 'com.google.guava:guava-jdk5:14.0.1 at jar'
 +    compile 'com.google.guava:guava:14.0.1 at jar'
@@ -57,6 +60,15 @@ Forwarded: not-needed
      testCompile 'junit:junit:4.12 at 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 at jar'
 @@ -91,7 +91,7 @@
  libraries += [
      jatl: 'com.googlecode.jatl:jatl:0.2.2',



View it on GitLab: https://salsa.debian.org/java-team/gradle/commit/ddefa8f75c00f966a42e74b719d9254ae19ed1a1

-- 
View it on GitLab: https://salsa.debian.org/java-team/gradle/commit/ddefa8f75c00f966a42e74b719d9254ae19ed1a1
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20181001/4920e252/attachment.html>