From 52d673c4f98ac6bf5ba2a95295afbd89341dfaf9 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Jun 04 2020 18:50:29 +0000 Subject: override javac source and target versions to fix build with Java 11 --- diff --git a/cal10n.spec b/cal10n.spec index 984fa6b..e4529c9 100644 --- a/cal10n.spec +++ b/cal10n.spec @@ -1,6 +1,6 @@ Name: cal10n Version: 0.8.1 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Compiler assisted localization library (CAL10N) License: MIT URL: http://cal10n.qos.ch @@ -54,6 +54,9 @@ find . -name \*.jar -delete %pom_disable_module maven-%{name}-plugin-smoke %mvn_package :*-{plugin} @1 +# remove maven-compiler-plugin configuration that is broken with Java 11 +%pom_xpath_remove 'pom:plugin[pom:artifactId="maven-compiler-plugin"]/pom:configuration' + # Disable default-jar execution of maven-jar-plugin, which is causing # problems with version 3.0.0 of the plugin. %pom_xpath_inject "pom:plugin[pom:artifactId='maven-jar-plugin']/pom:executions" " @@ -63,7 +66,7 @@ find . -name \*.jar -delete " cal10n-api %build -%mvn_build -- -Dproject.build.sourceEncoding=ISO-8859-1 +%mvn_build -- -Dproject.build.sourceEncoding=ISO-8859-1 -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 %install %mvn_install @@ -78,6 +81,9 @@ find . -name \*.jar -delete %license LICENSE.txt %changelog +* Thu Jun 04 2020 Fabio Valentini - 0.8.1-11 +- Override javac source and target versions to fix build with Java 11. + * Tue Jan 28 2020 Fedora Release Engineering - 0.8.1-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild