Peg to Java 8 due to use of 'com.sun.tools.doclets.Taglet' that was removed in
Java 11
This commit is contained in:
parent
0ae2f1f84f
commit
1f28e1c02e
@ -4,7 +4,7 @@
|
||||
|
||||
Name: xerces-j2
|
||||
Version: 2.12.0
|
||||
Release: 7%{?dist}
|
||||
Release: 8%{?dist}
|
||||
Summary: Java XML parser
|
||||
# Most of the source is ASL 2.0
|
||||
# W3C licensed files:
|
||||
@ -37,9 +37,6 @@ Patch1: %{name}-manifest.patch
|
||||
# Patch various classes that need to implement getContentDocument method
|
||||
Patch2: %{name}-getcontentdocument.patch
|
||||
|
||||
# Patch build.xml to patch modules as needed during javadoc generation
|
||||
Patch3: %{name}-modulefix.patch
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
BuildRequires: javapackages-local
|
||||
@ -48,7 +45,7 @@ BuildRequires: apache-parent
|
||||
BuildRequires: xalan-j2 >= 2.7.1
|
||||
BuildRequires: xml-commons-apis >= 1.4.01
|
||||
BuildRequires: xml-commons-resolver >= 1.2
|
||||
BuildRequires: java-11-openjdk-devel
|
||||
BuildRequires: java-1.8.0-openjdk-devel
|
||||
|
||||
Requires: xalan-j2 >= 2.7.1
|
||||
Requires: xml-commons-apis >= 1.4.01
|
||||
@ -119,7 +116,6 @@ Requires: %{name} = %{version}-%{release}
|
||||
%patch0 -p0 -b .orig
|
||||
%patch1 -p0 -b .orig
|
||||
%patch2 -p0 -b .orig
|
||||
%patch3 -p0 -b .orig
|
||||
|
||||
# Copy the custom ant tasks into place
|
||||
mkdir -p tools/org/apache/xerces/util
|
||||
@ -140,16 +136,16 @@ sed -i -e "s|additionalparam='|additionalparam='-Xdoclint:none |" build.xml
|
||||
%mvn_file : %{name} jaxp_parser_impl
|
||||
|
||||
%build
|
||||
export JAVA_HOME=/usr/lib/jvm/java-11
|
||||
export JAVA_HOME=%{_jvmdir}/java-1.8.0
|
||||
pushd tools
|
||||
|
||||
# Build custom ant tasks
|
||||
javac -classpath $(build-classpath ant) org/apache/xerces/util/XJavac.java
|
||||
jar cf bin/xjavac.jar org/apache/xerces/util/XJavac.class
|
||||
$JAVA_HOME/bin/javac -classpath $(build-classpath ant) org/apache/xerces/util/XJavac.java
|
||||
$JAVA_HOME/bin/jar cf bin/xjavac.jar org/apache/xerces/util/XJavac.class
|
||||
|
||||
# Build custom doc taglets
|
||||
javac -classpath /usr/lib/jvm/java/lib/tools.jar org/apache/xerces/util/*Taglet.java
|
||||
jar cf bin/xerces2taglets.jar org/apache/xerces/util/*Taglet.class
|
||||
$JAVA_HOME/bin/javac -classpath $JAVA_HOME/lib/tools.jar org/apache/xerces/util/*Taglet.java
|
||||
$JAVA_HOME/bin/jar cf bin/xerces2taglets.jar org/apache/xerces/util/*Taglet.class
|
||||
|
||||
ln -sf $(build-classpath xalan-j2-serializer) serializer.jar
|
||||
ln -sf $(build-classpath xml-commons-apis) xml-apis.jar
|
||||
@ -211,6 +207,10 @@ ln -sf %{name}.jar %{_javadir}/jaxp_parser_impl.jar
|
||||
%{_datadir}/%{name}
|
||||
|
||||
%changelog
|
||||
* Tue Jul 14 2020 Mat Booth <mat.booth@redhat.com> - 2.12.0-8
|
||||
- Peg to Java 8 due to use of 'com.sun.tools.doclets.Taglet' that was removed in
|
||||
Java 11
|
||||
|
||||
* Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 2.12.0-7
|
||||
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user