diff options
| author | Julien Lepiller <julien@lepiller.eu> | 2026-03-28 13:12:47 +0100 |
|---|---|---|
| committer | Julien Lepiller <julien@lepiller.eu> | 2026-04-20 08:30:44 +0200 |
| commit | 5bef6564ba147212c673fdb370f1b824f83d246f (patch) | |
| tree | 33e022ddad943c28df07bdac3713354b74e66836 /gnu/packages | |
| parent | c781426226d934f197e4807f91a491042277a5b9 (diff) | |
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
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/java.scm | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index fecc6bff9ba..3f23471dd7f 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm | |||
| @@ -3294,6 +3294,9 @@ is implemented.") | |||
| 3294 | `(;; Tests require junit | 3294 | `(;; Tests require junit |
| 3295 | #:tests? #f | 3295 | #:tests? #f |
| 3296 | #:jar-name "qdox.jar" | 3296 | #:jar-name "qdox.jar" |
| 3297 | ;; Explicitely use an ant version that includes the junit tasks, since | ||
| 3298 | ;; it is a dependency of junit. | ||
| 3299 | #:ant ,ant | ||
| 3297 | #:phases | 3300 | #:phases |
| 3298 | (modify-phases %standard-phases | 3301 | (modify-phases %standard-phases |
| 3299 | (replace 'unpack | 3302 | (replace 'unpack |
| @@ -3402,6 +3405,9 @@ documentation tools.") | |||
| 3402 | `(;; Tests require junit, which ultimately depends on this package. | 3405 | `(;; Tests require junit, which ultimately depends on this package. |
| 3403 | #:tests? #f | 3406 | #:tests? #f |
| 3404 | #:build-target "jar" | 3407 | #:build-target "jar" |
| 3408 | ;; Explicitely use an ant version that includes the junit tasks, since | ||
| 3409 | ;; it is a dependency of junit. | ||
| 3410 | #:ant ,ant | ||
| 3405 | #:phases | 3411 | #:phases |
| 3406 | (modify-phases %standard-phases | 3412 | (modify-phases %standard-phases |
| 3407 | (add-before 'build 'do-not-use-bundled-asm | 3413 | (add-before 'build 'do-not-use-bundled-asm |
| @@ -3500,6 +3506,9 @@ testing frameworks, mocking libraries and UI validation rules.") | |||
| 3500 | (build-system ant-build-system) | 3506 | (build-system ant-build-system) |
| 3501 | (arguments | 3507 | (arguments |
| 3502 | `(#:tests? #f ; Tests require junit | 3508 | `(#:tests? #f ; Tests require junit |
| 3509 | ;; Explicitely use an ant version that includes the junit tasks, since | ||
| 3510 | ;; it is a dependency of junit. | ||
| 3511 | #:ant ,ant | ||
| 3503 | #:modules ((guix build ant-build-system) | 3512 | #:modules ((guix build ant-build-system) |
| 3504 | (guix build java-utils) | 3513 | (guix build java-utils) |
| 3505 | (guix build utils) | 3514 | (guix build utils) |
| @@ -3585,6 +3594,9 @@ testing frameworks, mocking libraries and UI validation rules.") | |||
| 3585 | (native-inputs '()) | 3594 | (native-inputs '()) |
| 3586 | (arguments | 3595 | (arguments |
| 3587 | `(#:tests? #f | 3596 | `(#:tests? #f |
| 3597 | ;; Explicitely use an ant version that includes the junit tasks, since | ||
| 3598 | ;; it is a dependency of junit. | ||
| 3599 | #:ant ,ant | ||
| 3588 | #:phases | 3600 | #:phases |
| 3589 | (modify-phases %standard-phases | 3601 | (modify-phases %standard-phases |
| 3590 | (delete 'configure) | 3602 | (delete 'configure) |
| @@ -3647,6 +3659,9 @@ testing frameworks, mocking libraries and UI validation rules.") | |||
| 3647 | `(#:jar-name "junit.jar" | 3659 | `(#:jar-name "junit.jar" |
| 3648 | #:source-dir "src/main/java" | 3660 | #:source-dir "src/main/java" |
| 3649 | #:test-dir "src/test" | 3661 | #:test-dir "src/test" |
| 3662 | ;; Explicitely use an ant version that includes the junit tasks, so | ||
| 3663 | ;; we can run the tests. | ||
| 3664 | #:ant ,ant | ||
| 3650 | #:test-exclude (list "**/SimpleTest.java" "**/StackTracesTest.java" | 3665 | #:test-exclude (list "**/SimpleTest.java" "**/StackTracesTest.java" |
| 3651 | "**/RuleChainTest.java" "**/TestWatchmanTest.java") | 3666 | "**/RuleChainTest.java" "**/TestWatchmanTest.java") |
| 3652 | #:phases | 3667 | #:phases |
| @@ -5156,6 +5171,9 @@ complex transformations and code analysis tools.") | |||
| 5156 | (build-system ant-build-system) | 5171 | (build-system ant-build-system) |
| 5157 | (arguments | 5172 | (arguments |
| 5158 | `(#:tests? #f | 5173 | `(#:tests? #f |
| 5174 | ;; Explicitely use an ant version that includes the junit tasks, since | ||
| 5175 | ;; it is a dependency of junit. | ||
| 5176 | #:ant ,ant | ||
| 5159 | #:phases | 5177 | #:phases |
| 5160 | (modify-phases %standard-phases | 5178 | (modify-phases %standard-phases |
| 5161 | (delete 'unpack) | 5179 | (delete 'unpack) |
| @@ -5177,6 +5195,9 @@ including java-asm.") | |||
| 5177 | (properties '((hidden? . #t))) | 5195 | (properties '((hidden? . #t))) |
| 5178 | (arguments | 5196 | (arguments |
| 5179 | (substitute-keyword-arguments (package-arguments java-asm) | 5197 | (substitute-keyword-arguments (package-arguments java-asm) |
| 5198 | ;; Explicitely use an ant version that includes the junit tasks, since | ||
| 5199 | ;; it is a dependency of junit. | ||
| 5200 | ((#:ant _ ant) ant) | ||
| 5180 | ((#:tests? _) #f))) | 5201 | ((#:tests? _) #f))) |
| 5181 | (native-inputs `()))) | 5202 | (native-inputs `()))) |
| 5182 | 5203 | ||
