From 93ac4b4bff0775f17e43f814ea1676033077f330 Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Tue, 20 Aug 2019 08:07:02 +0200 Subject: [PATCH] Remove maven-javadoc-plugin configuration Remove unused dependency net.jcip:jcip-annotations --- voms-api-java.spec | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/voms-api-java.spec b/voms-api-java.spec index 9432d3c..7e6c0b6 100644 --- a/voms-api-java.spec +++ b/voms-api-java.spec @@ -1,6 +1,6 @@ Name: voms-api-java Version: 3.3.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Virtual Organization Membership Service Java API License: ASL 2.0 @@ -15,7 +15,6 @@ BuildRequires: mvn(eu.eu-emi.security:canl) >= 2.5 BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.hamcrest:hamcrest-library) BuildRequires: mvn(org.mockito:mockito-core) -BuildRequires: mvn(net.jcip:jcip-annotations) Requires: mvn(eu.eu-emi.security:canl) >= 2.5 %description @@ -38,6 +37,14 @@ Virtual Organization Membership Service (VOMS) Java API Documentation. %setup -q %patch0 -p1 +# Remove unused dependency +%pom_remove_dep net.jcip:jcip-annotations + +# Remove maven-javadoc-plugin configuration +# It doesn't change the content of the javadoc package anyway +# And its presence causes the EPEL 8 build to fail +%pom_remove_plugin org.apache.maven.plugins:maven-javadoc-plugin + # Do not create source jars %pom_remove_plugin org.apache.maven.plugins:maven-source-plugin @@ -51,7 +58,7 @@ Virtual Organization Membership Service (VOMS) Java API Documentation. %mvn_build %install -%mvn_install -J target/site/javadoc/apidocs +%mvn_install %files -f .mfiles %dir %{_javadir}/%{name} @@ -62,6 +69,10 @@ Virtual Organization Membership Service (VOMS) Java API Documentation. %license LICENSE %changelog +* Tue Aug 20 2019 Mattias Ellert - 3.3.0-6 +- Remove maven-javadoc-plugin configuration +- Remove unused dependency net.jcip:jcip-annotations + * Sat Jul 27 2019 Fedora Release Engineering - 3.3.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild