Use source/target of 1.6 to build against Java 11.
- Set javadoc plugin source value to 1.6. Signed-off-by: Roland Grunberg <rgrunber@redhat.com>
This commit is contained in:
parent
c607565d85
commit
2cfdd540b7
10
slf4j.spec
10
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" "
|
||||
<project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding>"
|
||||
|
||||
%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 <rgrunber@redhat.com> - 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 <mat.booth@redhat.com> - 0:1.7.30-2
|
||||
- Fix broken OSGi metadata
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user