Allow building against Java 11

xml-commons-apis.spec

@@ -1,6 +1,6 @@
 Name:          xml-commons-apis
 Version:       1.4.01
-Release:       29%{?dist}
+Release:       30%{?dist}
 Summary:       APIs for DOM, SAX, and JAXP
 License:       ASL 2.0 and W3C and Public Domain
 URL:           http://xml.apache.org/commons/
@@ -53,6 +53,14 @@ iconv -f iso8859-1 -t utf-8 LICENSE.dom-documentation.txt > \
 iconv -f iso8859-1 -t utf-8 LICENSE.dom-software.txt > \
   LICENSE.dom-sof.temp && mv -f LICENSE.dom-sof.temp LICENSE.dom-software.txt
 
+# disable javadoc linting
+sed -i -e '/javadoc packagenames/aadditionalparam="-Xdoclint:none"' build.xml
+
+# in Java 9+ a single underscore is no longer a valid identifier
+sed -i -e 's/\(Throwable\|Exception\) _/\1 ex/' \
+  src/javax/xml/validation/SchemaFactoryFinder.java \
+  src/javax/xml/xpath/XPathFactoryFinder.java
+
 # remove bogus section from poms
 cp %{SOURCE3} %{SOURCE4} .
 sed -i '/distributionManagement/,/\/distributionManagement/ {d}' *.pom
@@ -62,7 +70,7 @@ sed -i '/distributionManagement/,/\/distributionManagement/ {d}' *.pom
 %mvn_alias :xml-apis-ext xerces:dom3-xml-apis
 
 %build
-ant -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 jar javadoc
+ant -Dant.build.javac.source=1.8 -Dant.build.javac.target=1.8 jar javadoc
 
 # inject OSGi manifests
 jar ufm build/xml-apis.jar %{SOURCE1}
@@ -91,6 +99,9 @@ rm -rf build/docs/javadoc
 %{_javadocdir}/*
 
 %changelog
+* Fri Jun 19 2020 Mat Booth <mat.booth@redhat.com> - 1.4.01-30
+- Allow building against Java 11
+
 * Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.01-29
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild