From: Julien Lepiller <julien@lepiller.eu>
To: 58553@debbugs.gnu.org
Subject: [bug#58553] [PATCH 4/7] gnu: java-commons-compress: Update to 1.21.
Date: Sat, 15 Oct 2022 23:39:22 +0200 [thread overview]
Message-ID: <20221015213925.6447-4-julien@lepiller.eu> (raw)
In-Reply-To: <20221015213925.6447-1-julien@lepiller.eu>
* gnu/packages/java.scm (java-commons-compress): Update to 1.21.
(java-osgi-annotation, java-osgi-core): Create pom file and install from
it.
* gnu/packages/maven.scm (java-surefire-parent-pom): Fix pom fixing.
---
gnu/packages/java.scm | 44 ++++++++++++++++++++----------------------
gnu/packages/maven.scm | 3 +--
2 files changed, 22 insertions(+), 25 deletions(-)
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index a433281ce3..236a910ece 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -6790,41 +6790,29 @@ (define-public java-jsch
(define-public java-commons-compress
(package
(name "java-commons-compress")
- (version "1.13")
+ (version "1.21")
(source (origin
(method url-fetch)
(uri (string-append "mirror://apache/commons/compress/source/"
"commons-compress-" version "-src.tar.gz"))
(sha256
(base32
- "1vjqvavrn0babffn1kciz6v52ibwq2vwhzlb95hazis3lgllnxc8"))))
+ "1rkpb6xcyly1wnbx4q6iq6p5hrr0h1d0ppb5r07psc75cbmizjry"))))
(build-system ant-build-system)
(arguments
`(#:jar-name "commons-compress.jar"
#:source-dir "src/main/java"
+ #:tests? #f; requires java-mockito-3
#:phases
(modify-phases %standard-phases
- (add-after 'unpack 'delete-bad-tests
- (lambda _
- (with-directory-excursion "src/test/java/org/apache/commons/compress/"
- ;; FIXME: These tests really should not fail. Maybe they are
- ;; indicative of problems with our Java packaging work.
-
- ;; This test fails with a null pointer exception.
- (delete-file "archivers/sevenz/SevenZOutputFileTest.java")
- ;; This test fails to open test resources.
- (delete-file "archivers/zip/ExplodeSupportTest.java")
-
- ;; FIXME: This test adds a dependency on powermock, which is hard to
- ;; package at this point.
- ;; https://github.com/powermock/powermock
- (delete-file "archivers/sevenz/SevenZNativeHeapTest.java"))
- #t))
(replace 'install (install-from-pom "pom.xml")))))
(propagated-inputs
- (list java-asm-3 java-brotli java-xz java-zstd apache-commons-parent-pom-52))
- (native-inputs
- (list java-junit java-mockito-1))
+ (list java-asm-3
+ java-brotli
+ java-osgi-core
+ java-xz
+ java-zstd
+ apache-commons-parent-pom-52))
(home-page "https://commons.apache.org/proper/commons-compress/")
(synopsis "Java library for working with compressed files")
(description "The Apache Commons Compress library defines an API for
@@ -6886,7 +6874,12 @@ (define-public java-osgi-annotation
(build-system ant-build-system)
(arguments
`(#:tests? #f ; no tests
- #:jar-name "osgi-annotation.jar"))
+ #:jar-name "osgi-annotation.jar"
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'install 'create-pom
+ (generate-pom.xml "pom.xml" "osgi" "osgi-annotation" ,version))
+ (replace 'install (install-from-pom "pom.xml")))))
(home-page "https://www.osgi.org")
(synopsis "Annotation module of OSGi framework")
(description
@@ -6911,7 +6904,12 @@ (define-public java-osgi-core
(build-system ant-build-system)
(arguments
`(#:tests? #f ; no tests
- #:jar-name "osgi-core.jar"))
+ #:jar-name "osgi-core.jar"
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'install 'create-pom
+ (generate-pom.xml "pom.xml" "org.osgi" "org.osgi.core" ,version))
+ (replace 'install (install-from-pom "pom.xml")))))
(inputs
(list java-osgi-annotation))
(home-page "https://www.osgi.org")
diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm
index b7794c4e89..d3e5677669 100644
--- a/gnu/packages/maven.scm
+++ b/gnu/packages/maven.scm
@@ -3462,8 +3462,7 @@ (define-public java-surefire-parent-pom
(add-before 'install 'fix-pom-dependency-versions
(lambda _
(substitute* "pom.xml"
- (("1.11") ,(package-version java-commons-compress))
- (("1.13") ,(package-version java-commons-codec)))
+ (("1.11") ,(package-version java-commons-codec)))
(substitute* "pom.xml"
(("commonsLang3Version>.*")
(string-append
--
2.38.0
next prev parent reply other threads:[~2022-10-15 21:40 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 ` Julien Lepiller [this message]
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 ` [bug#58553] [PATCH 6/7] gnu: java-commons-jcs: Update to 3.1 Julien Lepiller
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
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221015213925.6447-4-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 public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).