From a6d2d65ab4e4ca1853b61364e0b287a6d8bf7833 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Fri, 27 Jan 2017 11:09:58 +0100 Subject: [PATCH] Compatibility with Java 8 in EPEL 7 --- jOCCI-api/jOCCI-api.spec | 5 ++++- jOCCI-core/jOCCI-core.spec | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) 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 -- 1.8.2.3