rpms/voms-api-java
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Only remove the maven-javadoc-plugin configuration on EPEL 8

Browse source 
Add source version to javadoc configuration (backported from git)
This commit is contained in:
Mattias Ellert 2020-05-06 01:24:17 +02:00
commit 823730ac2f
2 changed files with 41 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

24
voms-api-java-javadoc-source.patch Normal file
View file

@ -0,0 +1,24 @@
From f0fd4e08e94d70630d7948da2a8e2acf2a337697 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Tue, 19 Feb 2019 18:50:10 +0100
Subject: [PATCH] Add source version to javadoc configuration
---
pom.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/pom.xml b/pom.xml
index 82005e5..8ce8467 100644
--- a/pom.xml
+++ b/pom.xml
@@ -138,6 +138,7 @@
<artifactId>maven-javadoc-plugin</artifactId>
<version>${plugin.javadoc.version}</version>
<configuration>
+ <source>1.8</source>
<outputDirectory>${project.build.directory}/javadoc</outputDirectory>
<reportOutputDirectory>${project.reporting.outputDirectory}/javadoc</reportOutputDirectory>
</configuration>
--
2.25.4

21
voms-api-java.spec
View file

@ -1,6 +1,6 @@
Name: voms-api-java
Version: 3.3.0
Release: 7%{?dist}
Release: 8%{?dist}
Summary: Virtual Organization Membership Service Java API
License: ASL 2.0
@ -8,6 +8,9 @@ URL: https://wiki.italiangrid.it/VOMS
Source0: https://github.com/italiangrid/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
# Disable tests using non-local network interface
Patch0: %{name}-no-local.patch
# Add source version to javadoc configuration
# Backported from upstream git
Patch1: %{name}-javadoc-source.patch
BuildArch: noarch
BuildRequires: maven-local
@ -36,14 +39,20 @@ Virtual Organization Membership Service (VOMS) Java API Documentation.
%prep
%setup -q
%patch0 -p1
%patch1 -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
# Use default location for javadoc output
%pom_xpath_remove "//pom:plugin[pom:artifactId='maven-javadoc-plugin']/pom:configuration/pom:outputDirectory"
%pom_xpath_remove "//pom:plugin[pom:artifactId='maven-javadoc-plugin']/pom:configuration/pom:reportOutputDirectory"
%if %{?rhel}%{!?rhel:0} == 8
# EPEL 8 doesn't use the maven-javadoc-plugin to generate javadoc
# Remove maven-javadoc-plugin configuration to avoid build failure
%pom_remove_plugin org.apache.maven.plugins:maven-javadoc-plugin
%endif
# Do not create source jars
%pom_remove_plugin org.apache.maven.plugins:maven-source-plugin
@ -69,6 +78,10 @@ Virtual Organization Membership Service (VOMS) Java API Documentation.
%license LICENSE
%changelog
* Tue May 05 2020 Mattias Ellert <mattias.ellert@physics.uu.se> - 3.3.0-8
- Only remove the maven-javadoc-plugin configuration on EPEL 8
- Add source version to javadoc configuration (backported from git)
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.0-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild