rpms/jaxb
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Restore deps on fi and stax-ex for full build mode

Browse Source
This commit is contained in:
Mat Booth 2020-08-18 23:19:11 +01:00
parent 6db1c0fad6
commit 8187e9b9cb
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
jaxb.spec
View File

@ -3,7 +3,7 @@
Name: jaxb Name: jaxb
Version: 2.3.3 Version: 2.3.3
Release: 3%{?dist} Release: 4%{?dist}
Summary: JAXB Reference Implementation Summary: JAXB Reference Implementation
# EDL-1.0 license is BSD-3-clause # EDL-1.0 license is BSD-3-clause
License: BSD License: BSD
@ -25,9 +25,11 @@ BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin)
BuildRequires: mvn(com.sun.istack:istack-commons-runtime) BuildRequires: mvn(com.sun.istack:istack-commons-runtime)
BuildRequires: mvn(com.sun.istack:istack-commons-tools) BuildRequires: mvn(com.sun.istack:istack-commons-tools)
BuildRequires: mvn(com.sun.xml.dtd-parser:dtd-parser) BuildRequires: mvn(com.sun.xml.dtd-parser:dtd-parser)
BuildRequires: mvn(com.sun.xml.fastinfoset:FastInfoset)
BuildRequires: mvn(junit:junit) BuildRequires: mvn(junit:junit)
BuildRequires: mvn(org.apache.ant:ant) BuildRequires: mvn(org.apache.ant:ant)
BuildRequires: mvn(org.apache.maven.plugins:maven-failsafe-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-failsafe-plugin)
BuildRequires: mvn(org.jvnet.staxex:stax-ex)
BuildRequires: mvn(xml-resolver:xml-resolver) BuildRequires: mvn(xml-resolver:xml-resolver)
BuildRequires: mvn(xmlunit:xmlunit) BuildRequires: mvn(xmlunit:xmlunit)
%endif %endif
@ -228,15 +230,13 @@ sed -i -e 's/com\.sun\.org\.apache\.xml\.internal\.resolver/org.apache.xml.resol
%pom_disable_module codemodel %pom_disable_module codemodel
# Don't run tests for minimal build # Don't run tests for minimal build
%pom_remove_plugin -r :maven-failsafe-plugin %pom_remove_plugin -r :maven-failsafe-plugin
%endif # Remove optional extra marshaller implementations for minimal build
# These packages not yet proper JPMS modules in Fedora
# TODO: remove this when staxex, fastinfoset are updated
%pom_remove_dep org.jvnet.staxex:stax-ex runtime/impl bundles/runtime %pom_remove_dep org.jvnet.staxex:stax-ex runtime/impl bundles/runtime
%pom_remove_dep com.sun.xml.fastinfoset:FastInfoset runtime/impl bundles/runtime %pom_remove_dep com.sun.xml.fastinfoset:FastInfoset runtime/impl bundles/runtime
rm runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/{FastInfoset,StAXEx}Connector.java rm runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/{FastInfoset,StAXEx}Connector.java
rm runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/{FastInfoset,StAXEx}StreamWriterOutput.java 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 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
%endif
# Fastinfoset and Staxex are optional deps, reflect that in OSGi metadata # Fastinfoset and Staxex are optional deps, reflect that in OSGi metadata
sed -i -e '/<Import-Package>/aorg.jvnet.staxex;resolution:=optional,org.jvnet.fastinfoset.stax;resolution:=optional,com.sun.xml.fastinfoset.stax;resolution:=optional,' bundles/runtime/pom.xml sed -i -e '/<Import-Package>/aorg.jvnet.staxex;resolution:=optional,org.jvnet.fastinfoset.stax;resolution:=optional,com.sun.xml.fastinfoset.stax;resolution:=optional,' bundles/runtime/pom.xml
@ -316,6 +316,9 @@ popd
%endif %endif
%changelog %changelog
* Tue Aug 18 2020 Mat Booth <mat.booth@redhat.com> - 2.3.3-4
- Restore deps on fi and stax-ex for full build mode
* Mon Aug 17 2020 Mat Booth <mat.booth@redhat.com> - 2.3.3-3 * Mon Aug 17 2020 Mat Booth <mat.booth@redhat.com> - 2.3.3-3
- Add obsoletes/provides and compat aliases for old xsom package - Add obsoletes/provides and compat aliases for old xsom package