From 8efe0b75b61dc7df06c9b192c640b6f96063c943 Mon Sep 17 00:00:00 2001 From: Roland Grunberg Date: Wed, 24 Jun 2020 16:48:11 -0400 Subject: [PATCH] - Use source/target 1.6 to build against Java 11. Signed-off-by: Roland Grunberg --- hamcrest.spec | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/hamcrest.spec b/hamcrest.spec index ecc5093..3b53cd8 100644 --- a/hamcrest.spec +++ b/hamcrest.spec @@ -30,7 +30,7 @@ Name: hamcrest Version: 1.3 -Release: 27%{?dist} +Release: 28%{?dist} Epoch: 0 Summary: Library of matchers for building test expressions License: BSD @@ -115,12 +115,17 @@ ln -sf $(build-classpath testng-jdk15) lib/integration/ 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 export CLASSPATH=$(build-classpath qdox) export OPT_JAR_LIST="junit ant/ant-junit" # The unit-test goal is switched off as some tests fail with JDK 7 # 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 jar ufm build/%{name}-core-%{version}.jar %{SOURCE8} @@ -160,6 +165,10 @@ cp -pr %{name}-examples $RPM_BUILD_ROOT%{_datadir}/%{name}/ %{_datadir}/%{name} %changelog +* Wed Jun 24 2020 Roland Grunberg - 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 - 0:1.3-27 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild