set javac source / target to 1.8 to fix Java 11 builds
This commit is contained in:
parent
cb6b88cefe
commit
060ee7a5a8
15
0002-More-adapt-build-javac-1.8.patch
Normal file
15
0002-More-adapt-build-javac-1.8.patch
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
diff --git a/build.xml b/build.xml
|
||||||
|
index cd7c2ed..f86b76a 100644
|
||||||
|
--- a/build.xml
|
||||||
|
+++ b/build.xml
|
||||||
|
@@ -47,8 +47,8 @@ For instructions on how to build JDOM, please view the README.txt file.
|
||||||
|
|
||||||
|
<property name="compile.debug" value="true" />
|
||||||
|
<property name="compile.optimize" value="true" />
|
||||||
|
- <property name="compile.target" value="1.5" />
|
||||||
|
- <property name="compile.source" value="1.5" />
|
||||||
|
+ <property name="compile.target" value="1.8" />
|
||||||
|
+ <property name="compile.source" value="1.8" />
|
||||||
|
<property name="compile.deprecation" value="true" />
|
||||||
|
|
||||||
|
<property name="build" value="./build"/>
|
@ -1,6 +1,6 @@
|
|||||||
Name: jdom2
|
Name: jdom2
|
||||||
Version: 2.0.6
|
Version: 2.0.6
|
||||||
Release: 17%{?dist}
|
Release: 18%{?dist}
|
||||||
Summary: Java manipulation of XML made easy
|
Summary: Java manipulation of XML made easy
|
||||||
License: Saxpath
|
License: Saxpath
|
||||||
URL: http://www.jdom.org/
|
URL: http://www.jdom.org/
|
||||||
@ -17,6 +17,7 @@ Source4: generate-tarball.sh
|
|||||||
# Disable gpg signatures
|
# Disable gpg signatures
|
||||||
# Process contrib and junit pom files
|
# Process contrib and junit pom files
|
||||||
Patch0: 0001-Adapt-build.patch
|
Patch0: 0001-Adapt-build.patch
|
||||||
|
Patch1: 0002-More-adapt-build-javac-1.8.patch
|
||||||
|
|
||||||
BuildRequires: javapackages-local
|
BuildRequires: javapackages-local
|
||||||
BuildRequires: ant
|
BuildRequires: ant
|
||||||
@ -51,6 +52,7 @@ This package contains javadoc for %{name}.
|
|||||||
%setup -q -n jdom-JDOM-%{version}
|
%setup -q -n jdom-JDOM-%{version}
|
||||||
|
|
||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
|
%patch1 -p1
|
||||||
|
|
||||||
cp -p %{SOURCE1} maven/contrib.pom
|
cp -p %{SOURCE1} maven/contrib.pom
|
||||||
cp -p %{SOURCE2} maven/junit.pom
|
cp -p %{SOURCE2} maven/junit.pom
|
||||||
@ -88,6 +90,9 @@ mv build/package/jdom-%{version}.bar build/package/jdom-%{version}.jar
|
|||||||
%license LICENSE.txt
|
%license LICENSE.txt
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sun Jul 19 2020 Fabio Valentini <decathorpe@gmail.com> - 2.0.6-18
|
||||||
|
- Set javac source and target to 1.8 to fix Java 11 builds.
|
||||||
|
|
||||||
* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 2.0.6-17
|
* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 2.0.6-17
|
||||||
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
|
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user