From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id oBoqEVFntWA3PAAAgWs5BA (envelope-from ) for ; Tue, 01 Jun 2021 00:46:41 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id 0FWlDFFntWDbOgAA1q6Kng (envelope-from ) for ; Mon, 31 May 2021 22:46:41 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id F14A728C69 for ; Tue, 1 Jun 2021 00:46:40 +0200 (CEST) Received: from localhost ([::1]:53088 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lnqgC-0008Fj-2h for larch@yhetil.org; Mon, 31 May 2021 18:46:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54978) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lnqfc-0007ZO-5L for guix-patches@gnu.org; Mon, 31 May 2021 18:46:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51890) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lnqfb-0008Gl-ST for guix-patches@gnu.org; Mon, 31 May 2021 18:46:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lnqfb-000449-R5 for guix-patches@gnu.org; Mon, 31 May 2021 18:46:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48766] [PATCH 14/14] gnu: java-jmh: Switch to maven-build-system. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 31 May 2021 22:46:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48766 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48766@debbugs.gnu.org Received: via spool by 48766-submit@debbugs.gnu.org id=B48766.162250111715531 (code B ref 48766); Mon, 31 May 2021 22:46:03 +0000 Received: (at 48766) by debbugs.gnu.org; 31 May 2021 22:45:17 +0000 Received: from localhost ([127.0.0.1]:35199 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lnqer-00042L-Dc for submit@debbugs.gnu.org; Mon, 31 May 2021 18:45:17 -0400 Received: from lepiller.eu ([89.234.186.109]:38956) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lnqeM-0003xU-UU for 48766@debbugs.gnu.org; Mon, 31 May 2021 18:44:47 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id b9b755f2 for <48766@debbugs.gnu.org>; Mon, 31 May 2021 22:44:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=U3u5y/mW3Er6It0aR3zq9awiE eRnpgE/0mC3oTP6MJw=; b=jnmXcQGO9f/iO3fBylBHUPfTD3Aj3amgqL4pjnQDL 6KGxWxZCcbOGSAGnLMwnwtRlWm+t6nsmwVkDPXcel3ou2+EZQWLUZOCxeb23T1i2 n8RDnVyHKBwEyz9tTjVlmlZ0lrHelvJ613Fl6n4VqgCrUPuYX3ba+ee2uLvO2t0t tOzJ1bS81HfwyIPSbV3RcoGkMXMCmfUd5fVzHFuWxK9IZvy8qq3olklU9SxljT5F bk9A/agWDaNVxD43Np9SXXUCNMhTjk9onHL6t1yOt5CoIsDpa/bZqv0VqQZf64YH iC27ClOdlNF3WyhPJD+LAhs7Ipdwp4LtqvuHcFdNThf4w== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 27ba40a7 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <48766@debbugs.gnu.org>; Mon, 31 May 2021 22:44:42 +0000 (UTC) From: Julien Lepiller Date: Tue, 1 Jun 2021 00:44:27 +0200 Message-Id: <20210531224427.13300-14-julien@lepiller.eu> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210531224427.13300-1-julien@lepiller.eu> References: <20210601004100.69baa2d0@tachikoma.lepiller.eu> <20210531224427.13300-1-julien@lepiller.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1622501201; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=OS13RLQriZTEkAa5L3PaAzAw0xtY4mWx/OLU572l0iE=; b=U0Ev3t5LCGhCY8JAZmHrZK8PelnATxyZLRWI7HHLPgyo9+Bn2Ojh+633WSvr1a09CSjLb0 WJGxaS6+SBJuzzkXJvCGoNGQEBT2Q4RUNSLb1tXZRHwBew3F4Fv3FXmBQAJIXaZh3vkIWB ynjwt14B17u2WsNbbhz03qIRp+oHWORSIU5UinmGM5mWxsug3Nu2jQH6VDPdRh/aIo3t/R oRqMMIPWigogOrm60YricqXkslSTcoeXCJXe8r3LMdt+ffVWHaI9F5o0W/lYz0vH6uR1E7 yehjyreakX/Fu/mRKBcUct7S4fi7rNMoKO3vLdMeaENb3/ZnLowylmNGwFcGUQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1622501201; a=rsa-sha256; cv=none; b=B3lw9lwUrx4bEVmmFX+Tk7gyZFktqwhzGIotkpxh/5q9zsQ7idyV2iSV/N609g0/RhdZ/J BAUdDsEkubn4yZC5P+lRJkiQWzxtJqLqjmfdWv18oapooPzrafDuLobN/h+6ZkejvQfk+k qoNkOH9VGeZBLz7BDP/rbqmdaiUNYZX3KyfH40t6+OFaNwSXNPpPv2armklWQblPFhdp/4 EmnM09MjmjKpavrzQ/nGuYyjBYItiQKvMsmrRDSV3wFsNpZH5dRB3miIPHsvr5+va7vqu6 Hl2BgN4J9CxenBogy+ajWbkbulEXZKViK9x27TWVbyvxez+Ija6AqwD6V701KA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lepiller.eu header.s=dkim header.b=jnmXcQGO; dmarc=fail reason="SPF not aligned (relaxed)" header.from=lepiller.eu (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 3.67 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lepiller.eu header.s=dkim header.b=jnmXcQGO; dmarc=fail reason="SPF not aligned (relaxed)" header.from=lepiller.eu (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: F14A728C69 X-Spam-Score: 3.67 X-Migadu-Scanner: scn0.migadu.com X-TUID: 3TgB3kXJv8Ke * gnu/packages/java.scm (java-jmh): Switch to maven-build-system. --- gnu/packages/java.scm | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index c7ae002736..f597c64811 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -43,6 +43,7 @@ #:use-module (guix utils) #:use-module (guix build-system ant) #:use-module (guix build-system gnu) + #:use-module (guix build-system maven) #:use-module (guix build-system trivial) #:use-module (gnu packages) #:use-module (gnu packages attr) @@ -5813,26 +5814,27 @@ available in the Java programming language or Commons Lang.") (sha256 (base32 "0i7fa7l3gdqkkgz5ddayp6m46dgbj9rqlz35xffrcbyiz3gpljy0")))) - (build-system ant-build-system) + (build-system maven-build-system) (arguments - `(#:jar-name "jmh-core.jar" - #:source-dir "jmh-core/src/main" - #:test-dir "jmh-core/src/test" + `(#:exclude + (("org.apache.maven.plugins" . + ("maven-source-plugin" "maven-archetype-plugin" "maven-shade-plugin" + "maven-site-plugin" "maven-javadoc-plugin" "maven-eclipse-plugin")) + ("com.mycila.maven-license-plugin" . ("maven-license-plugin")) + ("org.apache.maven.wagon" . ("wagon-ssh"))) + #:maven-plugins + (("maven-enforcer-plugin" ,maven-enforcer-plugin) + ,@(default-maven-plugins)) #:phases (modify-phases %standard-phases - ;; This seems to be a bug in the JDK. It may not be necessary in - ;; future versions of the JDK. - (add-after 'unpack 'fix-bug + (add-after 'unpack 'remove-unnecessary (lambda _ - (with-directory-excursion - "jmh-core/src/main/java/org/openjdk/jmh/runner/options" - (substitute* '("IntegerValueConverter.java" - "ThreadsValueConverter.java") - (("public Class valueType") - "public Class valueType"))) - #t))))) - (inputs - `(("java-jopt-simple" ,java-jopt-simple) + ;; requires org.apache.maven.archetype:archetype-packaging. + ;; Its subprojects also require groovy, kotlin and scala, + ;; respectively. + (delete-file-recursively "jmh-archetypes")))))) + (propagated-inputs + `(("java-jopt-simple" ,java-jopt-simple-4) ("java-commons-math3" ,java-commons-math3))) (native-inputs `(("java-junit" ,java-junit) -- 2.31.1