From patchwork Wed Nov 1 12:57:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 55791 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 5C90727BBE9; Wed, 1 Nov 2023 12:58:42 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 491E427BBE2 for ; Wed, 1 Nov 2023 12:58:40 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qyAnq-0004Nv-5b; Wed, 01 Nov 2023 08:58:34 -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 1qyAnk-0004N6-IC for guix-patches@gnu.org; Wed, 01 Nov 2023 08:58:28 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qyAnk-0008Lh-7L for guix-patches@gnu.org; Wed, 01 Nov 2023 08:58:28 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qyAoI-0007Uk-GO; Wed, 01 Nov 2023 08:59:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66879] [PATCH 2/5] guix: ant: Optional build with java modules. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: bjoern.hoefling@bjoernhoefling.de, julien@lepiller.eu, guix-patches@gnu.org Resent-Date: Wed, 01 Nov 2023 12:59:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66879 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66879@debbugs.gnu.org Cc: =?utf-8?b?QmrDtnJuIEjDtmZsaW5n?= , Julien Lepiller X-Debbugs-Original-Xcc: =?utf-8?b?QmrDtnJuIEjDtmZsaW5n?= , Julien Lepiller Received: via spool by 66879-submit@debbugs.gnu.org id=B66879.169884350428720 (code B ref 66879); Wed, 01 Nov 2023 12:59:02 +0000 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 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-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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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) From patchwork Wed Nov 1 12:57:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 55794 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8478527BBE9; Wed, 1 Nov 2023 12:59:00 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 51A2D27BBE2 for ; Wed, 1 Nov 2023 12:58:59 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qyAnr-0004OH-4D; Wed, 01 Nov 2023 08:58:35 -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 1qyAnl-0004NK-A7 for guix-patches@gnu.org; Wed, 01 Nov 2023 08:58:30 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qyAnl-0008Lt-22 for guix-patches@gnu.org; Wed, 01 Nov 2023 08:58:29 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qyAoI-0007Ut-W0; Wed, 01 Nov 2023 08:59:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66879] [PATCH 3/5] gnu: Add java-jakarta-json. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: bjoern.hoefling@bjoernhoefling.de, julien@lepiller.eu, guix-patches@gnu.org Resent-Date: Wed, 01 Nov 2023 12:59:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66879 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66879@debbugs.gnu.org Cc: =?utf-8?b?QmrDtnJuIEjDtmZsaW5n?= , Julien Lepiller X-Debbugs-Original-Xcc: =?utf-8?b?QmrDtnJuIEjDtmZsaW5n?= , Julien Lepiller Received: via spool by 66879-submit@debbugs.gnu.org id=B66879.169884350528727 (code B ref 66879); Wed, 01 Nov 2023 12:59:02 +0000 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 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-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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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") From patchwork Wed Nov 1 12:57:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 55792 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0C84827BBEA; Wed, 1 Nov 2023 12:58:52 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6484627BBE2 for ; Wed, 1 Nov 2023 12:58:51 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qyAnr-0004ON-S3; Wed, 01 Nov 2023 08:58:35 -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 1qyAnm-0004NY-Jp for guix-patches@gnu.org; Wed, 01 Nov 2023 08:58:30 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qyAnm-0008M4-3k for guix-patches@gnu.org; Wed, 01 Nov 2023 08:58:30 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qyAoJ-0007V1-Fm; Wed, 01 Nov 2023 08:59:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66879] [PATCH 4/5] gnu: Add java-parsson. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: bjoern.hoefling@bjoernhoefling.de, julien@lepiller.eu, guix-patches@gnu.org Resent-Date: Wed, 01 Nov 2023 12:59:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66879 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66879@debbugs.gnu.org Cc: =?utf-8?b?QmrDtnJuIEjDtmZsaW5n?= , Julien Lepiller X-Debbugs-Original-Xcc: =?utf-8?b?QmrDtnJuIEjDtmZsaW5n?= , Julien Lepiller Received: via spool by 66879-submit@debbugs.gnu.org id=B66879.169884350528739 (code B ref 66879); Wed, 01 Nov 2023 12:59:03 +0000 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 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-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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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") From patchwork Wed Nov 1 12:57:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 55793 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 207AF27BBEA; Wed, 1 Nov 2023 12:58:55 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9307F27BBE2 for ; Wed, 1 Nov 2023 12:58:54 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qyAnt-0004Oy-EF; Wed, 01 Nov 2023 08:58:37 -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 1qyAnn-0004Ng-EO for guix-patches@gnu.org; Wed, 01 Nov 2023 08:58:32 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qyAnn-0008ME-6N for guix-patches@gnu.org; Wed, 01 Nov 2023 08:58:31 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qyAoK-0007VB-05; Wed, 01 Nov 2023 08:59:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66879] [PATCH 5/5] gnu: josm: Update to 18822. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, efraim@flashner.co.il, bavier@posteo.net, guix-patches@gnu.org Resent-Date: Wed, 01 Nov 2023 12:59:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66879 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66879@debbugs.gnu.org Cc: Andreas Enge , Efraim Flashner , Eric Bavier X-Debbugs-Original-Xcc: Andreas Enge , Efraim Flashner , Eric Bavier Received: via spool by 66879-submit@debbugs.gnu.org id=B66879.169884350628748 (code B ref 66879); Wed, 01 Nov 2023 12:59:03 +0000 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 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-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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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