From 93d63a03e63f92d62f5c9fa9b495bfc9df97fc1c Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Tue, 11 Aug 2020 21:30:37 +0100 Subject: [PATCH] Fastinfoset and Staxex are optional deps, this should be reflected in the OSGi metadata --- jaxb.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/jaxb.spec b/jaxb.spec index f80cba9..5b42df8 100644 --- a/jaxb.spec +++ b/jaxb.spec @@ -3,7 +3,7 @@ Name: jaxb Version: 2.3.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: JAXB Reference Implementation # EDL-1.0 license is BSD-3-clause License: BSD @@ -233,6 +233,9 @@ rm runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/{FastInfo rm runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/{FastInfoset,StAXEx}StreamWriterOutput.java sed -i -e '/org.jvnet.staxex/d' -e '/com.sun.xml.fastinfoset/d' runtime/impl/src/main/java/module-info.java bundles/runtime/src/main/java/module-info.java +# Fastinfoset and Staxex are optional deps, reflect that in OSGi metadata +sed -i -e '//aorg.jvnet.staxex;resolution:=optional,org.jvnet.fastinfoset.stax;resolution:=optional,com.sun.xml.fastinfoset.stax;resolution:=optional,' bundles/runtime/pom.xml + # Ignore tests that require Internet connections sed -i -e 's/void testParse/void ignoreTestParse/' xsom/src/test/java/XSOMParserTest.java # Ignore tests that require an ancient version of javaparser (version in Fedora is too new) @@ -307,6 +310,10 @@ popd %endif %changelog +* Tue Aug 11 2020 Mat Booth - 2.3.3-2 +- Fastinfoset and Staxex are optional deps, this should be reflected in the OSGi + metadata + * Tue Aug 04 2020 Mat Booth - 2.3.3-1 - Update to latest upstream release - Disable javadocs for now, due to https://github.com/fedora-java/xmvn/issues/58