From patchwork Sat Oct 15 21:39:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 43436 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 8DEE027BBEA; Sat, 15 Oct 2022 22:41:01 +0100 (BST) 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 4D6A327BBE9 for ; Sat, 15 Oct 2022 22:41:01 +0100 (BST) Received: from localhost ([::1]:54936 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ojotw-0004eE-Gg for patchwork@mira.cbaines.net; Sat, 15 Oct 2022 17:41:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38294) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ojot2-0003iN-TQ for guix-patches@gnu.org; Sat, 15 Oct 2022 17:40:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43664) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ojot2-0004vf-KO for guix-patches@gnu.org; Sat, 15 Oct 2022 17:40:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ojot2-0008Ko-Em for guix-patches@gnu.org; Sat, 15 Oct 2022 17:40:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58553] [PATCH 6/7] gnu: java-commons-jcs: Update to 3.1. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 15 Oct 2022 21:40:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58553 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58553@debbugs.gnu.org Received: via spool by 58553-submit@debbugs.gnu.org id=B58553.166586999331976 (code B ref 58553); Sat, 15 Oct 2022 21:40:04 +0000 Received: (at 58553) by debbugs.gnu.org; 15 Oct 2022 21:39:53 +0000 Received: from localhost ([127.0.0.1]:42735 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ojosr-0008JZ-Cp for submit@debbugs.gnu.org; Sat, 15 Oct 2022 17:39:53 -0400 Received: from lepiller.eu ([89.234.186.109]:40378) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ojosi-0008IS-Mx for 58553@debbugs.gnu.org; Sat, 15 Oct 2022 17:39:45 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id f04d0455 for <58553@debbugs.gnu.org>; Sat, 15 Oct 2022 21:39:37 +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=eeS43Zy3gXVbEv8DF3+5FGFa0 mn8dbep4gG/+26TWtE=; b=lH3X/pZpasXpldSuapmNohU8pPJGUR4W2r0NfCEoy afxo8wSphK+UOhovlPpUd2REFYcU6kifKJ263c4Iko7Lw54qKfuNwLasvri9S27U BkeFjWetVnFDPY3bWhf0Q0XKesjuGCGHiO9DmGlpi+tgnXcM7RmwKMezj49rD4bB mRAgrVD62wrPhTcoQdK86BkS7Ul3VfrdiL1jcXQ8jSKQ8Igjt445rdwmv0C+oLJN 5MLrE/EfRe4SCK7sS6rAvpq+tPxCqf+hdGwO3O6lDmiJmJIPH8LGAKFgsOJ3r662 7EJvr5hmzl5VhfrOTLuNwnQao5zpIi7TdJelbC3RRVz8A== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 736947df (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <58553@debbugs.gnu.org>; Sat, 15 Oct 2022 21:39:36 +0000 (UTC) From: Julien Lepiller Date: Sat, 15 Oct 2022 23:39:24 +0200 Message-Id: <20221015213925.6447-6-julien@lepiller.eu> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221015213925.6447-1-julien@lepiller.eu> References: <20221015233630.4da3d935@sybil.lepiller.eu> <20221015213925.6447-1-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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/java.scm (java-commons-jcs): Update to 3.1. (josm)[arguments]: Remove now unneeded phase. --- gnu/packages/geo.scm | 9 --------- gnu/packages/java.scm | 28 +++++++++------------------- 2 files changed, 9 insertions(+), 28 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index faec60ebcc..0ab711c501 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1756,15 +1756,6 @@ (define-public josm "1970-01-01 00:00:00 +0000" "")))) #t)) - (add-before 'build 'fix-jcs - (lambda _ - ;; This version of JOSM uses an unreleased version of commons-jcs, - ;; which has renamed its classes to another namespace. Rename them - ;; back so they can be used with our version of jcs. - (substitute* (find-files "." ".*.java$") - (("jcs3") "jcs") - (("ICache.NAME_COMPONENT_DELIMITER") "\":\"")) - #t)) (add-before 'build 'fix-classpath (lambda* (#:key inputs #:allow-other-keys) (setenv "CLASSPATH" diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 236a910ece..96a4937be0 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -6331,36 +6331,26 @@ (define-public java-commons-dbcp (define-public java-commons-jcs (package (name "java-commons-jcs") - (version "2.2.1") + (version "3.1") (source (origin (method url-fetch) (uri (string-append "mirror://apache/commons/jcs/source/" - "commons-jcs-dist-" version "-src.tar.gz")) + "commons-jcs3-dist-" version "-src.tar.gz")) (sha256 (base32 - "0syhq2npjbrl0azqfjm0gvash1qd5qjy4qmysxcrqjsk0nf9fa1q")))) + "0y1lm1xnsj99bf7y9mkvbzqfy8dr7ac8zcbkpsjgzb9vhabfsbac")))) (build-system ant-build-system) (arguments `(#:jar-name "commons-jcs.jar" #:source-dir "commons-jcs-core/src/main/java" #:test-dir "commons-jcs-core/src/test" - #:tests? #f; requires hsqldb - #:phases - (modify-phases %standard-phases - (add-before 'build 'prepare - (lambda _ - (with-directory-excursion - "commons-jcs-core/src/main/java/org/apache/commons/jcs" - (substitute* - "auxiliary/disk/jdbc/dsfactory/SharedPoolDataSourceFactory.java" - (("commons.dbcp") "commons.dbcp2") - ((".*\\.setMaxActive.*") "")) - ;;; Remove dependency on velocity-tools - (delete-file "admin/servlet/JCSAdminServlet.java")) - #t))))) + #:tests? #f)); requires hsqldb (propagated-inputs - (list java-classpathx-servletapi java-commons-logging-minimal - java-commons-httpclient java-commons-dbcp)) + (list java-classpathx-servletapi + java-commons-dbcp + java-httpcomponents-httpclient + java-httpcomponents-httpcore + java-log4j-api)) (native-inputs (list java-junit)) (home-page "https://commons.apache.org/proper/commons-jcs/")