diff options
Diffstat (limited to 'gnu/packages/java.scm')
| -rw-r--r-- | gnu/packages/java.scm | 66 |
1 files changed, 34 insertions, 32 deletions
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 4c28659241..118f055970 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1836,7 +1836,7 @@ OpenJDK.") (package (inherit openjdk17) (name "jbr") - (version "17.0.10b1207.6") + (version "17.0.11b1207.30") (source (origin (method git-fetch) (uri (git-reference @@ -1845,7 +1845,7 @@ OpenJDK.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "034c00dr5qmyxvw3xpnpbhlmz3w8pkp52zm7wypjprczd90ylfrc")) + "5bbf5z8faf9sdkig2fwkj06hb7hs9s3bpzzvbqn2i75lbwqk3bln")) (patches (search-patches "jbr-17-xcursor-no-dynamic.patch")))) (arguments (substitute-keyword-arguments (package-arguments openjdk17) @@ -1870,7 +1870,7 @@ OpenJDK.") (package (inherit openjdk21) (name "jbr") - (version "21.0.2b397.7") + (version "21.0.3b509.11") (source (origin (method git-fetch) (uri (git-reference @@ -1879,7 +1879,7 @@ OpenJDK.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "0xwldx2k9cx0b6xdh8ic0v87cr89khwr8hxnnrpwdsia1i8gkpga")) + "03xkghbp0b1czc2ags9n8ilprf9sy4bhsma0wf8xfapqn6d2sfyd")) (patches (search-patches "openjdk-21-fix-rpath.patch" "jbr-17-xcursor-no-dynamic.patch")))) (inputs @@ -11036,33 +11036,35 @@ those in Perl and JavaScript.") "0y6vq30i5g276kw0v2bhbvci22ijg7ax49ap2611yqlhbs4d6dqv")))) (build-system ant-build-system) (arguments - `(#:jdk ,icedtea-8; java.util.function - #:jar-name "java-testng.jar" - #:source-dir "src/main/java" - #:phases - (modify-phases %standard-phases - ;; FIXME: I don't know why these tests fail + (list + #:jdk icedtea-8; java.util.function + #:jar-name "java-testng.jar" + #:source-dir "src/main/java" + #:phases + '(modify-phases %standard-phases (add-after 'unpack 'delete-failing-tests (lambda _ + ;; FIXME: I don't know why these tests fail (substitute* "src/test/resources/testng.xml" + ;; expected:<[0]> but was:<[3]> (("<class name=\"test.configuration.github1625.TestRunnerIssue1625\"/>") "") - (("<class name=\"test.serviceloader.ServiceLoaderTest\" />") "")) - #t)) + ;; expected [3] but found [2] + (("<class name=\"test.serviceloader.ServiceLoaderTest\" />") "") + ;; This is a parallel test and we've observed that it fails + ;; sometimes. + (("<class name=\"test.dataprovider.DataProviderTest\"/>") "")))) ;; We don't have groovy (add-after 'unpack 'delete-groovy-tests (lambda _ (delete-file-recursively "src/test/java/test/dependent/issue1648/") (substitute* "src/test/resources/testng.xml" - (("<class name=\"test.dependent.issue1648.TestRunner\"/>") "")) - #t)) + (("<class name=\"test.dependent.issue1648.TestRunner\"/>") "")))) (add-before 'build 'copy-resources (lambda _ - (copy-recursively "src/main/resources" "build/classes") - #t)) + (copy-recursively "src/main/resources" "build/classes"))) (add-before 'check 'copy-test-resources (lambda _ - (copy-recursively "src/test/resources" "build/test-classes") - #t)) + (copy-recursively "src/test/resources" "build/test-classes"))) (replace 'check (lambda _ (invoke "ant" "compile-tests") @@ -11075,20 +11077,20 @@ those in Perl and JavaScript.") "-Dtest.resources.dir=src/test/resources" "org.testng.TestNG" "src/test/resources/testng.xml")))))) (propagated-inputs - `(("junit" ,java-junit) - ("java-jsr305" ,java-jsr305) - ("java-bsh" ,java-bsh) - ("java-jcommander" ,java-jcommander) - ("java-guice" ,java-guice) - ("snakeyaml" ,java-snakeyaml))) - (native-inputs - `(("guava" ,java-guava) - ("java-javax-inject" ,java-javax-inject) - ("java-hamcrest" ,java-hamcrest-all) - ("java-assertj" ,java-assertj) - ("java-mockito" ,java-mockito-1) - ("cglib" ,java-cglib) - ("aopalliance" ,java-aopalliance))) + (list java-junit + java-jsr305 + java-bsh + java-jcommander + java-guice + java-snakeyaml)) + (native-inputs + (list java-guava + java-javax-inject + java-hamcrest-all + java-assertj + java-mockito-1 + java-cglib + java-aopalliance)) (home-page "https://testng.org") (synopsis "Testing framework") (description "TestNG is a testing framework inspired from JUnit and NUnit |