guix_mirror_bot pushed a commit to branch java-team
in repository guix.
commit 6c68f68d3937861953400eeb545c9f199ca5c332
Author: Julien Lepiller <[email protected]>
AuthorDate: Sat Mar 28 13:12:47 2026 +0100
gnu: java-junit: Explicitely use the older ant.
Its dependencies need to use the same ant version.
* gnu/packages/java.scm (java-junit)[arguments]: Use ant.
(java-qdox-1.12, java-jarjar, java-hamcrest-core)
(java-hamcrest-parent-pom, java-org-ow2-parent-pom-1.3)
(java-asm-bootstrap)[arguments]: Use ant.
Change-Id: I522760227a450ac937ad0f4fc0ed27c7e3ec5348
---
gnu/packages/java.scm | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 0f8761e7cf2..6b51702433d 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -3626,6 +3626,9 @@ is implemented.")
`(;; Tests require junit
#:tests? #f
#:jar-name "qdox.jar"
+ ;; Explicitely use an ant version that includes the junit tasks, since
+ ;; it is a dependency of junit.
+ #:ant ,ant
#:phases
(modify-phases %standard-phases
(replace 'unpack
@@ -3734,6 +3737,9 @@ documentation tools.")
`(;; Tests require junit, which ultimately depends on this package.
#:tests? #f
#:build-target "jar"
+ ;; Explicitely use an ant version that includes the junit tasks, since
+ ;; it is a dependency of junit.
+ #:ant ,ant
#:phases
(modify-phases %standard-phases
(add-before 'build 'do-not-use-bundled-asm
@@ -3832,6 +3838,9 @@ testing frameworks, mocking libraries and UI validation
rules.")
(build-system ant-build-system)
(arguments
`(#:tests? #f ; Tests require junit
+ ;; Explicitely use an ant version that includes the junit tasks, since
+ ;; it is a dependency of junit.
+ #:ant ,ant
#:modules ((guix build ant-build-system)
(guix build java-utils)
(guix build utils)
@@ -3917,6 +3926,9 @@ testing frameworks, mocking libraries and UI validation
rules.")
(native-inputs '())
(arguments
`(#:tests? #f
+ ;; Explicitely use an ant version that includes the junit tasks, since
+ ;; it is a dependency of junit.
+ #:ant ,ant
#:phases
(modify-phases %standard-phases
(delete 'configure)
@@ -3979,6 +3991,9 @@ testing frameworks, mocking libraries and UI validation
rules.")
`(#:jar-name "junit.jar"
#:source-dir "src/main/java"
#:test-dir "src/test"
+ ;; Explicitely use an ant version that includes the junit tasks, so
+ ;; we can run the tests.
+ #:ant ,ant
#:test-exclude (list "**/SimpleTest.java" "**/StackTracesTest.java"
"**/RuleChainTest.java" "**/TestWatchmanTest.java")
#:phases
@@ -5505,6 +5520,9 @@ complex transformations and code analysis tools.")
(build-system ant-build-system)
(arguments
`(#:tests? #f
+ ;; Explicitely use an ant version that includes the junit tasks, since
+ ;; it is a dependency of junit.
+ #:ant ,ant
#:phases
(modify-phases %standard-phases
(delete 'unpack)
@@ -5526,6 +5544,9 @@ including java-asm.")
(properties '((hidden? . #t)))
(arguments
(substitute-keyword-arguments (package-arguments java-asm)
+ ;; Explicitely use an ant version that includes the junit tasks, since
+ ;; it is a dependency of junit.
+ ((#:ant _ ant) ant)
((#:tests? _) #f)))
(native-inputs `())))
