[bug#29697] Small fixes for java-powermock

[bug#29697] Small fixes for java-powermock

[Julien Lepiller]

[-- Attachment #1: Type: text/plain, Size: 75 bytes --]

Hi, these two patches should fix runtime issues with our powermock
package.

[-- Attachment #2: 0001-gnu-java-powermock-core-Include-resources.patch --]
[-- Type: text/x-patch, Size: 1205 bytes --]

From 6ec54c532fe4613685ca6587ae413d4c285ac8c4 Mon Sep 17 00:00:00 2001
From: Julien Lepiller <julien@lepiller.eu>
Date: Wed, 13 Dec 2017 21:18:50 +0100
Subject: [PATCH 1/2] gnu: java-powermock-core: Include resources.

* gnu/packages/java.scm (java-powermock-core)[arguments]: Add a phase to
include resources.
---
 gnu/packages/java.scm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 0be488dec..98391ab24 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -7418,7 +7418,13 @@ done to the IDE or continuous integration servers which simplifies adoption.")
        #:source-dir "powermock-core/src/main/java"
        #:test-dir "powermock-core/src/test"
        #:tests? #f; requires powermock-api
-       #:jdk ,icedtea-8))
+       #:jdk ,icedtea-8
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'build 'copy-resources
+           (lambda _
+             (copy-recursively "powermock-core/src/main/resources"
+                               "build/classes"))))))
     (inputs
      `(("reflect" ,java-powermock-reflect)
        ("javassist" ,java-jboss-javassist)))
-- 
2.15.0


[-- Attachment #3: 0002-gnu-java-powermock-modules-junit4-Fix-junit-version-.patch --]
[-- Type: text/x-patch, Size: 1483 bytes --]

From b9631e4fda41168e46b415e250d65db96ce0c9cb Mon Sep 17 00:00:00 2001
From: Julien Lepiller <julien@lepiller.eu>
Date: Wed, 13 Dec 2017 21:20:30 +0100
Subject: [PATCH 2/2] gnu: java-powermock-modules-junit4: Fix junit version
 detection.

* gnu/packages/java.scm (java-powermock-modules-junit4)[arguments]: Fix
junit version detection.
---
 gnu/packages/java.scm | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 98391ab24..2a8080eb3 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -7473,7 +7473,15 @@ done to the IDE or continuous integration servers which simplifies adoption.")
      `(#:jar-name "java-powermock-modules-junit4.jar"
        #:jdk ,icedtea-8
        #:source-dir "powermock-modules/powermock-module-junit4/src/main/java"
-       #:test-dir "powermock-modules/powermock-module-junit4/src/test"))
+       #:test-dir "powermock-modules/powermock-module-junit4/src/test"
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'build 'fix-junit-detection
+           (lambda _
+             ;; Our junit version is 4.12-SNAPSHOT
+             (substitute* (find-files "powermock-modules/powermock-module-junit4"
+                                      "PowerMockJUnit4MethodValidator.java")
+               (("4.12") "4.12-SNAPSHOT")))))))
     (inputs
      `(("core" ,java-powermock-core)
        ("reflect" ,java-powermock-reflect)
-- 
2.15.0

[bug#29697] Patch review

[Gábor Boskovits]

[-- Attachment #1: Type: text/plain, Size: 389 bytes --]

This bug seems to be not touched for a while. I like the first patch, but
I'd like to know if we could extract the package version from the input in
the second package instead, for example with 'package-version' ? That way
we could decouple the packages, so that they can be updated independently.
If not, please add a comment to junit, that java-powermock needs to be also
updated. WDYT?

[-- Attachment #2: Type: text/html, Size: 423 bytes --]

bug#29697: Small fixes for java-powermock

[Gábor Boskovits]

[-- Attachment #1: Type: text/plain, Size: 126 bytes --]

Closing, already on master as 1124683d8cfddf7869c52ff2a4e4fb402a36ac88,
and 59e0021cc79b577daaf0f23a9f0b93e166400261. Thanks!

[-- Attachment #2: Type: text/html, Size: 160 bytes --]