#1 override javac source and target versions to fix build with Java 11
Merged 3 years ago by decathorpe. Opened 3 years ago by decathorpe.
Unknown source master  into  master

file modified
+8 -2
@@ -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 @@

  %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 @@

      </execution>" 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 @@

  %license LICENSE.txt

  

  %changelog

+ * Thu Jun 04 2020 Fabio Valentini <decathorpe@gmail.com> - 0.8.1-11

+ - Override javac source and target versions to fix build with Java 11.

+ 

  * Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.1-10

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

  

Fixes building cal10n with both java-1.8.0-openjdk and java-11-openjdk.

simple-koji-cli and COPR build with Java 11 as default passed, merging and building.

Pull-Request has been merged by decathorpe

3 years ago