From: František Dvořák Date: Fri, 27 Jan 2017 10:09:58 +0000 (+0100) Subject: Compatibility with Java 8 in EPEL 7 X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=a6d2d65ab4e4ca1853b61364e0b287a6d8bf7833;p=packaging-rpm-jOCCI.git Compatibility with Java 8 in EPEL 7 --- diff --git a/jOCCI-api/jOCCI-api.spec b/jOCCI-api/jOCCI-api.spec index 2e22758..9368c80 100644 --- a/jOCCI-api/jOCCI-api.spec +++ b/jOCCI-api/jOCCI-api.spec @@ -50,6 +50,9 @@ This package contains the API documentation for %{name}. %pom_remove_plugin com.github.github:site-maven-plugin %pom_remove_plugin org.sonatype.plugins:nexus-staging-maven-plugin +# compatibility with Java >= 8 (required for EPEL 7 only, not needed in F26+) +find src -type f -name \*.java sed -i -e '/@author/{s//\>\;/g}' {} \; + %build %pom_remove_dep org.apache.httpcomponents:httpclient @@ -76,5 +79,5 @@ mvn_bootstrap=1 xmvn -DincludeArtifactIds=com.github.tomakehurst:wiremock depend %changelog -* Thu Sep 08 2016 FrantiÅ¡ek Dvořák - 0.2.6-1 +* Fri Jan 27 2017 FrantiÅ¡ek Dvořák - 0.2.6-1 - Initial package diff --git a/jOCCI-core/jOCCI-core.spec b/jOCCI-core/jOCCI-core.spec index b539a60..6727837 100644 --- a/jOCCI-core/jOCCI-core.spec +++ b/jOCCI-core/jOCCI-core.spec @@ -42,6 +42,9 @@ This package contains the API documentation for %{name}. %pom_remove_plugin org.sonatype.plugins:nexus-staging-maven-plugin +# compatibility with Java >= 8 (required for EPEL 7 only, not needed in F26+) +find src -type f -name \*.java sed -i -e '/@author/{s//\>\;/g}' {} \; + %build %mvn_build @@ -60,5 +63,5 @@ This package contains the API documentation for %{name}. %changelog -* Tue Aug 09 2016 FrantiÅ¡ek Dvořák - 0.2.4-1 +* Fri Jan 27 2017 FrantiÅ¡ek Dvořák - 0.2.4-1 - Initial package