From patchwork Sat Dec 11 02:23:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 35118 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 C91C627BBEA; Sat, 11 Dec 2021 02:24: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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 B6E1227BBE9 for ; Sat, 11 Dec 2021 02:24:41 +0000 (GMT) Received: from localhost ([::1]:37790 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mvs40-0001pF-RV for patchwork@mira.cbaines.net; Fri, 10 Dec 2021 21:24:40 -0500 Received: from eggs.gnu.org ([209.51.188.92]:49486) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mvs3O-0001oV-Df for guix-patches@gnu.org; Fri, 10 Dec 2021 21:24:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:36727) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mvs3O-0005D1-4n for guix-patches@gnu.org; Fri, 10 Dec 2021 21:24:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mvs3O-0007MJ-0i for guix-patches@gnu.org; Fri, 10 Dec 2021 21:24:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52421] [PATCH 1/5] gnu: java-jansi: Update to 2.4.0. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 11 Dec 2021 02:24:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52421 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52421@debbugs.gnu.org Received: via spool by 52421-submit@debbugs.gnu.org id=B52421.163918940428206 (code B ref 52421); Sat, 11 Dec 2021 02:24:01 +0000 Received: (at 52421) by debbugs.gnu.org; 11 Dec 2021 02:23:24 +0000 Received: from localhost ([127.0.0.1]:48263 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mvs2l-0007Kl-OA for submit@debbugs.gnu.org; Fri, 10 Dec 2021 21:23:24 -0500 Received: from lepiller.eu ([89.234.186.109]:32802) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mvs2i-0007KV-GH for 52421@debbugs.gnu.org; Fri, 10 Dec 2021 21:23:22 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 45b83142 for <52421@debbugs.gnu.org>; Sat, 11 Dec 2021 02:23:18 +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=S02mXm01VN7gck1upIFapvme3 OSn+ZwarJrQExUwa10=; b=OKboa2bZQAS1VSM/Gbnl/B/ACTgDplXPBYrwZrdGK KDU4JCGEn4Jyq8yjSCLYk6DIBFUt0rMEBvn6dLHntz9miDnAfODuQ6amhJ90MS/P QDh3BReTVLpQlZJ1YEYR2AC6zoNmNlnjcpPmgjzTIRisaOffJAJhLMWfiMM5g+3A +0Q7Rymqn1dqmxho1WD8kDw8Ny7UWCaLR9baEjm7Xn4oTAA+OkmVd794AjdnAx2E /iJMwVMYtPbi/8trmtDlp7PSuqTs8ZoN/6G0ZbxfLM21p4+Sp66yqhSx/HST09/M oTQU3wveuNcrgqgX7WsJW+Jnjc8y5qcOJ6ev/9b2SR0Kw== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 0bfe395c (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <52421@debbugs.gnu.org>; Sat, 11 Dec 2021 02:23:18 +0000 (UTC) From: Julien Lepiller Date: Sat, 11 Dec 2021 03:23:03 +0100 Message-Id: X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211211031159.29aa79db@tachikoma.lepiller.eu> References: <20211211031159.29aa79db@tachikoma.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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/java.scm (java-jansi): Update to 2.4.0. (java-jansi-1): New variable. (java-jline-2)[inputs]: Use java-jansi-1. * gnu/packages/groovy.scm (java-groovy-bootstrap)[inputs]: Use java-jansi-1. --- gnu/packages/groovy.scm | 2 +- gnu/packages/java.scm | 82 +++++++++++++++++++++++++++++++++++------ 2 files changed, 71 insertions(+), 13 deletions(-) diff --git a/gnu/packages/groovy.scm b/gnu/packages/groovy.scm index c44a17b59e..382dfe7faf 100644 --- a/gnu/packages/groovy.scm +++ b/gnu/packages/groovy.scm @@ -102,7 +102,7 @@ (define java-groovy-bootstrap ("java-asm-util" ,java-asm-util-8) ("java-classpathx-servletapi" ,java-classpathx-servletapi) ("java-commons-cli" ,java-commons-cli) - ("java-jansi" ,java-jansi) + ("java-jansi" ,java-jansi-1) ("java-jline-2" ,java-jline-2) ("java-picocli" ,java-picocli) ("java-xstream" ,java-xstream))) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 36424ee8b1..51b8bc673d 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -12134,15 +12134,78 @@ (define-public java-jansi-native (define-public java-jansi (package (name "java-jansi") + (version "2.4.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/fusesource/jansi") + (commit (string-append "jansi-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1s6fva06990798b5fyxqzr30zwyj1byq5wrm54j2larcydaryggf")) + (modules '((guix build utils))) + (snippet + ;; contains pre-compiled libraries + '(delete-file-recursively + "src/main/resources/org/fusesource/jansi/internal")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "jansi.jar" + #:source-dir "src/main/java" + #:test-dir "src/test" + #:tests? #f; require junit 3 + #:phases + (modify-phases %standard-phases + (add-before 'build 'build-native + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "src/main/native" + (invoke "gcc" "-c" "jansi_ttyname.c" "-o" "jansi_ttyname.o" + (string-append "-I" (assoc-ref inputs "jdk") + "/include/linux") + "-fPIC" "-O2") + (invoke "gcc" "-o" "libjansi.so" "-shared" "jansi_ttyname.o")))) + (add-before 'build 'install-native + (lambda _ + (let ((dir (string-append "build/classes/META-INF/org/fusesource/" + "jansi/internal/native/" + ,(match (%current-system) + ("i686-linux" "linux/x86") + ("x86_64-linux" "linux/x86_64") + ("armhf-linux" "linux/armv7") + ("aarch64-linux" "linux/arm64") + ("mips64el-linux" "linux/mips64") + (_ "unknown-kernel"))))) + (install-file "src/main/native/libjansi.so" dir)) + #t)) + (add-before 'build 'copy-resources + (lambda _ + (copy-recursively "src/main/resources" "build/classes") + #t)) + (add-after 'check 'clear-term + (lambda _ + (invoke "echo" "-e" "\\e[0m"))) + (replace 'install + (install-from-pom "pom.xml"))))) + (home-page "https://fusesource.github.io/jansi/") + (synopsis "Portable ANSI escape sequences") + (description "Jansi is a Java library that allows you to use ANSI escape +sequences to format your console output which works on every platform.") + (license license:asl2.0))) + +(define-public java-jansi-1 + (package + (inherit java-jansi) (version "1.16") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/fusesource/jansi/archive/" - "jansi-project-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/fusesource/jansi") + (commit (string-append "jansi-project-" version)))) + (file-name (git-file-name "jansi" version)) (sha256 (base32 - "11kh3144i3fzp21dpy8zg52mjmsr214k7km9p8ly0rqk2px0qq2z")))) - (build-system ant-build-system) + "0ikk0x352gh30b42qn1jd89xwsjj0mavrc5kms7fss15bd8vsayx")))) (arguments `(#:jar-name "jansi.jar" #:source-dir "jansi/src/main/java" @@ -12173,12 +12236,7 @@ (define-public java-jansi `(("java-jansi-native" ,java-jansi-native))) (native-inputs `(("java-junit" ,java-junit) - ("java-hamcrest-core" ,java-hamcrest-core))) - (home-page "https://fusesource.github.io/jansi/") - (synopsis "Portable ANSI escape sequences") - (description "Jansi is a Java library that allows you to use ANSI escape -sequences to format your console output which works on every platform.") - (license license:asl2.0))) + ("java-hamcrest-core" ,java-hamcrest-core))))) (define-public java-jboss-el-api-spec (package @@ -12541,7 +12599,7 @@ (define-public java-jline-2 `(#:jdk ,icedtea-8 ,@(package-arguments java-jline))) (inputs - `(("java-jansi" ,java-jansi) + `(("java-jansi" ,java-jansi-1) ("java-jansi-native" ,java-jansi-native))) (native-inputs `(("java-powermock-modules-junit4" ,java-powermock-modules-junit4) From patchwork Sat Dec 11 02:23:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 35119 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 7281027BBEA; Sat, 11 Dec 2021 02:24:43 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 3D7C427BBE9 for ; Sat, 11 Dec 2021 02:24:43 +0000 (GMT) Received: from localhost ([::1]:37826 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mvs42-0001r2-D4 for patchwork@mira.cbaines.net; Fri, 10 Dec 2021 21:24:42 -0500 Received: from eggs.gnu.org ([209.51.188.92]:49500) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mvs3R-0001oe-W2 for guix-patches@gnu.org; Fri, 10 Dec 2021 21:24:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:36728) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mvs3O-0005D6-G7 for guix-patches@gnu.org; Fri, 10 Dec 2021 21:24:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mvs3O-0007MQ-DQ for guix-patches@gnu.org; Fri, 10 Dec 2021 21:24:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52421] [PATCH 2/5] gnu: Add java-jctools-core-1. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 11 Dec 2021 02:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52421 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52421@debbugs.gnu.org Received: via spool by 52421-submit@debbugs.gnu.org id=B52421.163918940428212 (code B ref 52421); Sat, 11 Dec 2021 02:24:02 +0000 Received: (at 52421) by debbugs.gnu.org; 11 Dec 2021 02:23:24 +0000 Received: from localhost ([127.0.0.1]:48265 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mvs2m-0007Kt-Bf for submit@debbugs.gnu.org; Fri, 10 Dec 2021 21:23:24 -0500 Received: from lepiller.eu ([89.234.186.109]:32802) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mvs2k-0007KV-Ph for 52421@debbugs.gnu.org; Fri, 10 Dec 2021 21:23:23 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id a3b27020 for <52421@debbugs.gnu.org>; Sat, 11 Dec 2021 02:23:19 +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=YzFIDq8XvDDKONL0m+9tEQmZo GTlhhMxjMN/nSCL4i0=; b=YuhMAjS6mG6Bqq6dVLd8YHoORqznH9zNu35qGtJ61 YKEDD97Chy23lLVXaIFWz+sghoHwPQulLTDsTHvzSGmmh4hgt2pKpEE00xeJlh// fFFY/3Ez4jcKYrDNQ3kQMMnOoLJZQcFWhqYSnSwLbCvXaBTnvnI1wuxLPcBQ4mrs 2HkZYq0aINk4QcdyZ/+gcBTut9s8pOqMgQOXwqLlBhoFOB0M9CNUaSWj/uBuBA2e oVngMDFjhBhHPmcBavRMuEEVH37Q6rpZvsZYHX9uhJRAA/KEB9SbePxCiL7VhRY/ be16YK2O+bVDBK/9ZyFWZ6HowV0KwuZQkViwDAGiEredw== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 1c9e6850 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <52421@debbugs.gnu.org>; Sat, 11 Dec 2021 02:23:18 +0000 (UTC) From: Julien Lepiller Date: Sat, 11 Dec 2021 03:23:04 +0100 Message-Id: <50efd67f908049eaf546d02e2b65aa17ec90c471.1639188753.git.julien@lepiller.eu> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211211031159.29aa79db@tachikoma.lepiller.eu> References: <20211211031159.29aa79db@tachikoma.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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/java.scm (java-jctools-core-1): New variable. --- gnu/packages/java.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 51b8bc673d..f37baabd37 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -11350,6 +11350,33 @@ (define-public java-lmax-disruptor message queues or resource locking.") (license license:asl2.0))) +(define-public java-jctools-core-1 + (package + (name "java-jctools-core") + (version "1.2.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JCTools/JCTools") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "105my29nwd4djvdllmq8s3jdzbyplbkxzwmddxiiilb4yqr1pghb")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "java-jctools-core.jar" + #:source-dir "jctools-core/src/main/java" + #:test-dir "jctools-core/src/test")) + (native-inputs + `(("java-junit" ,java-junit) + ("java-hamcrest-all" ,java-hamcrest-all))) + (home-page "https://github.com/JCTools/JCTools") + (synopsis "Concurrency Tools for Java") + (description "This library implement concurrent data structures that are +not natively available in Java.") + (license license:asl2.0))) + (define-public java-commons-bcel (package (name "java-commons-bcel") From patchwork Sat Dec 11 02:23:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 35121 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 9F56327BBEA; Sat, 11 Dec 2021 02:24:53 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 655ED27BBE9 for ; Sat, 11 Dec 2021 02:24:53 +0000 (GMT) Received: from localhost ([::1]:38352 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mvs48-0002Cg-B9 for patchwork@mira.cbaines.net; Fri, 10 Dec 2021 21:24:48 -0500 Received: from eggs.gnu.org ([209.51.188.92]:49498) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mvs3R-0001od-W8 for guix-patches@gnu.org; Fri, 10 Dec 2021 21:24:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:36729) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mvs3O-0005D7-SS for guix-patches@gnu.org; Fri, 10 Dec 2021 21:24:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mvs3O-0007MX-PR for guix-patches@gnu.org; Fri, 10 Dec 2021 21:24:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52421] [PATCH 3/5] gnu: Add java-conversant-disruptor. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 11 Dec 2021 02:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52421 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52421@debbugs.gnu.org Received: via spool by 52421-submit@debbugs.gnu.org id=B52421.163918940728233 (code B ref 52421); Sat, 11 Dec 2021 02:24:02 +0000 Received: (at 52421) by debbugs.gnu.org; 11 Dec 2021 02:23:27 +0000 Received: from localhost ([127.0.0.1]:48269 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mvs2o-0007LI-Mz for submit@debbugs.gnu.org; Fri, 10 Dec 2021 21:23:27 -0500 Received: from lepiller.eu ([89.234.186.109]:32802) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mvs2l-0007KV-G2 for 52421@debbugs.gnu.org; Fri, 10 Dec 2021 21:23:24 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id c95d0a0d for <52421@debbugs.gnu.org>; Sat, 11 Dec 2021 02:23:19 +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=M6APStGuBYAev6jXK0A+qxWTR mox34psoYwq5XwIPx4=; b=hmf0DTww1kFGSbvuOyEnq1QqhaNrGxvCb7jpUO5aa xQD8beGlAZxCl5+Jxteoxo+mTN7T8nkUuVnDmhYhKAPbQWGeblLHNj+abmvGzuJm iRjT+BY1iwdrg5aznN6gYlNVZ2xHx1ydEzEBJ7N0ncBOaW914cfvkSHgAdx7VS7M jwaLO6KxdXbzwi4Vl1spI2lwCMDBkLpTEnhCPE7ytsd+pxOvdsEzWtdd7FxCfQpX 93q7+enS8XGiBhzURVyYQUFn9R8qOvff+KE43YRSc1Bx/e7z6Fr/QlMJT4LBldiL L1cq9DPTGstvmCbTcmZpNrURYWZashnqGkWEI0dujUt4g== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id aa9e7219 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <52421@debbugs.gnu.org>; Sat, 11 Dec 2021 02:23:19 +0000 (UTC) From: Julien Lepiller Date: Sat, 11 Dec 2021 03:23:05 +0100 Message-Id: X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211211031159.29aa79db@tachikoma.lepiller.eu> References: <20211211031159.29aa79db@tachikoma.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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/java.scm (java-conversant-disruptor): New variable. --- gnu/packages/java.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index f37baabd37..192105008f 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -11350,6 +11350,41 @@ (define-public java-lmax-disruptor message queues or resource locking.") (license license:asl2.0))) +(define-public java-conversant-disruptor + (package + (name "java-conversant-disruptor") + (version "1.2.19") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/conversant/disruptor") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0gx1dm7sfg7pa05cs4qby10gfcplai5b5lf1f7ik1a76dh3vhl0g")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "java-conversant-disruptor.jar" + #:source-dir "src/main/java" + #:phases + (modify-phases %standard-phases + (add-before 'build 'copy-resources + (lambda _ + (copy-recursively "src/main/resources" "build/classes"))) + (add-before 'build 'remove-module + (lambda _ + (delete-file "src/main/java/module-info.java")))))) + (native-inputs + `(("java-junit" ,java-junit))) + (home-page "https://github.com/conversant/disruptor") + (synopsis "High performance intra-thread communication") + (description "Conversant Disruptor is the highest performing intra-thread +transfer mechanism available in Java. Conversant Disruptor is an implementation +of this type of ring buffer that has almost no overhead and that exploits a +particularly simple design.") + (license license:asl2.0))) + (define-public java-jctools-core-1 (package (name "java-jctools-core") From patchwork Sat Dec 11 02:23:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 35122 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 71D3627BBEA; Sat, 11 Dec 2021 02:25:33 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 3B39627BBE9 for ; Sat, 11 Dec 2021 02:25:33 +0000 (GMT) Received: from localhost ([::1]:38684 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mvs4q-0002TC-Ca for patchwork@mira.cbaines.net; Fri, 10 Dec 2021 21:25:32 -0500 Received: from eggs.gnu.org ([209.51.188.92]:49504) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mvs3S-0001og-0o for guix-patches@gnu.org; Fri, 10 Dec 2021 21:24:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:36730) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mvs3P-0005D8-8U for guix-patches@gnu.org; Fri, 10 Dec 2021 21:24:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mvs3P-0007Mf-5I for guix-patches@gnu.org; Fri, 10 Dec 2021 21:24:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52421] [PATCH 4/5] gnu. java-lmax-disruptor: Update to 3.4.4. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 11 Dec 2021 02:24:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52421 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52421@debbugs.gnu.org Received: via spool by 52421-submit@debbugs.gnu.org id=B52421.163918940728241 (code B ref 52421); Sat, 11 Dec 2021 02:24:03 +0000 Received: (at 52421) by debbugs.gnu.org; 11 Dec 2021 02:23:27 +0000 Received: from localhost ([127.0.0.1]:48271 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mvs2p-0007LK-5f for submit@debbugs.gnu.org; Fri, 10 Dec 2021 21:23:27 -0500 Received: from lepiller.eu ([89.234.186.109]:32802) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mvs2m-0007KV-AM for 52421@debbugs.gnu.org; Fri, 10 Dec 2021 21:23:24 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id f71d34cd for <52421@debbugs.gnu.org>; Sat, 11 Dec 2021 02:23:20 +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=77GNtedCKfORiZiVdd8fNybFG NC/4SV/x5h2mNZXHYA=; b=mt49PUFOw+Qfi6sHjR5YBFsv6i3rud3438mhMt/DK 9DOuvDC6fHzGYS7cDDw2wCta4kISDeo42XBlwpxpQ0uYmLtMedER8B6l75NeOuFV nYsIWE4seeFERI8decj7Dfk6OptEwT7bTAalBWgf9w3AcslfKEeFJI7U9xOSIjst /Vj0KxSgndi7icZQiURkRxNjy5vz2N1MbC2icFZ52dkvN7zTRrTo6ouCQA9YyOOt EO2DnosAyCh+1iyRb4Ya/Exb4M1Derh8DvQY2dGFzU3Aoa168ZZLfAN1xteTF5T2 CyutHeJZWI/unYei0PzsIXzmm5cdK7u/pfncIXTYTjWXQ== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 24633901 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <52421@debbugs.gnu.org>; Sat, 11 Dec 2021 02:23:19 +0000 (UTC) From: Julien Lepiller Date: Sat, 11 Dec 2021 03:23:06 +0100 Message-Id: X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211211031159.29aa79db@tachikoma.lepiller.eu> References: <20211211031159.29aa79db@tachikoma.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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/java.scm (java-lmax-disruptor): Update to 3.4.4. --- gnu/packages/java.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 192105008f..785e9f13e2 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -11318,15 +11318,16 @@ (define-public java-bouncycastle (define-public java-lmax-disruptor (package (name "java-lmax-disruptor") - (version "3.3.7") + (version "3.4.4") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/LMAX-Exchange/disruptor/" - "archive/" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/LMAX-Exchange/disruptor") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "17da2gwj5abnlsfgn2xqjk5lgzbg4vkb0hdv2dvc8r2fx4bi7w3g")))) + "02c5kp3n8a73dq9ay7ar53s1k3x61z9yzc5ikqb03m6snr1wpfqn")))) (build-system ant-build-system) (arguments `(#:jar-name "java-lmax-disruptor.jar" From patchwork Sat Dec 11 02:23:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 35120 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 D331F27BBEA; Sat, 11 Dec 2021 02:24:43 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 9616727BBE9 for ; Sat, 11 Dec 2021 02:24:43 +0000 (GMT) Received: from localhost ([::1]:37866 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mvs42-0001sW-O9 for patchwork@mira.cbaines.net; Fri, 10 Dec 2021 21:24:42 -0500 Received: from eggs.gnu.org ([209.51.188.92]:49502) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mvs3S-0001of-0L for guix-patches@gnu.org; Fri, 10 Dec 2021 21:24:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:36731) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mvs3P-0005D9-S6 for guix-patches@gnu.org; Fri, 10 Dec 2021 21:24:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mvs3P-0007Mm-HJ for guix-patches@gnu.org; Fri, 10 Dec 2021 21:24:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52421] [PATCH 5/5] gnu: java-log4j-api: Update to 2.15.0. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 11 Dec 2021 02:24:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52421 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52421@debbugs.gnu.org Received: via spool by 52421-submit@debbugs.gnu.org id=B52421.163918940728247 (code B ref 52421); Sat, 11 Dec 2021 02:24:03 +0000 Received: (at 52421) by debbugs.gnu.org; 11 Dec 2021 02:23:27 +0000 Received: from localhost ([127.0.0.1]:48273 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mvs2p-0007LS-Eg for submit@debbugs.gnu.org; Fri, 10 Dec 2021 21:23:27 -0500 Received: from lepiller.eu ([89.234.186.109]:32802) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mvs2n-0007KV-2Y for 52421@debbugs.gnu.org; Fri, 10 Dec 2021 21:23:25 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id db87287f for <52421@debbugs.gnu.org>; Sat, 11 Dec 2021 02:23:20 +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=x52/8jZZFsADjUmMn7r3L5Wef WG/4nztNYErNUPtLqo=; b=li7dMAXTzAbAIhaPsPlqm6rKhZmYL1QUK6paDtmsQ 4eXgzhu1K7nP0kQs+3O+ZY+QglqDQTBAWYQCYnKmtHx0Y2ICaT/TdtWek3OfcXZh XxC+r0Mn+Y5u+QAzIAy46aVGSOXKuN9ZwhGZe0KVUtlW389SUqOJ3IuQArNRzykb OrQEVufbd0vhoG7I3S7cLbBdcqCNpStQ8tHQiXWl7gRbwzP9DaA6uq0vUSJqAdYw pyFlSKTSn2/3FjIVXqpQO5lhg2H5mrvSjWHaJhfvjhK4qAVh+0iqG3ta+9UGxJy+ wTYzZBOlsjqSnsaiKIPZGMLp7KQYqRoGNBV8ef2ul/MPA== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 2cf37823 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <52421@debbugs.gnu.org>; Sat, 11 Dec 2021 02:23:20 +0000 (UTC) From: Julien Lepiller Date: Sat, 11 Dec 2021 03:23:07 +0100 Message-Id: X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211211031159.29aa79db@tachikoma.lepiller.eu> References: <20211211031159.29aa79db@tachikoma.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" X-getmail-retrieved-from-mailbox: Patches Includes fixes for CVE-2017-5645, CVE-2020-9488 and CVE-2021-44228. * gnu/packages/java.scm (java-log4j-api): Update to 2.15.0. (java-log4j-core, java-log4j-1.2-api)[inputs]: Adjust accordingly. --- gnu/packages/java.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 785e9f13e2..d295077113 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -7840,14 +7840,14 @@ (define-public java-javax-mail (define-public java-log4j-api (package (name "java-log4j-api") - (version "2.4.1") + (version "2.15.0") (source (origin (method url-fetch) (uri (string-append "mirror://apache/logging/log4j/" version "/apache-log4j-" version "-src.tar.gz")) (sha256 (base32 - "0j5p9gik0jysh37nlrckqbky12isy95cpwg2gv5fas1rcdqbraxd")))) + "0h4ndw096h9cql0kyi1zd0ymp8hqxc1jdgdxkn0kxf8vd9b4dx14")))) (build-system ant-build-system) (arguments `(#:tests? #f ; tests require unpackaged software @@ -7869,6 +7869,7 @@ (define-public java-log4j-api `(("java-osgi-core" ,java-osgi-core) ("java-hamcrest-core" ,java-hamcrest-core) ("java-junit" ,java-junit))) + (properties '((cpe-name . "log4j"))) (home-page "https://logging.apache.org/log4j/2.x/") (synopsis "API module of the Log4j logging framework for Java") (description @@ -7886,7 +7887,11 @@ (define-public java-log4j-core ("java-log4j-api" ,java-log4j-api) ("java-mail" ,java-mail) ("java-jboss-jms-api-spec" ,java-jboss-jms-api-spec) + ("java-conversant-disruptor" ,java-conversant-disruptor) ("java-lmax-disruptor" ,java-lmax-disruptor) + ("java-jctools-core" ,java-jctools-core-1) + ("java-stax2-api" ,java-stax2-api) + ("java-jansi" ,java-jansi) ("java-kafka" ,java-kafka-clients) ("java-datanucleus-javax-persistence" ,java-datanucleus-javax-persistence) ("java-fasterxml-jackson-annotations" ,java-fasterxml-jackson-annotations) @@ -7934,6 +7939,7 @@ (define-public java-log4j-1.2-api (inputs `(("log4j-api" ,java-log4j-api) ("log4j-core" ,java-log4j-core) + ("java-jboss-jms-api-spec" ,java-jboss-jms-api-spec) ("osgi-core" ,java-osgi-core) ("eclipse-osgi" ,java-eclipse-osgi) ("java-lmax-disruptor" ,java-lmax-disruptor)))))