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

set javac source and target to 1.8 to fix Java 11 builds

Browse Source
This commit is contained in:
Fabio Valentini 2020-07-18 14:48:33 +02:00
parent 6b4de6bed6
commit 6453d5c303
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
msv.spec
View File

@ -1,7 +1,7 @@
Name: msv Name: msv
Epoch: 1 Epoch: 1
Version: 2013.6.1 Version: 2013.6.1
Release: 17%{?dist} Release: 18%{?dist}
Summary: Multi-Schema Validator Summary: Multi-Schema Validator
License: BSD and ASL 1.1 License: BSD and ASL 1.1
URL: http://msv.java.net/ URL: http://msv.java.net/
@ -135,6 +135,10 @@ done
%pom_xpath_replace "pom:dependency[pom:groupId[text()='com.sun.xml.bind.jaxb']]/pom:groupId" "<groupId>isorelax</groupId>" %pom_xpath_replace "pom:dependency[pom:groupId[text()='com.sun.xml.bind.jaxb']]/pom:groupId" "<groupId>isorelax</groupId>"
%pom_xpath_replace "pom:dependency[pom:groupId[text()='com.sun.xml.bind.jaxb']]/pom:groupId" "<groupId>isorelax</groupId>" msv %pom_xpath_replace "pom:dependency[pom:groupId[text()='com.sun.xml.bind.jaxb']]/pom:groupId" "<groupId>isorelax</groupId>" msv
# remove maven-compiler-plugin configuration that is broken with Java 11
%pom_xpath_remove 'pom:plugin[pom:artifactId="maven-compiler-plugin"]/pom:configuration/pom:source'
%pom_xpath_remove 'pom:plugin[pom:artifactId="maven-compiler-plugin"]/pom:configuration/pom:target'
# Change encoding of non utf-8 files # Change encoding of non utf-8 files
for m in $(find . -name copyright.txt) ; do for m in $(find . -name copyright.txt) ; do
iconv -f iso-8859-1 -t utf-8 < $m > $m.utf8 iconv -f iso-8859-1 -t utf-8 < $m > $m.utf8
@ -153,7 +157,7 @@ done
%mvn_package ":%{name}{,-core}::{}:" %{name}-msv %mvn_package ":%{name}{,-core}::{}:" %{name}-msv
%build %build
%mvn_build -s %mvn_build -s -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8
%install %install
%mvn_install %mvn_install
@ -219,6 +223,9 @@ cp -pr xsdlib/examples/* %{buildroot}%{_datadir}/%{name}/xsdlib
%{_datadir}/%{name} %{_datadir}/%{name}
%changelog %changelog
* Sat Jul 18 2020 Fabio Valentini <decathorpe@gmail.com> - 1:2013.6.1-18
- Set javac source and target to 1.8 to fix Java 11 builds.
* Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 1:2013.6.1-17 * Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 1:2013.6.1-17
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11