Subject: [bug#29896] [PATCH core-updates] gnu: java-asm: Update to 6.0.

From: Gábor Boskovits <[email-masked]>
Date: Fri, 29 Dec 2017 20:00:22 +0100

* gnu/packages/java.scm (java-asm): Update to 6.0.
[inputs]: Add java-aqute-bndlib, java-aqute-libg. (New dependencies)
[arguments]: Adjust make-flags, so that the build does not complain about unset properties.
---
 gnu/packages/java.scm | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 41f9af87e..8a244328f 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -2663,15 +2663,18 @@ archives (jar).")
 (define-public java-asm
   (package
     (name "java-asm")
-    (version "5.2")
+    (version "6.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "http://download.forge.ow2.org/asm/"
                                   "asm-" version ".tar.gz"))
               (sha256
                (base32
-                "0kxvmv5275rnjl7jv0442k3wjnq03ngkb7sghs78avf45pzm4qgr"))))
+                "115l5pqblirdkmzi32dxx7gbcm4jy0s14y5wircr6h8jdr9aix00"))))
     (build-system ant-build-system)
+    (inputs
+     `(("java-aqute-bndlib" ,java-aqute-bndlib)
+       ("java-aqute-libg" ,java-aqute-libg)))
     (arguments
      `(#:build-target "compile"
        ;; The tests require an old version of Janino, which no longer compiles
@@ -2679,7 +2682,8 @@ archives (jar).")
        #:tests? #f
        ;; We don't need these extra ant tasks, but the build system asks us to
        ;; provide a path anyway.
-       #:make-flags (list (string-append "-Dobjectweb.ant.tasks.path=foo"))
+       #:make-flags (list (string-append "-Dobjectweb.ant.tasks.path=foo")
+                          (string-append "-Dbiz.aQute.bnd.path=" (assoc-ref %build-inputs "java-aqute-bndlib")))
        #:phases
        (modify-phases %standard-phases
          (add-before 'install 'build-jars
-- 
2.15.1