Make javax.activation an optional dep in OSGi metadata

This commit is contained in:
Mat Booth 2019-05-10 17:50:19 +01:00
parent b3e941feb4
commit 1505704139

View File

@ -3,7 +3,7 @@
Name: glassfish-jaxb Name: glassfish-jaxb
Version: 2.2.11 Version: 2.2.11
Release: 13%{?dist} Release: 14%{?dist}
Summary: JAXB Reference Implementation Summary: JAXB Reference Implementation
License: CDDL-1.1 and GPLv2 with exceptions License: CDDL-1.1 and GPLv2 with exceptions
@ -190,6 +190,10 @@ This package contains the API documentation for %{name}.
<manifestFile>\${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> <manifestFile>\${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
</archive>" bundles/core bundles/runtime </archive>" bundles/core bundles/runtime
# Make javax.activation an optional dep
%pom_xpath_inject "pom:configuration/pom:instructions" "
<Import-Package>javax.activation;resolution:=optional,*</Import-Package>" bundles/runtime
# Disable ancient jaxb1 runtime # Disable ancient jaxb1 runtime
%pom_disable_module jaxb1 runtime %pom_disable_module jaxb1 runtime
@ -291,6 +295,9 @@ rm runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/{FastInfoset,St
%changelog %changelog
* Fri May 10 2019 Mat Booth <mat.booth@redhat.com> - 2.2.11-14
- Make javax.activation an optional dep in OSGi metadata
* Fri May 10 2019 Mat Booth <mat.booth@redhat.com> - 2.2.11-13 * Fri May 10 2019 Mat Booth <mat.booth@redhat.com> - 2.2.11-13
- Add conditional build for reduced dependency set - Add conditional build for reduced dependency set