From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38012) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ePDjB-0002wQ-TT for guix-patches@gnu.org; Wed, 13 Dec 2017 15:34:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ePDj8-0006Te-NU for guix-patches@gnu.org; Wed, 13 Dec 2017 15:34:05 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:52162) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ePDj8-0006TT-JN for guix-patches@gnu.org; Wed, 13 Dec 2017 15:34:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ePDj8-0005QB-Au for guix-patches@gnu.org; Wed, 13 Dec 2017 15:34:02 -0500 Subject: [bug#29697] Small fixes for java-powermock Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:37893) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ePDiW-0002t5-1C for guix-patches@gnu.org; Wed, 13 Dec 2017 15:33:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ePDiS-0005kr-Rs for guix-patches@gnu.org; Wed, 13 Dec 2017 15:33:24 -0500 Received: from lepiller.eu ([2a00:5884:8208::1]:37910) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ePDiS-0005hl-Gb for guix-patches@gnu.org; Wed, 13 Dec 2017 15:33:20 -0500 Received: from localhost (static-176-182-42-79.ncc.abo.bbox.fr [176.182.42.79]) by lepiller.eu (OpenSMTPD) with ESMTPSA id a17ffa47 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for ; Wed, 13 Dec 2017 20:36:17 +0000 (UTC) Date: Wed, 13 Dec 2017 21:30:43 +0100 From: Julien Lepiller Message-ID: <20171213212417.41463b57@lepiller.eu> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="MP_/pz2ihaJ2scbLrLjJRQ6qHaI" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 29697@debbugs.gnu.org --MP_/pz2ihaJ2scbLrLjJRQ6qHaI Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline Hi, these two patches should fix runtime issues with our powermock package. --MP_/pz2ihaJ2scbLrLjJRQ6qHaI Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0001-gnu-java-powermock-core-Include-resources.patch >From 6ec54c532fe4613685ca6587ae413d4c285ac8c4 Mon Sep 17 00:00:00 2001 From: Julien Lepiller 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 --MP_/pz2ihaJ2scbLrLjJRQ6qHaI Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0002-gnu-java-powermock-modules-junit4-Fix-junit-version-.patch >From b9631e4fda41168e46b415e250d65db96ce0c9cb Mon Sep 17 00:00:00 2001 From: Julien Lepiller 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 --MP_/pz2ihaJ2scbLrLjJRQ6qHaI--