1
Fork 0
mirror of https://https.git.savannah.gnu.org/git/guix.git/ synced 2025-07-15 03:20:43 +02:00

gnu: java-commons-jcs: Update to 3.1.

* gnu/packages/java.scm (java-commons-jcs): Update to 3.1.
(josm)[arguments]: Remove now unneeded phase.
This commit is contained in:
Julien Lepiller 2022-10-15 23:32:07 +02:00
parent 82d9fcd9b7
commit 10c82778ab
No known key found for this signature in database
GPG key ID: 53D457B2D636EE82
2 changed files with 11 additions and 24 deletions

View file

@ -6369,14 +6369,14 @@ reduce that load.")
(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"
@ -6385,20 +6385,16 @@ reduce that load.")
#:tests? #f; requires hsqldb
#:phases
(modify-phases %standard-phases
(add-before 'build 'prepare
(add-before 'build 'copy-resources
(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)))))
(copy-recursively "commons-jcs-core/src/main/resources"
"build/classes"))))))
(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/")