[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: gnu: java-plexus-component-metadata: Fix package.
From: |
guix-commits |
Subject: |
branch master updated: gnu: java-plexus-component-metadata: Fix package. |
Date: |
Wed, 08 Jun 2022 14:35:45 -0400 |
This is an automated email from the git hooks/post-receive script.
roptat pushed a commit to branch master
in repository guix.
The following commit(s) were added to refs/heads/master by this push:
new 48a191c15d gnu: java-plexus-component-metadata: Fix package.
48a191c15d is described below
commit 48a191c15d52073185d4ca7e81c63517d779df27
Author: Julien Lepiller <julien@lepiller.eu>
AuthorDate: Sat Jun 4 15:41:41 2022 +0200
gnu: java-plexus-component-metadata: Fix package.
* gnu/packages/java.scm (java-plexus-component-metadat): Apply fix for
newer jdom.
---
gnu/packages/java.scm | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 336e84e3e5..f475f7c270 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -4537,6 +4537,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"
- branch master updated: gnu: java-plexus-component-metadata: Fix package.,
guix-commits <=