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

- Use source/target 1.6 to build against Java 11.

Browse Source 
Signed-off-by: Roland Grunberg <rgrunber@redhat.com>
This commit is contained in:
Roland Grunberg 2020-06-24 16:48:11 -04:00
parent f5e216a403
commit 8efe0b75b6
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hamcrest.spec
View File

@ -30,7 +30,7 @@
Name: hamcrest Name: hamcrest
Version: 1.3 Version: 1.3
Release: 27%{?dist} Release: 28%{?dist}
Epoch: 0 Epoch: 0
Summary: Library of matchers for building test expressions Summary: Library of matchers for building test expressions
License: BSD License: BSD
@ -115,12 +115,17 @@ ln -sf $(build-classpath testng-jdk15) lib/integration/
sed -i 's/\r//' LICENSE.txt sed -i 's/\r//' LICENSE.txt
# Set target to 1.6 to build with Java 11
sed -i 's/target="1.5"/target="1.6"/' build.xml
# Disable checking of remote javadoc links
sed -i '/link offline/ d' build.xml
%build %build
export CLASSPATH=$(build-classpath qdox) export CLASSPATH=$(build-classpath qdox)
export OPT_JAR_LIST="junit ant/ant-junit" export OPT_JAR_LIST="junit ant/ant-junit"
# The unit-test goal is switched off as some tests fail with JDK 7 # The unit-test goal is switched off as some tests fail with JDK 7
# see https://github.com/hamcrest/JavaHamcrest/issues/30 # see https://github.com/hamcrest/JavaHamcrest/issues/30
ant -Dant.build.javac.source=1.5 -Dversion=%{version} -Dbuild.sysclasspath=last clean core generator library bigjar javadoc ant -Dant.build.javac.source=1.6 -Dversion=%{version} -Dbuild.sysclasspath=last clean core generator library bigjar javadoc
# inject OSGi manifests # inject OSGi manifests
jar ufm build/%{name}-core-%{version}.jar %{SOURCE8} jar ufm build/%{name}-core-%{version}.jar %{SOURCE8}
@ -160,6 +165,10 @@ cp -pr %{name}-examples $RPM_BUILD_ROOT%{_datadir}/%{name}/
%{_datadir}/%{name} %{_datadir}/%{name}
%changelog %changelog
* Wed Jun 24 2020 Roland Grunberg <rgrunber@redhat.com> - 0:1.3-28
- Use source/target 1.6 to build against Java 11.
- Disable checking of remote javadoc links.
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.3-27 * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.3-27
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild