From debbugs-submit-bounces@debbugs.gnu.org Wed Nov 01 08:54:52 2023 Received: (at submit) by debbugs.gnu.org; 1 Nov 2023 12:54:52 +0000 Received: from localhost ([127.0.0.1]:50142 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyAkG-0007M9-Df for submit@debbugs.gnu.org; Wed, 01 Nov 2023 08:54:52 -0400 Received: from lists.gnu.org ([2001:470:142::17]:51048) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyAkD-0007Lr-K9 for submit@debbugs.gnu.org; Wed, 01 Nov 2023 08:54:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qyAjY-0003Zj-Jv for guix-patches@gnu.org; Wed, 01 Nov 2023 08:54:09 -0400 Received: from lepiller.eu ([89.234.186.109] helo=localhost) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qyAjW-0007EH-OD for guix-patches@gnu.org; Wed, 01 Nov 2023 08:54:08 -0400 Received: from localhost (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id fa2f50f3 for ; Wed, 1 Nov 2023 12:54:01 +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 :content-transfer-encoding; s=dkim; bh=kMZTAGE3xoCD+YvndaFD6c+U+ J41HFOKPY5tqjWGhoo=; b=KyFzjj3mrTHi+UTs6SkpFhDaVIUYUV3RddmaQIQb2 hKr9YJMNhXBWhDn5yk91PDxYpzcWAe6MXDMPKxnuUvslKBtQucUDOb7cudeuiWwJ 7Nw0s90lz0x7DvKUyaLP4GtZwO/87r/6GuY3s7VC5T5AcJI61ZC2i5b6MnYqfOQa Vn+4Fow7C+4IUNzXtyN6qhnZMbncmOAIHhdYHjRH7yImInXdqd2zfW38nTZOsuVa kKSUMLM0E4VQwB5BJTiPQVCRGaE+Rly462/PAUXBTimnQc6iiQ/1OWSKFBlooNkS QMmk++BFVe0c68CTOKnegcUSJMtJrm1LWajmM11n6LWBA== Received: by localhost (OpenSMTPD) with ESMTPSA id d70e97ce (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for ; Wed, 1 Nov 2023 12:54:01 +0000 (UTC) Date: Wed, 1 Nov 2023 13:53:38 +0100 From: Julien Lepiller To: guix-patches@gnu.org Subject: [PATCH] gnu: josm: Update to 18822. Message-ID: <20231101135338.2634f780@tachikoma.lepiller.eu> X-Mailer: Claws Mail 4.1.1 (GTK 3.24.37; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=89.234.186.109; envelope-from=julien@lepiller.eu; helo=localhost X-Spam_score_int: 17 X-Spam_score: 1.7 X-Spam_bar: + X-Spam_report: (1.7 / 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, FSL_HELO_NON_FQDN_1=0.001, HELO_LOCALHOST=3.828, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) Hi Guix! This small patch series updates josm to the latest version. Some issues I stumbled upon: josm now uses a different library for json parsing, which is added in the series. This library uses Java modules (introduced with java 9), so I had to fix the build system to allow modules, but not by default since we still use the old java 8 by default. Then, it built, but it had troubles validating SSL certificates at runtime, which is fixed in the series by using a similar phase to the one in icedtea to generate a key store from nss-certs. I managed to build a few JDK versions after OpenJDK 11, but I'll let CI tell us if I broke anything :) From debbugs-submit-bounces@debbugs.gnu.org Wed Nov 01 08:58:24 2023 Received: (at 66879) by debbugs.gnu.org; 1 Nov 2023 12:58:24 +0000 Received: from localhost ([127.0.0.1]:50150 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyAnf-0007T2-VV for submit@debbugs.gnu.org; Wed, 01 Nov 2023 08:58:24 -0400 Received: from lepiller.eu ([89.234.186.109]:57970 helo=localhost) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyAne-0007Sl-00 for 66879@debbugs.gnu.org; Wed, 01 Nov 2023 08:58:22 -0400 Received: from localhost (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id b7bfdf51 for <66879@debbugs.gnu.org>; Wed, 1 Nov 2023 12:57:46 +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=4z51zshDp9ll2plgeopuz24ND meOJlB72NJ5nPE43oE=; b=NCXf8EtmEgRDRhHPRoZAv6guvpejaq6Aj3oHv3I+6 UmFM3wgQkOAQN+jI96jmzKXoSM8/evuExNR3s+s+TDP1Za/0YEG6wB8ZqgfpY5Dv XdmtfNXFc4moPrx+1Zd7n2WPKbErp1MMiLT8l4EnLbH0SvVK3i5Th+fxgZCfFEKZ mbevclqgHvRsPz3jTGOZFVwrDNwRNBo/S0IrKhl40OQoAPI8RcijBIt1S8KZF54h cwn04tO2rFse15jEaxggQAYkqF1M5+ho67u+ZJKL3c/xafF3Jb076LG9N36SUKfg eh7REaXTxcjrfQNlx5STQMqO99IjevUcdi9F0dM6QQJwg== Received: by localhost (OpenSMTPD) with ESMTPSA id 3f442090 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <66879@debbugs.gnu.org>; Wed, 1 Nov 2023 12:57:45 +0000 (UTC) From: Julien Lepiller To: 66879@debbugs.gnu.org Subject: [PATCH 2/5] guix: ant: Optional build with java modules. Date: Wed, 1 Nov 2023 13:57:27 +0100 Message-ID: <1b6bf9340bf05c1c00c18bf69748950c4c9f95b5.1698843445.git.julien@lepiller.eu> X-Mailer: git-send-email 2.41.0 In-Reply-To: <1ba00a1093d068dafaef44959ee55a0999695d90.1698843445.git.julien@lepiller.eu> References: <1ba00a1093d068dafaef44959ee55a0999695d90.1698843445.git.julien@lepiller.eu> MIME-Version: 1.0 X-Debbugs-Cc: Björn Höfling , Julien Lepiller Content-Transfer-Encoding: 8bit X-Spam-Score: 3.6 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Modules were introduced in Java 9 and are not supported by the default icedtea compiler, so this feature is disabled by default. * guix/build-system/ant.scm (ant-build): Add use-java-modules? parameter. * guix/build/ant-build-system.scm (default-build.xml) (configure): Use it. Content analysis details: (3.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 HELO_LOCALHOST No description available. 0.0 FSL_HELO_NON_FQDN_1 No description available. -0.0 SPF_PASS SPF: sender matches SPF record X-Debbugs-Envelope-To: 66879 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.6 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Modules were introduced in Java 9 and are not supported by the default icedtea compiler, so this feature is disabled by default. * guix/build-system/ant.scm (ant-build): Add use-java-modules? parameter. * guix/build/ant-build-system.scm (default-build.xml) (configure): Use it. Content analysis details: (2.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 HELO_LOCALHOST No description available. 0.0 FSL_HELO_NON_FQDN_1 No description available. -0.0 SPF_PASS SPF: sender matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager Modules were introduced in Java 9 and are not supported by the default icedtea compiler, so this feature is disabled by default. * guix/build-system/ant.scm (ant-build): Add use-java-modules? parameter. * guix/build/ant-build-system.scm (default-build.xml) (configure): Use it. Change-Id: I3b99238e4cd262332fa5c818be1af5477c7374fd --- guix/build-system/ant.scm | 2 ++ guix/build/ant-build-system.scm | 31 +++++++++++++++++++++++-------- 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/guix/build-system/ant.scm b/guix/build-system/ant.scm index e191fd3c99..84bf951fab 100644 --- a/guix/build-system/ant.scm +++ b/guix/build-system/ant.scm @@ -103,6 +103,7 @@ (define* (ant-build name inputs (build-target "jar") (jar-name #f) (main-class #f) + (use-java-modules? #f) (test-include (list "**/*Test.java")) (test-exclude (list "**/Abstract*.java")) (source-dir "src") @@ -131,6 +132,7 @@ (define* (ant-build name inputs #:build-target #$build-target #:jar-name #$jar-name #:main-class #$main-class + #:use-java-modules? #$use-java-modules? #:test-include (list #$@test-include) #:test-exclude (list #$@test-exclude) #:source-dir #$source-dir diff --git a/guix/build/ant-build-system.scm b/guix/build/ant-build-system.scm index d29912bf59..ced34177f4 100644 --- a/guix/build/ant-build-system.scm +++ b/guix/build/ant-build-system.scm @@ -37,6 +37,7 @@ (define-module (guix build ant-build-system) (define* (default-build.xml jar-name prefix #:optional (source-dir ".") (test-dir "./test") (main-class #f) + (use-java-modules? #f) (test-include '("**/*Test.java")) (test-exclude '("**/Abstract*Test.java"))) "Create a simple build.xml with standard targets for Ant." @@ -65,7 +66,7 @@ (define* (default-build.xml jar-name prefix #:optional (value "first"))) (property (@ (environment "env"))) (path (@ (id "classpath")) - (pathelement (@ (location "${env.CLASSPATH}")))) + (pathelement (@ (path "${env.CLASSPATH}")))) (target (@ (name "manifest")) (mkdir (@ (dir "${manifest.dir}"))) @@ -79,18 +80,30 @@ (define* (default-build.xml jar-name prefix #:optional (mkdir (@ (dir "${classes.dir}"))) (javac (@ (includeantruntime "false") (srcdir ,source-dir) - (destdir "${classes.dir}") - (classpath (@ (refid "classpath")))))) + (destdir "${classes.dir}")) + ,(if use-java-modules? + `((modulepath (@ (refid "classpath")))) + '()) + (classpath (@ (refid "classpath"))))) (target (@ (name "compile-tests")) (mkdir (@ (dir "${test.classes.dir}"))) (javac (@ (includeantruntime "false") (srcdir ,test-dir) (destdir "${test.classes.dir}")) - (classpath - (pathelement (@ (path "${env.CLASSPATH}"))) - (pathelement (@ (location "${classes.dir}"))) - (pathelement (@ (location "${test.classes.dir}")))))) + ,(if use-java-modules? + `((classpath + (pathelement + (@ (path "${env.CLASSPATH}"))) + (pathelement + (@ (location "${classes.dir}"))) + (pathelement + (@ (location "${test.classes.dir}"))))) + '()) + (classpath + (pathelement (@ (path "${env.CLASSPATH}"))) + (pathelement (@ (location "${classes.dir}"))) + (pathelement (@ (location "${test.classes.dir}")))))) (target (@ (name "check") (depends "compile-tests")) @@ -156,13 +169,15 @@ (define* (configure #:key inputs outputs (jar-name #f) (source-dir "src") (test-dir "src/test") (main-class #f) + (use-java-modules? #f) (test-include '("**/*Test.java")) (test-exclude '("**/Abstract*.java")) #:allow-other-keys) (when jar-name (default-build.xml jar-name (string-append (assoc-ref outputs "out") "/share/java") - source-dir test-dir main-class test-include test-exclude)) + source-dir test-dir main-class use-java-modules? + test-include test-exclude)) (setenv "JAVA_HOME" (assoc-ref inputs "jdk")) (setenv "CLASSPATH" (generate-classpath inputs)) #t) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Nov 01 08:58:25 2023 Received: (at 66879) by debbugs.gnu.org; 1 Nov 2023 12:58:25 +0000 Received: from localhost ([127.0.0.1]:50152 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyAng-0007TC-L9 for submit@debbugs.gnu.org; Wed, 01 Nov 2023 08:58:24 -0400 Received: from lepiller.eu ([89.234.186.109]:57970 helo=localhost) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyAne-0007Sl-Rn for 66879@debbugs.gnu.org; Wed, 01 Nov 2023 08:58:23 -0400 Received: from localhost (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 2352dc25 for <66879@debbugs.gnu.org>; Wed, 1 Nov 2023 12:57:47 +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=awwLLdcfv7CmBaB3mBrEWOL3D ANCNH1YhP2rEU2/E+k=; b=MkAipwZkZTE3EdwToDtzjcWlACTnra896e1L13X4v 5kL9Kw+wd9xrGyl6jZLJvp6b9DvZ6/KQC80GYaR83KqiZO8uE9vZr7fumBMTQBEl Ce6JKAgjbsB21wJZNzyPdLn8NRd63Bn2P2/ZZNQekQ9fCYz3t2tH/058rRhetfSx oSOrkHWtq9NcHILWGiHlPU8VuWYZxSTO1FKUYITNiHQKDb+r1isArh1Vqb4WadQC 0JhG3Dry89C44PQhBxlJsmgZ9oiTm4ZmYuJm8eY+qcYbsyy6Hx69M/KiDHV7SPNt qQM/WpyuLJb/5MC/SoYt6Uo5hhJ3P3vsJribjCywthOVA== Received: by localhost (OpenSMTPD) with ESMTPSA id 1ac69426 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <66879@debbugs.gnu.org>; Wed, 1 Nov 2023 12:57:46 +0000 (UTC) From: Julien Lepiller To: 66879@debbugs.gnu.org Subject: [PATCH 3/5] gnu: Add java-jakarta-json. Date: Wed, 1 Nov 2023 13:57:28 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: <1ba00a1093d068dafaef44959ee55a0999695d90.1698843445.git.julien@lepiller.eu> References: <1ba00a1093d068dafaef44959ee55a0999695d90.1698843445.git.julien@lepiller.eu> MIME-Version: 1.0 X-Debbugs-Cc: Björn Höfling , Julien Lepiller Content-Transfer-Encoding: 8bit X-Spam-Score: 3.6 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/java.scm (java-jakarta-json): New variable. Change-Id: I2c123710f9d31bf71e8fb86ff0d336b6fcfa9674 --- gnu/packages/java.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) Content analysis details: (3.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 HELO_LOCALHOST No description available. 0.0 FSL_HELO_NON_FQDN_1 No description available. -0.0 SPF_PASS SPF: sender matches SPF record X-Debbugs-Envelope-To: 66879 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.6 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/java.scm (java-jakarta-json): New variable. Change-Id: I2c123710f9d31bf71e8fb86ff0d336b6fcfa9674 --- gnu/packages/java.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) Content analysis details: (2.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 HELO_LOCALHOST No description available. 0.0 FSL_HELO_NON_FQDN_1 No description available. -0.0 SPF_PASS SPF: sender matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * gnu/packages/java.scm (java-jakarta-json): New variable. Change-Id: I2c123710f9d31bf71e8fb86ff0d336b6fcfa9674 --- gnu/packages/java.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 567fb05f77..d80e0e9be8 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -13653,6 +13653,33 @@ (define-public java-jsonp-impl parse, generate, transform and query) JSON messages. This package contains a reference implementation of that API."))) +(define-public java-jakarta-json + (package + (name "java-jakarta-json") + (version "2.1.3") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jakartaee/jsonp-api") + (commit (string-append version "-RELEASE")))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1q600harqfhlf763l75j4fx7ai7ybp7ga06aiky2a2hg8mhz0s5f")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "jakarta-json.jar" + #:source-dir "api/src/main/java" + #:tests? #f; no tests + #:jdk ,openjdk11)) + (home-page "https://github.com/jakartaee/jsonp-api") + (synopsis "Portable API for JSON handling in Java") + (description "This project contains API and Compatible Implementation of +Jakarta JSON Processing specification. Jakarta JSON Processing provides +portable APIs to parse, generate, transform, and query JSON documents.") + ;; with classpath exception + (license license:epl2.0))) + (define-public java-xmp (package (name "java-xmp") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Nov 01 08:58:25 2023 Received: (at 66879) by debbugs.gnu.org; 1 Nov 2023 12:58:25 +0000 Received: from localhost ([127.0.0.1]:50155 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyAng-0007TJ-WF for submit@debbugs.gnu.org; Wed, 01 Nov 2023 08:58:25 -0400 Received: from lepiller.eu ([89.234.186.109]:57970 helo=localhost) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyAnf-0007Sl-Kr for 66879@debbugs.gnu.org; Wed, 01 Nov 2023 08:58:24 -0400 Received: from localhost (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id abb6f59a for <66879@debbugs.gnu.org>; Wed, 1 Nov 2023 12:57:48 +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=vbj+Kd8Pw+jNV/DwcrixkS9Jc NBAXP7J1pX1wvmC8iA=; b=it9h+40L9iaz44qPG0ZkOXFP661euEHH3k/pDMgJ3 aY5JKbD9X0OGZe7hdlKKMpfBLPKhy+hhNAjr6R3iSTpucWCq9rDX7ZHFDJXW7Hh0 ylfICqAzKK9Jib9LWCOYMM7691A6dBmmOt4WsNqGU6+PbrrSU0q/vZiZHB/3Zm+U jJ1rG7yTpW1adCsS068Yp/YBGly5Nnq1P1Qv8CfNe2Pe65jd46yaTdPv+8huEAWa jlaaOIi3vaiZtB54Xy/pyfoyq3dBr7d8QHkE8DnveR1/lhX41JzDWqoMvsViwc0N gQq57zRbwZKkvelznFo+JRN8mVHrWt6N2KOdOw3RXzevg== Received: by localhost (OpenSMTPD) with ESMTPSA id 1c5aaf74 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <66879@debbugs.gnu.org>; Wed, 1 Nov 2023 12:57:47 +0000 (UTC) From: Julien Lepiller To: 66879@debbugs.gnu.org Subject: [PATCH 4/5] gnu: Add java-parsson. Date: Wed, 1 Nov 2023 13:57:29 +0100 Message-ID: <412625b39151b4c71d3ab96eccda48259cce0a6c.1698843445.git.julien@lepiller.eu> X-Mailer: git-send-email 2.41.0 In-Reply-To: <1ba00a1093d068dafaef44959ee55a0999695d90.1698843445.git.julien@lepiller.eu> References: <1ba00a1093d068dafaef44959ee55a0999695d90.1698843445.git.julien@lepiller.eu> MIME-Version: 1.0 X-Debbugs-Cc: Björn Höfling , Julien Lepiller Content-Transfer-Encoding: 8bit X-Spam-Score: 3.6 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/java.scm (java-parsson): New variable. Change-Id: Ie564924329e4e0a866e6ed5fe9135c841fb66ae8 --- gnu/packages/java.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) Content analysis details: (3.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 HELO_LOCALHOST No description available. 0.0 FSL_HELO_NON_FQDN_1 No description available. -0.0 SPF_PASS SPF: sender matches SPF record X-Debbugs-Envelope-To: 66879 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.6 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/java.scm (java-parsson): New variable. Change-Id: Ie564924329e4e0a866e6ed5fe9135c841fb66ae8 --- gnu/packages/java.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) Content analysis details: (2.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 HELO_LOCALHOST No description available. 0.0 FSL_HELO_NON_FQDN_1 No description available. -0.0 SPF_PASS SPF: sender matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * gnu/packages/java.scm (java-parsson): New variable. Change-Id: Ie564924329e4e0a866e6ed5fe9135c841fb66ae8 --- gnu/packages/java.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index d80e0e9be8..13b5961c3c 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -13680,6 +13680,43 @@ (define-public java-jakarta-json ;; with classpath exception (license license:epl2.0))) +(define-public java-parsson + (package + (name "java-parsson") + (version "1.1.5") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/eclipse-ee4j/parsson") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "06vvr6qv1ihnk212gdxg4x0sd61lgxk7wf062s7gym5k2h7fms0p")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "parsson.jar" + #:source-dir "impl/src/main/java" + #:test-dir "impl/src/test" + #:use-java-modules? #t + #:jdk ,openjdk11 + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'copy-resources + (lambda _ + (copy-recursively "impl/src/main/resources" + "build/classes")))))) + (inputs + (list java-jakarta-json)) + (native-inputs + (list java-junit)) + (home-page "https://github.com/eclipse-ee4j/parsson") + (synopsis "Implementation of Jakarta JSON API") + (description "Eclipse Parsson is an implementation of the Jakarta JSON +Processing specification.") + ;; with classpath exception + (license license:epl2.0))) + (define-public java-xmp (package (name "java-xmp") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Nov 01 08:58:26 2023 Received: (at 66879) by debbugs.gnu.org; 1 Nov 2023 12:58:26 +0000 Received: from localhost ([127.0.0.1]:50157 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyAni-0007Tb-EO for submit@debbugs.gnu.org; Wed, 01 Nov 2023 08:58:26 -0400 Received: from lepiller.eu ([89.234.186.109]:57970 helo=localhost) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyAng-0007Sl-HT for 66879@debbugs.gnu.org; Wed, 01 Nov 2023 08:58:24 -0400 Received: from localhost (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 312743aa for <66879@debbugs.gnu.org>; Wed, 1 Nov 2023 12:57:49 +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=P8cvRSeKGn839Hs7EUqLusdWF KESq7eEFOcAH72V+KM=; b=jbZKd07Wcbd/7SB0rUheRVHzSODUcbZSMQgNZ6d1J mFUf/EooPAp5dNP+OoFs7QFe4Zh4AHToaudB2BZPNkFDktVAMmZ0hTjV+EYZnc5x X92O6KsZBh7rG+MPUAWdBqBl4A9m6GPr9aXgPJGrJzgkoDcQzu8xnwJl7pv/dK6I NnTEC2GSzfxq81fdB+lvhQJ7I61j/idUS6zdyyBQLflaWfLcN4ni/FaYhzyuKf43 dgwbiolA+zJPDy2wlkQsVvBTR7buPBVoaDJlMasNxj+IobRNiKMFLcAPJLJJlrHF GWDfl0o1To1tnjojbprxt1A/kUz4jElGgHOaXV1LPLLgw== Received: by localhost (OpenSMTPD) with ESMTPSA id bd3f726c (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <66879@debbugs.gnu.org>; Wed, 1 Nov 2023 12:57:48 +0000 (UTC) From: Julien Lepiller To: 66879@debbugs.gnu.org Subject: [PATCH 5/5] gnu: josm: Update to 18822. Date: Wed, 1 Nov 2023 13:57:30 +0100 Message-ID: <9ad7f05d8a8468e25e4e93554bdbcf1eb2f63326.1698843445.git.julien@lepiller.eu> X-Mailer: git-send-email 2.41.0 In-Reply-To: <1ba00a1093d068dafaef44959ee55a0999695d90.1698843445.git.julien@lepiller.eu> References: <1ba00a1093d068dafaef44959ee55a0999695d90.1698843445.git.julien@lepiller.eu> MIME-Version: 1.0 X-Debbugs-Cc: Andreas Enge , Efraim Flashner , Eric Bavier Content-Transfer-Encoding: 8bit X-Spam-Score: 3.6 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/geo.scm (josm): Update to 18822. [inputs]: Use new json implementation. [arguments]: Use openjdk11 to prevent warning at startup. Change-Id: I393e0ed765d1d0da7870595d2eccefae17836eb9 --- gnu/packages/geo.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) Content analysis details: (3.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 HELO_LOCALHOST No description available. 0.0 FSL_HELO_NON_FQDN_1 No description available. -0.0 SPF_PASS SPF: sender matches SPF record X-Debbugs-Envelope-To: 66879 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.6 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/geo.scm (josm): Update to 18822. [inputs]: Use new json implementation. [arguments]: Use openjdk11 to prevent warning at startup. Change-Id: I393e0ed765d1d0da7870595d2eccefae17836eb9 --- gnu/packages/geo.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) Content analysis details: (2.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 HELO_LOCALHOST No description available. 0.0 FSL_HELO_NON_FQDN_1 No description available. -0.0 SPF_PASS SPF: sender matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * gnu/packages/geo.scm (josm): Update to 18822. [inputs]: Use new json implementation. [arguments]: Use openjdk11 to prevent warning at startup. Change-Id: I393e0ed765d1d0da7870595d2eccefae17836eb9 --- gnu/packages/geo.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index a33d446201..dbc8440141 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1940,7 +1940,7 @@ (define-public java-opening-hours-parser (define-public josm (package (name "josm") - (version "18646") + (version "18822") (source (origin (method svn-fetch) (uri (svn-reference @@ -1949,7 +1949,7 @@ (define-public josm (recursive? #f))) (sha256 (base32 - "0zr3p1i39wi0f29lgb3xrnv6lijrq5ia8jxn4wnq1yz0xdlbg98i")) + "0b4q6n3jbqrh7dsfmcf2g0xdd1wjj62sjq8lwvggvrpqlk1fyn1b")) (file-name (string-append name "-" version "-checkout")) (modules '((guix build utils))) (snippet @@ -1963,17 +1963,18 @@ (define-public josm (list java-commons-jcs java-commons-compress java-jmapviewer - java-jsonp-api - java-jsonp-impl ; runtime dependency + java-jakarta-json java-jsr305 java-metadata-extractor java-opening-hours-parser java-openjfx-media + java-parsson ; runtime dependency java-signpost-core java-svg-salamander)) (arguments `(#:tests? #f #:jar-name "josm.jar" + #:jdk ,openjdk11 #:phases (modify-phases %standard-phases (add-after 'unpack 'rm-build.xml -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Nov 02 02:51:20 2023 Received: (at 66879) by debbugs.gnu.org; 2 Nov 2023 06:51:21 +0000 Received: from localhost ([127.0.0.1]:53781 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyRXw-0004pc-5L for submit@debbugs.gnu.org; Thu, 02 Nov 2023 02:51:20 -0400 Received: from lepiller.eu ([89.234.186.109]:36628 helo=hermes.lepiller.eu) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyRXp-0004pB-8g for 66879@debbugs.gnu.org; Thu, 02 Nov 2023 02:51:14 -0400 Received: from hermes.lepiller.eu (localhost [127.0.0.1]) by hermes.lepiller.eu (OpenSMTPD) with ESMTP id 3cbc7c85 for <66879@debbugs.gnu.org>; Thu, 2 Nov 2023 06:50:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:mime-version:content-transfer-encoding; s=dkim; bh=73/qEaF38kKDR/OUVHMsOGaEe7SXodtGIjOIKdcAnmE=; b=P3h/ 0Tb2ecdb/ddYoijoRsXSBL/71IOXQQ1XrmVMZnqlDwWealK23PmgFg9wf/AcH7wZ wIbWYi72DoirxljIdk9t4PDHc/PZRIxaAzKhLEkRibWyve/M2MppTsnEJKP155un qGC7QJQDaazrjsYF3fmNvAwR23cP2ZajBRYGcb1njPE7UTuG1dOM4xpjRSU/JgWO LxoJBZHrTMs9B307RMQFITh7ZULYDVm+BkKFInuHNKM8KzaJXtUtNf/W47V4f9mj YqriqdIofzJZNHzOcTrJak3nGkXgM18XBvfDxA5XKoD7PwHJ6UGp16POid2N1Ej+ xGAjL5Tnl2XX9H6jdA== Received: by hermes.lepiller.eu (OpenSMTPD) with ESMTPSA id a116e4e4 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <66879@debbugs.gnu.org>; Thu, 2 Nov 2023 06:50:31 +0000 (UTC) From: Julien Lepiller To: 66879@debbugs.gnu.org Subject: [PATCH v2 1/5] gnu: openjdk9: Install default certificates. Date: Thu, 2 Nov 2023 07:50:09 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Debbugs-Cc: Björn Höfling , Julien Lepiller Content-Transfer-Encoding: 8bit X-Spam-Score: 1.7 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/java.scm (openjdk9)[arguments]: Add a phase to install certificates from nss-certs to the expected location. (openjdk10, openjdk11): Adapt to also install the certificates. Change-Id: I6ef626324386419e84a9c0eace5a278ca11c573c --- gnu/packages/java.scm | 87 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 86 insertions(+), 1 deletion(-) Content analysis details: (1.7 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 1.7 URIBL_BLACK Contains an URL listed in the URIBL blacklist [URIs: libjvm.so] X-Debbugs-Envelope-To: 66879 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.7 (/) * gnu/packages/java.scm (openjdk9)[arguments]: Add a phase to install certificates from nss-certs to the expected location. (openjdk10, openjdk11): Adapt to also install the certificates. Change-Id: I6ef626324386419e84a9c0eace5a278ca11c573c --- gnu/packages/java.scm | 87 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 86 insertions(+), 1 deletion(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index f482c4c16d..567fb05f77 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -878,7 +878,14 @@ (define-public openjdk9 (build-system gnu-build-system) (outputs '("out" "jdk" "doc")) (arguments - `(#:tests? #f; require jtreg + `(#:imported-modules + ((guix build ant-build-system) + ,@%gnu-build-system-modules) + #:modules + ((guix build utils) + (guix build gnu-build-system) + (ice-9 popen)) + #:tests? #f; require jtreg #:make-flags '("all") #:disallowed-references ,(list (gexp-input icedtea-8) (gexp-input icedtea-8 "jdk")) @@ -971,6 +978,80 @@ (define-public openjdk9 (find-files "." "\\.c$|\\.h$")) #t))) + ;; By default OpenJDK only generates an empty keystore. In order to + ;; be able to use certificates in Java programs we need to generate a + ;; keystore from a set of certificates. For convenience we use the + ;; certificates from the nss-certs package. + (add-after 'install 'install-keystore + (lambda* (#:key inputs outputs #:allow-other-keys) + (use-modules (ice-9 rdelim)) + (let* ((keystore "cacerts") + (certs-dir (search-input-directory inputs + "etc/ssl/certs")) + (keytool (string-append (assoc-ref outputs "jdk") + "/bin/keytool"))) + (define (extract-cert file target) + (call-with-input-file file + (lambda (in) + (call-with-output-file target + (lambda (out) + (let loop ((line (read-line in 'concat)) + (copying? #f)) + (cond + ((eof-object? line) #t) + ((string-prefix? "-----BEGIN" line) + (display line out) + (loop (read-line in 'concat) #t)) + ((string-prefix? "-----END" line) + (display line out) + #t) + (else + (when copying? (display line out)) + (loop (read-line in 'concat) copying?))))))))) + (define (import-cert cert) + (format #t "Importing certificate ~a\n" (basename cert)) + (let ((temp "tmpcert")) + (extract-cert cert temp) + (let ((port (open-pipe* OPEN_WRITE keytool + "-import" + "-alias" (basename cert) + "-keystore" keystore + "-storepass" "changeit" + "-file" temp))) + (display "yes\n" port) + (when (not (zero? (status:exit-val (close-pipe port)))) + (format #t "failed to import ~a\n" cert))) + (delete-file temp))) + + ;; This is necessary because the certificate directory contains + ;; files with non-ASCII characters in their names. + (setlocale LC_ALL "en_US.utf8") + (setenv "LC_ALL" "en_US.utf8") + + (copy-file (string-append (assoc-ref outputs "out") + "/lib/security/cacerts") + keystore) + (chmod keystore #o644) + (for-each import-cert (find-files certs-dir "\\.pem$")) + (mkdir-p (string-append (assoc-ref outputs "out") + "/lib/security")) + (mkdir-p (string-append (assoc-ref outputs "jdk") + "/lib/security")) + + ;; The cacerts files we are going to overwrite are chmod'ed as + ;; read-only (444) in icedtea-8 (which derives from this + ;; package). We have to change this so we can overwrite them. + (chmod (string-append (assoc-ref outputs "out") + "/lib/security/" keystore) #o644) + (chmod (string-append (assoc-ref outputs "jdk") + "/lib/security/" keystore) #o644) + + (install-file keystore + (string-append (assoc-ref outputs "out") + "/lib/security")) + (install-file keystore + (string-append (assoc-ref outputs "jdk") + "/lib/security"))))) ;; Some of the libraries in the lib/ folder link to libjvm.so. ;; But that shared object is located in the server/ folder, so it ;; cannot be found. This phase creates a symbolic link in the @@ -1044,6 +1125,7 @@ (define-public openjdk9 ("icedtea-8:jdk" ,icedtea-8 "jdk") ;; XXX: The build system fails with newer versions of GNU Make. ("make@4.2" ,gnu-make-4.2) + ("nss-certs" ,nss-certs) ("unzip" ,unzip) ("which" ,which) ("zip" ,zip))) @@ -1126,6 +1208,7 @@ (define-public openjdk10 `(("openjdk9" ,openjdk9) ("openjdk9:jdk" ,openjdk9 "jdk") ("make@4.2" ,gnu-make-4.2) + ("nss-certs" ,nss-certs) ("unzip" ,unzip) ("which" ,which) ("zip" ,zip))))) @@ -1152,6 +1235,7 @@ (define-public openjdk11 #:modules `((guix build gnu-build-system) (guix build utils) (ice-9 match) + (ice-9 popen) (srfi srfi-1) (srfi srfi-26)) #:disallowed-references (list (gexp-input openjdk10) @@ -1394,6 +1478,7 @@ (define-public openjdk11 openjdk10 `(,openjdk10 "jdk") gnu-make-4.2 + nss-certs pkg-config unzip which base-commit: c95104c2e96f660d482e603c497c1e01968788d3 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Nov 02 02:51:25 2023 Received: (at 66879) by debbugs.gnu.org; 2 Nov 2023 06:51:25 +0000 Received: from localhost ([127.0.0.1]:53784 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyRY0-0004px-Uu for submit@debbugs.gnu.org; Thu, 02 Nov 2023 02:51:25 -0400 Received: from lepiller.eu ([2a00:5884:8208::1]:44222 helo=hermes.lepiller.eu) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyRXr-0004pD-KG for 66879@debbugs.gnu.org; Thu, 02 Nov 2023 02:51:15 -0400 Received: from hermes.lepiller.eu (localhost [127.0.0.1]) by hermes.lepiller.eu (OpenSMTPD) with ESMTP id 406e33c1 for <66879@debbugs.gnu.org>; Thu, 2 Nov 2023 06:50:33 +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=4z51zshDp9ll2plgeopuz24ND meOJlB72NJ5nPE43oE=; b=IOOKA0YbG9QZKqhOamEJ42jYN2fnwQ3JKm5X3YpfL DLPoxKu6pH7VBSUsPOHk6MNZqpyKWfeFqoADgFH/0/tJC6yPZnCnM/UId+UHDJC7 wIawxzWMJBZLd8/SS0UB/ndWaEZE1LS6t0L6QGsBiKMLB68dEesRjsnsvkcOpz2O W4LJKqQgK/m4d1vmujAu+NbmjN8fOs/AspDhbkOyqC729hawqXNe84vp/2Uwwj3A d0aOLMk6LNsWRDDEtBmENS+Ib/wTkel5QQUGGQGuLlywf9Bw3t5a865ORPiDvTjo uIPWc2iAKadacpJGocKAxfJXvQ5ppy23aMVLjCQzwkqHg== Received: by hermes.lepiller.eu (OpenSMTPD) with ESMTPSA id 8d6b222d (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <66879@debbugs.gnu.org>; Thu, 2 Nov 2023 06:50:32 +0000 (UTC) From: Julien Lepiller To: 66879@debbugs.gnu.org Subject: [PATCH v2 2/5] guix: ant: Optionally build with java modules. Date: Thu, 2 Nov 2023 07:50:10 +0100 Message-ID: <22eb344213118281d23de74102ba475ca7f33b20.1698907813.git.julien@lepiller.eu> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Björn Höfling , Julien Lepiller Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66879 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Modules were introduced in Java 9 and are not supported by the default icedtea compiler, so this feature is disabled by default. * guix/build-system/ant.scm (ant-build): Add use-java-modules? parameter. * guix/build/ant-build-system.scm (default-build.xml) (configure): Use it. Change-Id: I3b99238e4cd262332fa5c818be1af5477c7374fd --- guix/build-system/ant.scm | 2 ++ guix/build/ant-build-system.scm | 31 +++++++++++++++++++++++-------- 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/guix/build-system/ant.scm b/guix/build-system/ant.scm index e191fd3c99..84bf951fab 100644 --- a/guix/build-system/ant.scm +++ b/guix/build-system/ant.scm @@ -103,6 +103,7 @@ (define* (ant-build name inputs (build-target "jar") (jar-name #f) (main-class #f) + (use-java-modules? #f) (test-include (list "**/*Test.java")) (test-exclude (list "**/Abstract*.java")) (source-dir "src") @@ -131,6 +132,7 @@ (define* (ant-build name inputs #:build-target #$build-target #:jar-name #$jar-name #:main-class #$main-class + #:use-java-modules? #$use-java-modules? #:test-include (list #$@test-include) #:test-exclude (list #$@test-exclude) #:source-dir #$source-dir diff --git a/guix/build/ant-build-system.scm b/guix/build/ant-build-system.scm index d29912bf59..ced34177f4 100644 --- a/guix/build/ant-build-system.scm +++ b/guix/build/ant-build-system.scm @@ -37,6 +37,7 @@ (define-module (guix build ant-build-system) (define* (default-build.xml jar-name prefix #:optional (source-dir ".") (test-dir "./test") (main-class #f) + (use-java-modules? #f) (test-include '("**/*Test.java")) (test-exclude '("**/Abstract*Test.java"))) "Create a simple build.xml with standard targets for Ant." @@ -65,7 +66,7 @@ (define* (default-build.xml jar-name prefix #:optional (value "first"))) (property (@ (environment "env"))) (path (@ (id "classpath")) - (pathelement (@ (location "${env.CLASSPATH}")))) + (pathelement (@ (path "${env.CLASSPATH}")))) (target (@ (name "manifest")) (mkdir (@ (dir "${manifest.dir}"))) @@ -79,18 +80,30 @@ (define* (default-build.xml jar-name prefix #:optional (mkdir (@ (dir "${classes.dir}"))) (javac (@ (includeantruntime "false") (srcdir ,source-dir) - (destdir "${classes.dir}") - (classpath (@ (refid "classpath")))))) + (destdir "${classes.dir}")) + ,(if use-java-modules? + `((modulepath (@ (refid "classpath")))) + '()) + (classpath (@ (refid "classpath"))))) (target (@ (name "compile-tests")) (mkdir (@ (dir "${test.classes.dir}"))) (javac (@ (includeantruntime "false") (srcdir ,test-dir) (destdir "${test.classes.dir}")) - (classpath - (pathelement (@ (path "${env.CLASSPATH}"))) - (pathelement (@ (location "${classes.dir}"))) - (pathelement (@ (location "${test.classes.dir}")))))) + ,(if use-java-modules? + `((classpath + (pathelement + (@ (path "${env.CLASSPATH}"))) + (pathelement + (@ (location "${classes.dir}"))) + (pathelement + (@ (location "${test.classes.dir}"))))) + '()) + (classpath + (pathelement (@ (path "${env.CLASSPATH}"))) + (pathelement (@ (location "${classes.dir}"))) + (pathelement (@ (location "${test.classes.dir}")))))) (target (@ (name "check") (depends "compile-tests")) @@ -156,13 +169,15 @@ (define* (configure #:key inputs outputs (jar-name #f) (source-dir "src") (test-dir "src/test") (main-class #f) + (use-java-modules? #f) (test-include '("**/*Test.java")) (test-exclude '("**/Abstract*.java")) #:allow-other-keys) (when jar-name (default-build.xml jar-name (string-append (assoc-ref outputs "out") "/share/java") - source-dir test-dir main-class test-include test-exclude)) + source-dir test-dir main-class use-java-modules? + test-include test-exclude)) (setenv "JAVA_HOME" (assoc-ref inputs "jdk")) (setenv "CLASSPATH" (generate-classpath inputs)) #t) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Nov 02 02:51:29 2023 Received: (at 66879) by debbugs.gnu.org; 2 Nov 2023 06:51:29 +0000 Received: from localhost ([127.0.0.1]:53786 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyRY5-0004q9-28 for submit@debbugs.gnu.org; Thu, 02 Nov 2023 02:51:29 -0400 Received: from lepiller.eu ([89.234.186.109]:36636 helo=hermes.lepiller.eu) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyRXt-0004pM-1w for 66879@debbugs.gnu.org; Thu, 02 Nov 2023 02:51:18 -0400 Received: from hermes.lepiller.eu (localhost [127.0.0.1]) by hermes.lepiller.eu (OpenSMTPD) with ESMTP id 23935cdb for <66879@debbugs.gnu.org>; Thu, 2 Nov 2023 06:50:33 +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=awwLLdcfv7CmBaB3mBrEWOL3D ANCNH1YhP2rEU2/E+k=; b=IdOcq5XyxIwT/hK2/DL5ghZ16tOvbOMXqf2kIpGLL qGdVWYcBhrbEOURO1Oeu4K+cSPvJeZbs/sodzVkEW4dZSAASO7WrTlrmNESAB+tt 2gZ4GbC0pUgDez8HzQCyT9yZaTiwIwGEjJXa7XRPjdT+VhebNYovWbvlba+EnwRC /TTXhwXDF7hIvNrbHJcI9L1es467rm1eKv42bxIu5J4duBuGs4K/aSzXJv1d2ufn izm0ktTiBlkLGAU0eovyZEcGCsr7grvEv+02XlPACwTZE4sPjYpjFDS9tpiS7Rxh LR6ffs3RW/RbT29OAHrUBhmRUlI1BfzJbA1JEOqH7znpA== Received: by hermes.lepiller.eu (OpenSMTPD) with ESMTPSA id 64f50238 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <66879@debbugs.gnu.org>; Thu, 2 Nov 2023 06:50:32 +0000 (UTC) From: Julien Lepiller To: 66879@debbugs.gnu.org Subject: [PATCH v2 3/5] gnu: Add java-jakarta-json. Date: Thu, 2 Nov 2023 07:50:11 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Björn Höfling , Julien Lepiller Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66879 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/java.scm (java-jakarta-json): New variable. Change-Id: I2c123710f9d31bf71e8fb86ff0d336b6fcfa9674 --- gnu/packages/java.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 567fb05f77..d80e0e9be8 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -13653,6 +13653,33 @@ (define-public java-jsonp-impl parse, generate, transform and query) JSON messages. This package contains a reference implementation of that API."))) +(define-public java-jakarta-json + (package + (name "java-jakarta-json") + (version "2.1.3") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jakartaee/jsonp-api") + (commit (string-append version "-RELEASE")))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1q600harqfhlf763l75j4fx7ai7ybp7ga06aiky2a2hg8mhz0s5f")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "jakarta-json.jar" + #:source-dir "api/src/main/java" + #:tests? #f; no tests + #:jdk ,openjdk11)) + (home-page "https://github.com/jakartaee/jsonp-api") + (synopsis "Portable API for JSON handling in Java") + (description "This project contains API and Compatible Implementation of +Jakarta JSON Processing specification. Jakarta JSON Processing provides +portable APIs to parse, generate, transform, and query JSON documents.") + ;; with classpath exception + (license license:epl2.0))) + (define-public java-xmp (package (name "java-xmp") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Nov 02 02:51:33 2023 Received: (at 66879) by debbugs.gnu.org; 2 Nov 2023 06:51:33 +0000 Received: from localhost ([127.0.0.1]:53788 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyRY9-0004qQ-7u for submit@debbugs.gnu.org; Thu, 02 Nov 2023 02:51:33 -0400 Received: from lepiller.eu ([89.234.186.109]:36628 helo=hermes.lepiller.eu) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyRXu-0004pB-NN for 66879@debbugs.gnu.org; Thu, 02 Nov 2023 02:51:19 -0400 Received: from hermes.lepiller.eu (localhost [127.0.0.1]) by hermes.lepiller.eu (OpenSMTPD) with ESMTP id 14bba3c1 for <66879@debbugs.gnu.org>; Thu, 2 Nov 2023 06:50:33 +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=vbj+Kd8Pw+jNV/DwcrixkS9Jc NBAXP7J1pX1wvmC8iA=; b=UDqhRpspB3pJLvxnlHR56dIpbjIFmCH/ZNmcy9WAV iQNici5unjwG25yOvUEGMZDNfdIJmZcHeudgQ9ZWbPV0xuJlQL/+AugMZdLm0LTf P7Oe7t+tvqeBK605tue69J8l3G4S9gbk1Vi//OOkiwrCcuVSaxl+8i8GqQM7V8jB znGiAH+0iiOzZzvk7IxaAC4uvm3Fkw+eL8RgKbKT8XwQTenbc1QoGb/ToHAOSklY NO0j0jhQ5EZM06eqG4IYOZ7NcRwHDuKfHYaPUWVGU4nEQUPoQIqPreZlPc1lbbMS ZHZ0JkLOlygYl+oR2Chw9DKVn3gZxX6O9XkmHaotuMeCw== Received: by hermes.lepiller.eu (OpenSMTPD) with ESMTPSA id 4d885adb (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <66879@debbugs.gnu.org>; Thu, 2 Nov 2023 06:50:33 +0000 (UTC) From: Julien Lepiller To: 66879@debbugs.gnu.org Subject: [PATCH v2 4/5] gnu: Add java-parsson. Date: Thu, 2 Nov 2023 07:50:12 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Björn Höfling , Julien Lepiller Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66879 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/java.scm (java-parsson): New variable. Change-Id: Ie564924329e4e0a866e6ed5fe9135c841fb66ae8 --- gnu/packages/java.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index d80e0e9be8..13b5961c3c 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -13680,6 +13680,43 @@ (define-public java-jakarta-json ;; with classpath exception (license license:epl2.0))) +(define-public java-parsson + (package + (name "java-parsson") + (version "1.1.5") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/eclipse-ee4j/parsson") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "06vvr6qv1ihnk212gdxg4x0sd61lgxk7wf062s7gym5k2h7fms0p")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "parsson.jar" + #:source-dir "impl/src/main/java" + #:test-dir "impl/src/test" + #:use-java-modules? #t + #:jdk ,openjdk11 + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'copy-resources + (lambda _ + (copy-recursively "impl/src/main/resources" + "build/classes")))))) + (inputs + (list java-jakarta-json)) + (native-inputs + (list java-junit)) + (home-page "https://github.com/eclipse-ee4j/parsson") + (synopsis "Implementation of Jakarta JSON API") + (description "Eclipse Parsson is an implementation of the Jakarta JSON +Processing specification.") + ;; with classpath exception + (license license:epl2.0))) + (define-public java-xmp (package (name "java-xmp") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Nov 02 02:51:37 2023 Received: (at 66879) by debbugs.gnu.org; 2 Nov 2023 06:51:37 +0000 Received: from localhost ([127.0.0.1]:53792 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyRYD-0004qa-DT for submit@debbugs.gnu.org; Thu, 02 Nov 2023 02:51:37 -0400 Received: from lepiller.eu ([2a00:5884:8208::1]:44222 helo=hermes.lepiller.eu) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyRXw-0004pD-2y for 66879@debbugs.gnu.org; Thu, 02 Nov 2023 02:51:22 -0400 Received: from hermes.lepiller.eu (localhost [127.0.0.1]) by hermes.lepiller.eu (OpenSMTPD) with ESMTP id af636de8 for <66879@debbugs.gnu.org>; Thu, 2 Nov 2023 06:50:34 +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=P8cvRSeKGn839Hs7EUqLusdWF KESq7eEFOcAH72V+KM=; b=XQoWR7KQfHzHaxH30++7/UWC1LedRn+hx3mCQkgbV lhU9ZNxMAP/84o/tFTkN8AkhWgajMUrFWQBXxBCczTp+j4aRXzkhAbUENpFtBZSo 6Y+fF7JPFDSYfTTrZlpEUUt5kEVFhh7lDxm1/DiOSZx+lt2viCNhMlMF3zvntiJ8 QxcharEKqHHBLll50XjcbYw3qmQyL+3xka7PsAFl9cSGJG00hweFUou/36TE0mBA DNhsDe1D4UVqsGmxZ0t2RyrEJNUq8OZiaxnCcC89obEysbY9r5Rw3SK6PIYslAPM d2gpBvGw338WdwI6aUes4K6tAk8iMdqSG3EEik6jP/6MQ== Received: by hermes.lepiller.eu (OpenSMTPD) with ESMTPSA id 61a240bc (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <66879@debbugs.gnu.org>; Thu, 2 Nov 2023 06:50:33 +0000 (UTC) From: Julien Lepiller To: 66879@debbugs.gnu.org Subject: [PATCH v2 5/5] gnu: josm: Update to 18822. Date: Thu, 2 Nov 2023 07:50:13 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Andreas Enge , Efraim Flashner , Eric Bavier Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66879 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/geo.scm (josm): Update to 18822. [inputs]: Use new json implementation. [arguments]: Use openjdk11 to prevent warning at startup. Change-Id: I393e0ed765d1d0da7870595d2eccefae17836eb9 --- gnu/packages/geo.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index a33d446201..dbc8440141 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1940,7 +1940,7 @@ (define-public java-opening-hours-parser (define-public josm (package (name "josm") - (version "18646") + (version "18822") (source (origin (method svn-fetch) (uri (svn-reference @@ -1949,7 +1949,7 @@ (define-public josm (recursive? #f))) (sha256 (base32 - "0zr3p1i39wi0f29lgb3xrnv6lijrq5ia8jxn4wnq1yz0xdlbg98i")) + "0b4q6n3jbqrh7dsfmcf2g0xdd1wjj62sjq8lwvggvrpqlk1fyn1b")) (file-name (string-append name "-" version "-checkout")) (modules '((guix build utils))) (snippet @@ -1963,17 +1963,18 @@ (define-public josm (list java-commons-jcs java-commons-compress java-jmapviewer - java-jsonp-api - java-jsonp-impl ; runtime dependency + java-jakarta-json java-jsr305 java-metadata-extractor java-opening-hours-parser java-openjfx-media + java-parsson ; runtime dependency java-signpost-core java-svg-salamander)) (arguments `(#:tests? #f #:jar-name "josm.jar" + #:jdk ,openjdk11 #:phases (modify-phases %standard-phases (add-after 'unpack 'rm-build.xml -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Nov 02 06:01:21 2023 Received: (at 66879) by debbugs.gnu.org; 2 Nov 2023 10:01:21 +0000 Received: from localhost ([127.0.0.1]:53965 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyUVn-0003Ft-2P for submit@debbugs.gnu.org; Thu, 02 Nov 2023 06:01:21 -0400 Received: from hera.aquilenet.fr ([2a0c:e300::1]:44892) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyUVi-0003AF-QE for 66879@debbugs.gnu.org; Thu, 02 Nov 2023 06:01:13 -0400 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 32BFE1CA4; Thu, 2 Nov 2023 11:00:28 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at hera.aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id DqYfbMNwcPbA; Thu, 2 Nov 2023 11:00:27 +0100 (CET) Received: from jurong (p5de74435.dip0.t-ipconnect.de [93.231.68.53]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 6EE97371; Thu, 2 Nov 2023 11:00:27 +0100 (CET) Date: Thu, 2 Nov 2023 11:00:16 +0100 From: Andreas Enge To: Julien Lepiller Subject: Re: [bug#66879] [PATCH v2 5/5] gnu: josm: Update to 18822. Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 66879 Cc: Eric Bavier , Efraim Flashner , 66879@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Thu, Nov 02, 2023 at 07:50:13AM +0100 schrieb Julien Lepiller: > * gnu/packages/geo.scm (josm): Update to 18822. > [inputs]: Use new json implementation. > [arguments]: Use openjdk11 to prevent warning at startup. Looks good! Andreas From debbugs-submit-bounces@debbugs.gnu.org Thu Nov 09 13:11:24 2023 Received: (at 66879-done) by debbugs.gnu.org; 9 Nov 2023 18:11:24 +0000 Received: from localhost ([127.0.0.1]:48694 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r19Uy-00045d-BX for submit@debbugs.gnu.org; Thu, 09 Nov 2023 13:11:24 -0500 Received: from lepiller.eu ([89.234.186.109]:56876 helo=hermes.lepiller.eu) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r19Uv-00045R-RS for 66879-done@debbugs.gnu.org; Thu, 09 Nov 2023 13:11:23 -0500 Received: from hermes.lepiller.eu (localhost [127.0.0.1]) by hermes.lepiller.eu (OpenSMTPD) with ESMTP id 5684a73f; Thu, 9 Nov 2023 18:10:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=date:from :to:cc:subject:message-id:in-reply-to:references:mime-version :content-type:content-transfer-encoding; s=dkim; bh=LX/ANhnouBcb VfARkxC8WxX2Khnj5nqwUbkxrTjgg6o=; b=XNfRlK7yjd9t65CW7dZwHgJnXXGL 76TLcIlYGoVMnx0/MkoCvgZupqmsUrPEXaRWnM7HbNgLNapVvuzhI09aPlNZlbTz ZT1cRf2OO408ZP5auUuB9nAUC9UQxe/q4dgwusPcaGQHvKqG4Y801bXzyVTM8SdX e3LVNHy/VY7nuuRk3nwk+izw1rZ7Db/0EcSYjokMEeHR8fqg5rocQudM4qg1xISI wvxvwXM6y/8mo9r9vMOYAIYNE8d1fokgP3sp7TCnI/9hgrbeRlhw8KCLpEvFbKMf /DEvJ0oBPcJZu+S3vWsHB/zL8Z1Z/PJ0qqoPEEqOaZNPbTVpmPEuM5qSAQ== Received: by hermes.lepiller.eu (OpenSMTPD) with ESMTPSA id 9ad5d6b1 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Thu, 9 Nov 2023 18:10:39 +0000 (UTC) Date: Thu, 9 Nov 2023 19:10:19 +0100 From: Julien Lepiller To: Andreas Enge Subject: Re: [bug#66879] [PATCH v2 5/5] gnu: josm: Update to 18822. Message-ID: <20231109191019.2fc24ecd@lepiller.eu> In-Reply-To: References: X-Mailer: Claws Mail 4.1.1 (GTK 3.24.37; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66879-done Cc: 66879-done@debbugs.gnu.org, Efraim Flashner , Eric Bavier X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Le Thu, 2 Nov 2023 11:00:16 +0100, Andreas Enge a =C3=A9crit : > Am Thu, Nov 02, 2023 at 07:50:13AM +0100 schrieb Julien Lepiller: > > * gnu/packages/geo.scm (josm): Update to 18822. > > [inputs]: Use new json implementation. > > [arguments]: Use openjdk11 to prevent warning at startup. =20 >=20 > Looks good! >=20 > Andreas >=20 Pushed to master as 5392d9db46d6f931233be2f25688481181622bb4 to 71d54f3ac451527d3c741bc1209f6b03329f8571. From unknown Sun Sep 07 03:08:23 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Fri, 08 Dec 2023 12:24:09 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator