From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id EFRwNfzFS2N4vQAAbAwnHQ (envelope-from ) for ; Sun, 16 Oct 2022 10:51:09 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id sN6gNPzFS2OwEAAAG6o9tA (envelope-from ) for ; Sun, 16 Oct 2022 10:51:08 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id A34F047019 for ; Sun, 16 Oct 2022 10:51:08 +0200 (CEST) Received: from localhost ([::1]:42896 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ojzMR-0006h6-RY for larch@yhetil.org; Sun, 16 Oct 2022 04:51:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53050) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ojzLR-00063g-EX for guix-patches@gnu.org; Sun, 16 Oct 2022 04:50:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:44246) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ojzLR-0000eH-5r for guix-patches@gnu.org; Sun, 16 Oct 2022 04:50:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ojzLR-0005rj-1o for guix-patches@gnu.org; Sun, 16 Oct 2022 04:50:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58553] [PATCH 7/8] gnu: java-commons-jcs: Update to 3.1. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 16 Oct 2022 08:50:05 +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.166591014722416 (code B ref 58553); Sun, 16 Oct 2022 08:50:05 +0000 Received: (at 58553) by debbugs.gnu.org; 16 Oct 2022 08:49:07 +0000 Received: from localhost ([127.0.0.1]:43316 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ojzKV-0005pO-C8 for submit@debbugs.gnu.org; Sun, 16 Oct 2022 04:49:07 -0400 Received: from lepiller.eu ([89.234.186.109]:56966) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ojzKQ-0005nc-Gl for 58553@debbugs.gnu.org; Sun, 16 Oct 2022 04:49:03 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id f198ebb7 for <58553@debbugs.gnu.org>; Sun, 16 Oct 2022 08:48:55 +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=YZ0ppmc1e/JRyDsqm/DPTL62O e1fY6QDmjinZRo8Kqc=; b=h0tVawrr9ZAITM5n4N3eXIut6Ego/0vT1BLKaRy8x XTmaK5tH5Wa0UYTQ8wmOMDirp212E/yMuTWXDtJfj+B7DD4zd8hD9SyeUPSy2NAy Aum6w0jiJ3H93EUOcZvY8rdI0TYm0+SbdEIbAcluW3q2iU8Npe9TfJ47zZ+ZFwu5 QPiy1zlayxgxHQI1VGUa7Bq7ETAE2OA8kAxWBMyF+qXj/fJOKf/4vZlF24hLCm1H UluKYo8IVYr/exmAgMoSyUbUrBmJcZqhy1Z4lMW4noAO7kMZHN9jXFycdUy0aMj8 4+wQKqiauDgbAjB1m1M7p0YoypA6X46Rf+H0ZsU7Lhf7A== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id a8da45da (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <58553@debbugs.gnu.org>; Sun, 16 Oct 2022 08:48:55 +0000 (UTC) From: Julien Lepiller Date: Sun, 16 Oct 2022 10:48:37 +0200 Message-Id: <20221016084838.25584-7-julien@lepiller.eu> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221016084838.25584-1-julien@lepiller.eu> References: <20221015233630.4da3d935@sybil.lepiller.eu> <20221016084838.25584-1-julien@lepiller.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1665910268; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=zliAk4+b2+w2SUYLe8d0dXMI5xGeEycD+NWmSoS2TyY=; b=GJY0vhK7B2yg5Q+hzCFU5G1dBE0rsIWs8ZrlBHwmDTCigsFLQ5W9VC7uZImZeEHIHjzn13 Q8IiNhc798GGxQWJMVq61T1XPUzFeRrcn3V/1iP2hdovDrkWAHmPUMfN69+pKTschx2ar4 3LPG8N8j4fnpr0t28VCoCOLsGloNbe+KDEq9b/dwu/P/bYoSXAgkfGAkjec1CP+t1jkMRy zsiJILzbWH//Ibo8FgXkc/+S7/ISCmaR5cBZxEEqFhyH1WA448QS3LEnS3Y/ad68vmoBZb mBbPpt6cXtUq68ERCbeIEGYffjOJWshxXf5yIErZKaYFJtcj9o5HxHW5S1OWrQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1665910268; a=rsa-sha256; cv=none; b=LIUNdBYDTPPT+GB1rGPdvdVZb/EwT/bcSiLhvGZFBJW5Q6K16bsPk6br+hxqbGGfGGaeoq N1S33VT2aET1zwNFzBuFjRQccOQzBaAWwZAM+XO+8QIUk2BEPVGRwdSKxvUfM35aCY2ZeM qffXTWyjsQiXEzlB6SqGROSu4fuflgY/iCywViPg+bntGqo8cNQG9x2mAHsSeRRi+wafVJ cBFpAOQgFgICfFXBWpI3NFCtz7cTI4sFuCMSW1a9z/i6yrTaQqOzGmYHR5vsBvF2Q8kA6I xBURJyexTCH59Sl9L5UFPVI7TNtO1zjBK/U5GywEggR1XxZZUpup2EE3x3eXaw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lepiller.eu header.s=dkim header.b=h0tVawrr; dmarc=fail reason="SPF not aligned (relaxed)" header.from=lepiller.eu (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 8.30 X-Spam: Yes Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lepiller.eu header.s=dkim header.b=h0tVawrr; dmarc=fail reason="SPF not aligned (relaxed)" header.from=lepiller.eu (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: A34F047019 X-Spam-Score: 8.30 X-Migadu-Spam: Yes X-Migadu-Scanner: scn0.migadu.com X-TUID: 8UGBNHI4oTwm * 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 eadb928eec..5eef883495 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -6369,36 +6369,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/") -- 2.38.0