From 84ea69d3693b2555edcd79f99bc8156901276c56 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Jul 18 2020 13:11:20 +0000 Subject: set javac source and target to 1.8 to fix Java 11 builds --- diff --git a/nailgun.spec b/nailgun.spec index 392c07e..f5011e3 100644 --- a/nailgun.spec +++ b/nailgun.spec @@ -2,7 +2,7 @@ Name: nailgun Version: 0.9.1 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Framework for running Java from the cli without the JVM startup overhead License: ASL 2.0 URL: http://martiansoftware.com/nailgun/ @@ -11,7 +11,6 @@ URL: http://martiansoftware.com/nailgun/ Source0: %{name}-%{name}-all-%{version}.zip BuildRequires: maven-local -BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:) %description Nailgun is a client, protocol, and server for running Java programs from the @@ -32,11 +31,17 @@ This package contains the API documentation for %{name}. find ./ -name '*.jar' -exec rm -f '{}' \; find ./ -name '*.class' -exec rm -f '{}' \; +# drop unnecessary dependency on deprecated parent POM +%pom_remove_parent + %pom_remove_plugin :maven-javadoc-plugin %pom_remove_plugin :maven-source-plugin +# remove maven-compiler-plugin configuration that is broken with Java 11 +%pom_xpath_remove 'pom:plugin[pom:artifactId="maven-compiler-plugin"]/pom:configuration' + %build -%mvn_build +%mvn_build -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 %install %mvn_install @@ -47,6 +52,10 @@ find ./ -name '*.class' -exec rm -f '{}' \; %files javadoc -f .mfiles-javadoc %changelog +* Sat Jul 18 2020 Fabio Valentini - 0.9.1-15 +- Drop unnecessary dependency on deprecated parent POM. +- Set javac source and target to 1.8 to fix Java 11 builds. + * Sat Jul 11 2020 Jiri Vanek - 0.9.1-14 - Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11