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

file modified
+8 -2
@@ -2,7 +2,7 @@

  

  Name:             decentxml

  Version:          1.4

- Release:          21%{?dist}

+ Release:          22%{?dist}

  Summary:          XML parser optimized for round-tripping and code reuse

  License:          BSD

  # Google Code has shut down.
@@ -59,13 +59,16 @@

  

  %pom_remove_plugin :maven-javadoc-plugin

  

+ # remove maven-compiler-plugin configuration that is broken with Java 11

+ %pom_xpath_remove 'pom:plugin[pom:artifactId="maven-compiler-plugin"]/pom:configuration'

+ 

  # Don't use deprecated "attached" goal of Maven Assembly Plugin, which

  # was removed in version 3.0.0.

  %pom_xpath_set "pom:plugin[pom:artifactId='maven-assembly-plugin']/pom:executions/pom:execution/pom:goals/pom:goal[text()='attached']" single

  

  %build

  %mvn_file  : %{name}

- %mvn_build

+ %mvn_build -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8

  

  %install

  %mvn_install
@@ -78,6 +81,9 @@

  %license LICENSE

  

  %changelog

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

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

+ 

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

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

  

  • drop maven-compiler-plugin configuration that sets source / target to 1.5
  • override maven.compiler.source and maven.compiler.target with 1.8

This makes sure the package can be compiled with both java-1.8.0-openjdk and java-11-openjdk.

Pull-Request has been merged by mbooth

3 years ago
Metadata