Restore JDK 9+ bits for Jaxb

This commit is contained in:
Mat Booth 2020-08-10 15:00:08 +01:00
parent 603a3a2d15
commit dbc9d474ba

View File

@ -1,6 +1,6 @@
Name: jaxb-dtd-parser Name: jaxb-dtd-parser
Version: 1.4.3 Version: 1.4.3
Release: 2%{?dist} Release: 3%{?dist}
Summary: SAX-like API for parsing XML DTDs Summary: SAX-like API for parsing XML DTDs
License: BSD License: BSD
@ -39,18 +39,6 @@ pushd dtd-parser
%pom_remove_plugin :buildnumber-maven-plugin %pom_remove_plugin :buildnumber-maven-plugin
%pom_remove_plugin :glassfish-copyright-maven-plugin %pom_remove_plugin :glassfish-copyright-maven-plugin
# remove unsupported --release argument for maven-compiler-plugin
# re-evaluate after switching to OpenJDK 9+
%pom_xpath_remove "pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration"
%pom_xpath_remove "pom:execution[pom:id='base-compile']/pom:configuration"
# remove unsupported --release argument for maven-javadoc-plugin
# re-evaluate after switching to OpenJDK 9+
%pom_xpath_remove "pom:plugin[pom:artifactId='maven-javadoc-plugin']/pom:configuration"
# remove module-info.java, which breaks compilation on OpenJDK 8
# re-evaluate after switching to OpenJDK 9+
rm src/main/java/module-info.java
popd popd
@ -75,6 +63,9 @@ popd
%changelog %changelog
* Mon Aug 10 2020 Mat Booth <mat.booth@redhat.com> - 1.4.3-3
- Restore JDK 9+ bits for Jaxb
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.3-2 * Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild