From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id WMyGBHs9AmIcAwAAgWs5BA (envelope-from ) for ; Tue, 08 Feb 2022 10:52:59 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id QIT4AXs9AmIoHQAA9RJhRA (envelope-from ) for ; Tue, 08 Feb 2022 10:52:59 +0100 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 4DEA8889F for ; Tue, 8 Feb 2022 10:52:58 +0100 (CET) Received: from localhost ([::1]:55516 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHNBB-0001Qu-FV for larch@yhetil.org; Tue, 08 Feb 2022 04:52:57 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59996) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHN1a-0008VX-UA for guix-patches@gnu.org; Tue, 08 Feb 2022 04:43:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:51423) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nHN1a-0006tE-Kn for guix-patches@gnu.org; Tue, 08 Feb 2022 04:43:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nHN1a-0004ne-K8 for guix-patches@gnu.org; Tue, 08 Feb 2022 04:43:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53872] [PATCH] gnu: maven: Use required logger Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 08 Feb 2022 09:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 53872 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53872@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.164431337918439 (code B ref -1); Tue, 08 Feb 2022 09:43:02 +0000 Received: (at submit) by debbugs.gnu.org; 8 Feb 2022 09:42:59 +0000 Received: from localhost ([127.0.0.1]:45320 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHN1X-0004nK-24 for submit@debbugs.gnu.org; Tue, 08 Feb 2022 04:42:59 -0500 Received: from lists.gnu.org ([209.51.188.17]:43970) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHN1U-0004nC-NN for submit@debbugs.gnu.org; Tue, 08 Feb 2022 04:42:57 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59966) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHN1S-0008OP-RF for guix-patches@gnu.org; Tue, 08 Feb 2022 04:42:56 -0500 Received: from [2a00:5884:8208::1] (port=36150 helo=lepiller.eu) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHN1P-0006qJ-TG for guix-patches@gnu.org; Tue, 08 Feb 2022 04:42:54 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 908e38db for ; Tue, 8 Feb 2022 09:42:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=date:from :to:subject:message-id:mime-version:content-type; s=dkim; bh=co0 LucUHbBfUxhFjpqYxR4Gm0ybCROeayijRhcLos0g=; b=IHWAyVA25oVrMZGDpFW xYx/4wI3St0TrrJvMPh0uazqVsmCOhB4mIa6vl7vWWSp1q2+krT97kpoepS/f48L +2NTkRMhU3YUbf5CEivS8GVxkl3iLmHIuFkCaQNEo0G+1Sms1mZYjTKSv+003CTT R5Niht7p19P4S2JWVJr/NV5ZWS4d9VX+Rv2eklzrelDNYGNqM3XP8xLjQCdQFhjD CRR4iAvv2XeOF2oARs5dIWGmSoc0xv6qo5wnn00LpoS65XxwCEgdmIG2r1MHVwZs GAmAHh3LvgcEFzgTJLUQ2n+bL7Bc/rF3nrBkQhVqgZUGWeKumtnBKZNcNoBiZft/ Nyw== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 5ffb27ee (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for ; Tue, 8 Feb 2022 09:42:44 +0000 (UTC) Date: Tue, 8 Feb 2022 10:42:31 +0100 From: Julien Lepiller Message-ID: <20220208104231.415fc1ba@tachikoma.lepiller.eu> X-Mailer: Claws Mail 4.0.0 (GTK+ 3.24.30; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="MP_/2OmwrLVZUR7Dginih4pf=.u" X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:5884:8208::1 (failed) Received-SPF: pass client-ip=2a00:5884:8208::1; envelope-from=julien@lepiller.eu; helo=lepiller.eu X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RDNS_NONE=0.793, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action 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 X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1644313978; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:list-id:list-help:list-unsubscribe:list-subscribe: list-post:dkim-signature; bh=h7sDdkw2aa4oOBSuyDHyTV8AqfSgjUjY/QnzI/fM5iQ=; b=cF+VIb9LHV37hDok8qUJbfvF5N0hPaNTQxO/GmXKLQQi33EVgmMhhZO8srJKdQhT+DCpx7 sj8GClbdaFWuWFUFk7zIUPBKoaGhnYn/+azpIDZRLM+zZviOAKlByt/GsPvcKK+DzJvh4n 8tnqcZXrAXScHCmC9yarZdqPgMOJs6tcfql6oX0izctXNT0juA6WMD5pWlU1WN25160nNC 2JS+2191b5mSxHlsW1Lhdzu+eTaAJHSCWTUbOZaH77777ZGDHVuPeUZc23pA4Brd6vH9rR O4ZSvRhp38NyESCwgdNZqC0pwKv1tWOzFpAii3O7GiuviAfz0BpTFSW3tAeh/A== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1644313978; a=rsa-sha256; cv=none; b=Ay41J6yl7joVVr2d2JDkor9efcKM8Twpr81+94NqWEBINwZ9wA0ygBy7lCUXPBXaPq1IgH VzcwCe5YP3XR/elm8UadiHA36A5pWpf1XmBbEQMjHMd1v1U+hLoktl3u5brTSuAns2JAO0 KLHREHPbjvdNXv3WTLPBPLqoTMlCSttzTOo1qy3V/IDiXdqXtuHRyIom8oyzxRLLOOU1aH tVY5yK7zAmyG7keYBIk77ctj3DLxjB6R8CHJUPEh8qwMHUYXUMaH6+InCTJVby1CfYmqay rgYAGLUiKOMTaU4YPLAlJxpkjpE0p5THKXo3liOAplu2+8zDSFtto2o6N4homw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lepiller.eu header.s=dkim header.b=IHWAyVA2; dmarc=fail reason="SPF not aligned (relaxed)" header.from=lepiller.eu (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -3.63 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lepiller.eu header.s=dkim header.b=IHWAyVA2; dmarc=fail reason="SPF not aligned (relaxed)" header.from=lepiller.eu (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 4DEA8889F X-Spam-Score: -3.63 X-Migadu-Scanner: scn0.migadu.com X-TUID: irHP6ivygNPh --MP_/2OmwrLVZUR7Dginih4pf=.u Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline Hi Guix! I figured there was a small issue with our maven package. It warns that the current logger is not supported, and lists no supported logger. This is because I forgot to copy resources in maven-embedder (first patch). I also noticed I missed resources in maven-compat, so I fixed that in the second patch. Then, maven uses its own logger instead of a default one, even if it does support slf4j-simple. The third patch adds maven-slf4j-wrapper. It is essentially a fork of slf4j-simple, but the way it's written requires me to copy most of slf4j-simple's sources. The last patch switches the use of slf4j-simple to maven-slf4j-provider. I checked that java-jmh still builds properly with this change, and no warnings are shown about the logger anymore. --MP_/2OmwrLVZUR7Dginih4pf=.u Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0001-gnu-maven-embedder-Install-resources.patch >From 6af76778dd0fb3436e673ee00984fb87fb72cdde Mon Sep 17 00:00:00 2001 Message-Id: <6af76778dd0fb3436e673ee00984fb87fb72cdde.1644313064.git.julien@lepiller.eu> From: Julien Lepiller Date: Tue, 8 Feb 2022 10:20:28 +0100 Subject: [PATCH 1/4] gnu: maven-embedder: Install resources. * gnu/packages/maven.scm (maven-embedder)[arguments]: Add copy-resources phase. --- gnu/packages/maven.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index ba4f111930..b7ae2cc225 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -1791,6 +1791,10 @@ (define-public maven-embedder (invoke "./sisu.sh" "maven-embedder/src/main/java" "build/classes/META-INF/sisu/javax.inject.Named") #t)) + (add-before 'build 'copy-resources + (lambda _ + (mkdir-p "build/classes/") + (copy-recursively "maven-embedder/src/main/resources" "build/classes"))) (add-before 'build 'generate-models (lambda* (#:key inputs #:allow-other-keys) (define (modello-single-mode file version mode) -- 2.34.0 --MP_/2OmwrLVZUR7Dginih4pf=.u Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0002-gnu-maven-compat-Install-resources.patch >From 3b44f6052ce0d9aa65d2642f8561d585fbdb8dd3 Mon Sep 17 00:00:00 2001 Message-Id: <3b44f6052ce0d9aa65d2642f8561d585fbdb8dd3.1644313064.git.julien@lepiller.eu> In-Reply-To: <6af76778dd0fb3436e673ee00984fb87fb72cdde.1644313064.git.julien@lepiller.eu> References: <6af76778dd0fb3436e673ee00984fb87fb72cdde.1644313064.git.julien@lepiller.eu> From: Julien Lepiller Date: Tue, 8 Feb 2022 10:24:41 +0100 Subject: [PATCH 2/4] gnu: maven-compat: Install resources. * gnu/packages/maven.scm (maven-compat)[arguments]: Add copy-resources phase. --- gnu/packages/maven.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index b7ae2cc225..b95aec121b 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -2000,6 +2000,10 @@ (define-public maven-compat (modello-single-mode file "1.0.0" "xpp3-reader") (modello-single-mode file "1.0.0" "xpp3-writer")) #t)) + (add-before 'build 'copy-resources + (lambda _ + (mkdir-p "build/classes/") + (copy-recursively "src/main/resources" "build/classes"))) (add-after 'build 'generate-metadata (lambda _ (invoke "java" "-cp" (string-append (getenv "CLASSPATH") ":build/classes") -- 2.34.0 --MP_/2OmwrLVZUR7Dginih4pf=.u Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0003-gnu-Add-maven-slf4j-provider.patch >From 9eef3c21cc802abf76f4037000a378d8cb4f7812 Mon Sep 17 00:00:00 2001 Message-Id: <9eef3c21cc802abf76f4037000a378d8cb4f7812.1644313064.git.julien@lepiller.eu> In-Reply-To: <6af76778dd0fb3436e673ee00984fb87fb72cdde.1644313064.git.julien@lepiller.eu> References: <6af76778dd0fb3436e673ee00984fb87fb72cdde.1644313064.git.julien@lepiller.eu> From: Julien Lepiller Date: Tue, 8 Feb 2022 10:26:22 +0100 Subject: [PATCH 3/4] gnu: Add maven-slf4j-provider. * gnu/packages/maven.scm (maven-slf4-provider): New variable. --- gnu/packages/maven.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index b95aec121b..cf07c08b8e 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -1772,6 +1772,40 @@ (define-public maven-core ("maven-core-boot" ,maven-core-bootstrap) ,@(package-native-inputs maven-core-bootstrap))))) +(define-public maven-slf4j-provider + (package + (inherit maven-artifact) + (name "maven-slf4j-provider") + (arguments + `(#:jar-name "maven-slf4j-provider.jar" + #:source-dir "maven-slf4j-provider/src/main/java" + #:tests? #f; no tests + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'unpack-slf4j + (lambda* (#:key inputs #:allow-other-keys) + (mkdir-p "generated-sources") + (with-directory-excursion "generated-sources" + (invoke "tar" "xf" (assoc-ref inputs "java-slf4j-simple-source")) + (for-each delete-file (find-files "." "StaticLoggerBinder.java"))) + (for-each + (lambda (simple) + (for-each + (lambda (java) + (copy-file java + (string-append + "maven-slf4j-provider/src/main/java/org/slf4j/impl/" + (basename java)))) + (find-files (string-append simple "/src/main/java/") "\\.java$"))) + (find-files "generated-sources" "slf4j-simple" #:directories? #t)))) + (replace 'install + (install-from-pom "maven-slf4j-provider/pom.xml"))))) + (inputs + `(("java-slf4j-api" ,java-slf4j-api) + ("java-slf4j-simple-source" ,(package-source java-slf4j-simple)) + ("maven-shared-utils" ,maven-shared-utils))) + (native-inputs (list unzip)))) + (define-public maven-embedder (package (inherit maven-artifact) -- 2.34.0 --MP_/2OmwrLVZUR7Dginih4pf=.u Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0004-gnu-maven-Use-maven-slf4j-provider-instead-of-slf4j-.patch >From e7fe8f9973b32d8f6114dbf4aee3807adf2c8fb5 Mon Sep 17 00:00:00 2001 Message-Id: In-Reply-To: <6af76778dd0fb3436e673ee00984fb87fb72cdde.1644313064.git.julien@lepiller.eu> References: <6af76778dd0fb3436e673ee00984fb87fb72cdde.1644313064.git.julien@lepiller.eu> From: Julien Lepiller Date: Tue, 8 Feb 2022 10:32:32 +0100 Subject: [PATCH 4/4] gnu: maven: Use maven-slf4j-provider instead of slf4j-simple. Maven uses its own slf4j implementation, not the default one. The main difference is the color on the output. * gnu/packages/maven.scm (maven-wagon-http, maven-embedder, maven-compat) (maven): Replace slf4j-simple with maven-slf4j-provider. --- gnu/packages/maven.scm | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index cf07c08b8e..edf93f276b 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -1088,6 +1088,7 @@ (define-public maven-wagon-http ("java-plexus-cli" ,java-plexus-cli) ("maven-plugin-api" ,maven-plugin-api) ("maven-plugin-annotations" ,maven-plugin-annotations) + ("maven-slf4j-provider" ,maven-slf4j-provider) ("maven-core" ,maven-core) ("maven-model" ,maven-model) ("java-commons-cli" ,java-commons-cli) @@ -1106,7 +1107,6 @@ (define-public maven-wagon-http ("java-commons-codec" ,java-commons-codec) ("java-commons-io" ,java-commons-io) ("java-jsoup" ,java-jsoup) - ("java-slf4j-simple" ,java-slf4j-simple) ,@(package-native-inputs maven-wagon-provider-api))) (synopsis "Wagon provider that gets and puts artifacts through HTTP(S)") (description "Maven Wagon is a transport abstraction that is used in Maven's @@ -1874,6 +1874,7 @@ (define-public maven-embedder ("maven-settings" ,maven-settings) ("maven-settings-builder" ,maven-settings-builder) ("maven-shared-utils" ,maven-shared-utils) + ("maven-slf4j-provider" ,maven-slf4j-provider) ("java-plexus-classworlds" ,java-plexus-classworlds) ("java-plexus-util" ,java-plexus-utils) ("java-eclipse-sisu-plexus" ,java-eclipse-sisu-plexus) @@ -1891,7 +1892,6 @@ (define-public maven-embedder ("java-guice" ,java-guice) ("java-javax-inject" ,java-javax-inject) ("java-slf4j-api" ,java-slf4j-api) - ("java-slf4j-simple" ,java-slf4j-simple) ("java-jsr250" ,java-jsr250))) (native-inputs `(("java-asm-8" ,java-asm-8) @@ -2122,8 +2122,8 @@ (define-public maven-compat ("java-commons-lang3" ,java-commons-lang3) ("java-aop" ,java-aopalliance) ("maven-resolver-provider" ,maven-resolver-provider) + ("maven-slf4j-provider" ,maven-slf4j-provider) ("java-slf4j-api" ,java-slf4j-api) - ("java-slf4j-simple" ,java-slf4j-simple) ,@(package-inputs java-slf4j-api))) (description "Apache Maven is a software project management and comprehension tool. This package contains Maven2 classes maintained as compatibility @@ -2161,7 +2161,8 @@ (define-public maven "maven-repository-metadata" "maven-shared-utils" "maven-resolver-api" "maven-resolver-spi" "maven-resolver-util" "maven-resolver-impl" "maven-resolver-connector-basic" "maven-resolver-provider" - "maven-resolver-transport-wagon" "maven-wagon-provider-api" + "maven-resolver-transport-wagon" "maven-slf4j-provider" + "maven-wagon-provider-api" "maven-wagon-file" "maven-wagon-http" "java-commons-logging-minimal" "java-httpcomponents-httpclient" "java-httpcomponents-httpcore" "maven-wagon-http-shared" "maven-wagon-tck-http" @@ -2171,8 +2172,7 @@ (define-public maven "java-plexus-utils" "java-plexus-interpolation" "java-plexus-sec-dispatcher" "java-plexus-cipher" "java-guava" "java-jansi" "java-jsr250" "java-cdi-api" "java-commons-cli" - "java-commons-io" "java-commons-lang3" "java-slf4j-api" - "java-slf4j-simple")))) + "java-commons-io" "java-commons-lang3" "java-slf4j-api")))) (substitute* "apache-maven/src/bin/mvn" (("cygwin=false;") (string-append @@ -2218,6 +2218,7 @@ (define-public maven maven-resolver-connector-basic maven-resolver-provider maven-resolver-transport-wagon + maven-slf4j-provider maven-wagon-provider-api maven-wagon-file maven-wagon-http @@ -2245,9 +2246,7 @@ (define-public maven java-commons-cli java-commons-io java-commons-lang3 - java-slf4j-api - ;; TODO: replace with maven-slf4j-provider - java-slf4j-simple)) + java-slf4j-api)) (propagated-inputs (list coreutils which)) (description "Apache Maven is a software project management and comprehension -- 2.34.0 --MP_/2OmwrLVZUR7Dginih4pf=.u--