From 2cfdd540b7432a331c56df7763d929d17b2d1d08 Mon Sep 17 00:00:00 2001 From: Roland Grunberg Date: Thu, 25 Jun 2020 11:02:12 -0400 Subject: [PATCH] Use source/target of 1.6 to build against Java 11. - Set javadoc plugin source value to 1.6. Signed-off-by: Roland Grunberg --- slf4j.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/slf4j.spec b/slf4j.spec index 42e5c3e..e3321de 100644 --- a/slf4j.spec +++ b/slf4j.spec @@ -30,7 +30,7 @@ Name: slf4j Version: 1.7.30 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 0 Summary: Simple Logging Facade for Java # the log4j-over-slf4j and jcl-over-slf4j submodules are ASL 2.0, rest is MIT @@ -136,6 +136,8 @@ cp -p %{SOURCE1} APACHE-LICENSE %pom_xpath_inject "pom:project/pom:properties" " ISO-8859-1" +%pom_xpath_set "pom:project/pom:properties/pom:required.jdk.version" "1.6" + # Fix javadoc links %pom_xpath_remove "pom:links" %pom_xpath_inject "pom:plugin[pom:artifactId[text()='maven-javadoc-plugin']]/pom:configuration" " @@ -177,7 +179,7 @@ sed -i '/Import-Package/s/\}$/};resolution:=optional/' slf4j-api/src/main/resour %mvn_package :%{name}-nop %build -%mvn_build -f -s +%mvn_build -f -s -- -Dsource=1.6 %install # Compat symlinks @@ -212,6 +214,10 @@ cp -pr target/site/* $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-manual %{_defaultdocdir}/%{name}-manual %changelog +* Thu Jun 25 2020 Roland Grunberg - 0:1.7.30-3 +- Use source/target of 1.6 to build against Java 11. +- Set javadoc plugin source value to 1.6. + * Fri Mar 20 2020 Mat Booth - 0:1.7.30-2 - Fix broken OSGi metadata