[bug#31152] [PATCH 0/4] Bootstrap java-jarjar.

[bug#31152] [PATCH 0/4] Bootstrap java-jarjar.

[Gábor Boskovits]

*** BLURB HERE ***

This patch series introduces the packages required to remove the
bundled asm from jarjar. This is encouraged by current policy
and needed by switching to java8, as the bundled asm version
is too old.

Gábor Boskovits (4):
  gnu: Add java-slfj4-api-bootstrap.
  gnu: Add java-aqute-libg-bootstrap.
  gnu: Add java-aqute-bndlib-bootstrap.
  gnu: Add java-asm-bootstrap.

 gnu/packages/java.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

-- 
2.16.2

[bug#31152] [PATCH 1/4] gnu: Add java-slfj4-api-bootstrap.

[Gábor Boskovits]

    * gnu/packages/java.scm (java-slf4j-api-bootstrap): New variable.
---
 gnu/packages/java.scm | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index be252cd2a..de9313c36 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -5640,6 +5640,15 @@ allowing the end user to plug in the desired logging framework at deployment
 time.")
     (license license:expat)))
 
+(define-public java-slf4j-api-bootstrap
+  (package
+    (inherit java-slf4j-api)
+    (name "java-slf4j-api-bootstrap")
+    (inputs `())
+    (arguments
+     (substitute-keyword-arguments (package-arguments java-slf4j-api)
+       ((#:tests? _ #f) #f)))))
+
 (define-public java-slf4j-simple
   (package
     (name "java-slf4j-simple")
-- 
2.16.2

[bug#31152] [PATCH 2/4] gnu: Add java-aqute-libg-bootstrap.

[Gábor Boskovits]

* gnu/packages/java.scm (java-aqute-libg-bootstrap): New variable.
---
 gnu/packages/java.scm | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index de9313c36..f9174b87a 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -6890,6 +6890,15 @@ it manages project dependencies, gives diffs jars, and much more.")
        ("java-osgi-cmpn" ,java-osgi-cmpn)
        ("osgi" ,java-osgi-core)))))
 
+(define-public java-aqute-libg-bootstrap
+  (package
+    (inherit java-aqute-libg)
+    (name "java-aqute-libg-bootstrap")
+    (inputs
+     `(("slf4j-bootstrap" ,java-slf4j-api-bootstrap)
+       ,@(delete `("slf4j" ,java-slf4j-api)
+                 (package-inputs java-aqute-libg))))))
+
 (define-public java-aqute-bndlib
   (package
     (inherit java-aqute-bnd-annotation)
-- 
2.16.2

[bug#31152] [PATCH 3/4] gnu: Add java-aqute-bndlib-bootstrap.

[Gábor Boskovits]

* gnu/packages/java.scm (java-aqute-bndlib-bootstrap): New variable.
---
 gnu/packages/java.scm | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index f9174b87a..95a1dc0f2 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -6922,6 +6922,17 @@ it manages project dependencies, gives diffs jars, and much more.")
        ("promise" ,java-osgi-util-promise)
        ("osgi" ,java-osgi-core)))))
 
+(define-public java-aqute-bndlib-bootstrap
+  (package
+    (inherit java-aqute-bndlib)
+    (name "java-aqute-bndlib-bootstrap")
+    (inputs
+     `(("slf4j-bootstrap" ,java-slf4j-api-bootstrap)
+       ("java-aqute-libg-bootstrap" ,java-aqute-libg-bootstrap)
+       ,@(delete `("slf4j" ,java-slf4j-api)
+                 (delete `("java-aqute-libg" ,java-aqute-libg)
+                         (package-inputs java-aqute-bndlib)))))))
+
 (define-public java-ops4j-pax-tinybundles
   (package
     (name "java-ops4j-pax-tinybundles")
-- 
2.16.2

[bug#31152] [PATCH 4/4] gnu: Add java-asm-bootstrap.

[Gábor Boskovits]

* gnu/packages/java.scm (java-asm-bootstrap): New variable.
---
 gnu/packages/java.scm | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 95a1dc0f2..ee6a07af4 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -3526,6 +3526,21 @@ transformations and analysis algorithms allow to easily assemble custom
 complex transformations and code analysis tools.")
     (license license:bsd-3)))
 
+(define-public java-asm-bootstrap
+  (package
+    (inherit java-asm)
+    (name "java-asm-bootstrap")
+    (arguments
+     (substitute-keyword-arguments (package-arguments java-asm)
+       ((#:tests? _) #f)))
+    (native-inputs `())
+    (propagated-inputs
+     `(("java-aqute-bndlib" ,java-aqute-bndlib-bootstrap)
+       ("java-aqute-libg" ,java-aqute-libg-bootstrap)
+       ,@(delete `("java-aqute-bndlib" ,java-aqute-bndlib)
+                 (delete `("java-aqute-libg", java-aqute-libg)
+                         (package-inputs java-asm)))))))
+
 (define-public java-cglib
   (package
     (name "java-cglib")
-- 
2.16.2

[bug#31152] [PATCH 0/4] Bootstrap java-jarjar.

[Julien Lepiller]

Le Sat, 14 Apr 2018 15:50:39 +0200,
Gábor Boskovits <boskovits@gmail.com> a écrit :

> *** BLURB HERE ***
> 
> This patch series introduces the packages required to remove the
> bundled asm from jarjar. This is encouraged by current policy
> and needed by switching to java8, as the bundled asm version
> is too old.
> 
> Gábor Boskovits (4):
>   gnu: Add java-slfj4-api-bootstrap.
>   gnu: Add java-aqute-libg-bootstrap.
>   gnu: Add java-aqute-bndlib-bootstrap.
>   gnu: Add java-asm-bootstrap.
> 
>  gnu/packages/java.scm | 44
> ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44
> insertions(+)
> 

Hi Gábor,

I haven't tested these patches yet, but do you really need to define
them public? Otherwise LGTM.

bug#31152: [PATCH 0/4] Bootstrap java-jarjar.

[Julien Lepiller]

Le Sat, 14 Apr 2018 15:50:39 +0200,
Gábor Boskovits <boskovits@gmail.com> a écrit :

> *** BLURB HERE ***
> 
> This patch series introduces the packages required to remove the
> bundled asm from jarjar. This is encouraged by current policy
> and needed by switching to java8, as the bundled asm version
> is too old.
> 
> Gábor Boskovits (4):
>   gnu: Add java-slfj4-api-bootstrap.
>   gnu: Add java-aqute-libg-bootstrap.
>   gnu: Add java-aqute-bndlib-bootstrap.
>   gnu: Add java-asm-bootstrap.
> 
>  gnu/packages/java.scm | 44
> ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44
> insertions(+)
> 

Pushed as bfb4004d3463a6857ff0aaeb9513a55c262970f0 with suggested
modifications (define-public -> define).