diff options
| author | Ludovic Courtès <[email protected]> | 2022-06-12 22:49:47 +0200 |
|---|---|---|
| committer | Ludovic Courtès <[email protected]> | 2022-06-12 22:49:47 +0200 |
| commit | 622545de6c413675b00212336d633c4c6ee3d2bc (patch) | |
| tree | 1e35bd4b023fcc5958b0c4e65b8b69024b1a0c2d /gnu/packages/java.scm | |
| parent | 091eb323ba2787ce64a1fb2796e7e06dbee6037c (diff) | |
| parent | 9c036f2dfb8f25b7eb40bc6946845183e0a54d2e (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/java.scm')
| -rw-r--r-- | gnu/packages/java.scm | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 336e84e3e5..fcac0c2367 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2016 Leo Famulari <[email protected]> ;;; Copyright © 2016, 2017 Roel Janssen <[email protected]> ;;; Copyright © 2017, 2019, 2021 Carlo Zancanaro <[email protected]> -;;; Copyright © 2017-2021 Julien Lepiller <[email protected]> +;;; Copyright © 2017-2022 Julien Lepiller <[email protected]> ;;; Copyright © 2017 Thomas Danckaert <[email protected]> ;;; Copyright © 2016, 2017, 2018 Alex Vong <[email protected]> ;;; Copyright © 2017, 2019, 2021 Tobias Geerinckx-Rice <[email protected]> @@ -4371,6 +4371,14 @@ from source tags and class annotations."))) (copy-recursively "src/main/resources" "build/classes/") #t)) + (add-before 'build 'fix-jdom + (lambda _ + ;; The newer version of jdom now sets multiple features by default + ;; that are not supported. + ;; Skip these features + (substitute* "src/main/java/org/codehaus/plexus/metadata/merge/MXParser.java" + (("throw new XmlPullParserException\\(\"unsupporte feature \"\\+name\\);") + "// skip")))) (add-before 'build 'reinstate-cli ;; The CLI was removed in 2.1.0, but we still need it to build some ;; maven dependencies, and some parts of maven itself. We can't use @@ -4537,6 +4545,14 @@ from source tags and class annotations."))) (copy-recursively "src/main/resources" "build/classes/") #t)) + (add-before 'build 'fix-jdom + (lambda _ + ;; The newer version of jdom now sets multiple features by default + ;; that are not supported. + ;; Skip these features + (substitute* "src/main/java/org/codehaus/plexus/metadata/merge/MXParser.java" + (("throw new XmlPullParserException\\(\"unsupporte feature \"\\+name\\);") + "// skip")))) (add-before 'check 'fix-test-location (lambda _ (substitute* '("src/test/java/org/codehaus/plexus/metadata/DefaultComponentDescriptorWriterTest.java" |