From: Julien Lepiller <julien@lepiller.eu>
To: 58553@debbugs.gnu.org
Subject: [bug#58553] [PATCH 6/7] gnu: java-commons-jcs: Update to 3.1.
Date: Sat, 15 Oct 2022 23:39:24 +0200 [thread overview]
Message-ID: <20221015213925.6447-6-julien@lepiller.eu> (raw)
In-Reply-To: <20221015213925.6447-1-julien@lepiller.eu>
* 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
"<date>1970-01-01 00:00:00 +0000</date>"
"</commit></entry></info>"))))
#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/")
--
2.38.0
next prev parent reply other threads:[~2022-10-15 21:41 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-15 21:36 [bug#58553] [PATCH] gnu: josm: Update to 18570 Julien Lepiller
2022-10-15 21:39 ` [bug#58553] [PATCH 1/7] gnu: Add java-brotli Julien Lepiller
2022-10-15 21:39 ` [bug#58553] [PATCH 2/7] gnu: Add java-zstd Julien Lepiller
2022-10-15 21:39 ` [bug#58553] [PATCH 3/7] gnu: Add java-asm-3 Julien Lepiller
2022-10-15 21:39 ` [bug#58553] [PATCH 4/7] gnu: java-commons-compress: Update to 1.21 Julien Lepiller
2022-10-15 21:39 ` [bug#58553] [PATCH 5/7] gnu: java-opening-hours-parser: Update to 0.27.0 Julien Lepiller
2022-10-15 21:39 ` Julien Lepiller [this message]
2022-10-15 21:39 ` [bug#58553] [PATCH 7/7] gnu: josm: Udpate to 18570 Julien Lepiller
2022-10-16 8:48 ` [bug#58553] [PATCH 1/8] gnu: Add java-brotli Julien Lepiller
2022-10-16 8:48 ` [bug#58553] [PATCH 2/8] gnu: Add java-zstd Julien Lepiller
2022-10-16 8:48 ` [bug#58553] [PATCH 3/8] gnu: Add java-ow-util-ant-tasks Julien Lepiller
2022-10-16 8:48 ` [bug#58553] [PATCH 4/8] gnu: Add java-asm-3 Julien Lepiller
2022-10-16 8:48 ` [bug#58553] [PATCH 5/8] gnu: java-commons-compress: Update to 1.21 Julien Lepiller
2022-10-16 8:48 ` [bug#58553] [PATCH 6/8] gnu: java-opening-hours-parser: Update to 0.27.0 Julien Lepiller
2022-10-16 8:48 ` [bug#58553] [PATCH 7/8] gnu: java-commons-jcs: Update to 3.1 Julien Lepiller
2022-10-16 8:48 ` [bug#58553] [PATCH 8/8] gnu: josm: Udpate to 18570 Julien Lepiller
2022-11-03 14:13 ` bug#58553: " Julien Lepiller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221015213925.6447-6-julien@lepiller.eu \
--to=julien@lepiller.eu \
--cc=58553@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.