Update to version 3.3.2 - matches canl-java 2.6.x

Drop patches voms-api-java-javadoc-source.patch and -no-local.patch
This commit is contained in:
Mattias Ellert 2020-10-13 19:23:25 +02:00
commit 9d602ff704
4 changed files with 9 additions and 57 deletions

View file

@ -1 +1 @@
SHA512 (voms-api-java-3.3.0.tar.gz) = 10994bf7bdffb6896f6b6d3cb3dcb5ee8c05183553f96288107d1ba8223b35c3b998536e6753c41b1989c40e58f98efdbe9410235f1d4f3e5a25a8f450b3a958
SHA512 (voms-api-java-3.3.2.tar.gz) = 7de09abd3e1605a7596c29bb0f16553945d6c13098c667451580ed4e22a671814db254355b56ec12696fce011854487510fb9e627e4f13474fbfedec6db1c422

View file

@ -1,24 +0,0 @@
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

View file

@ -1,21 +0,0 @@
diff -ur voms-api-java-3.0.5.orig/src/test/java/org/italiangrid/voms/test/ac/TestACValidator.java voms-api-java-3.0.5/src/test/java/org/italiangrid/voms/test/ac/TestACValidator.java
--- voms-api-java-3.0.5.orig/src/test/java/org/italiangrid/voms/test/ac/TestACValidator.java 2014-12-09 10:55:31.000000000 +0100
+++ voms-api-java-3.0.5/src/test/java/org/italiangrid/voms/test/ac/TestACValidator.java 2014-12-16 14:00:01.144948880 +0100
@@ -351,7 +351,7 @@
.getValidationErrors().get(0).getMessage());
}
- @Test
+ // @Test
public void testTargetValidationSuccess() throws Exception {
VOMSAA aa = Utils.getVOMSAA();
@@ -379,7 +379,7 @@
Assert.assertTrue(r.isValid());
}
- @Test
+ // @Test
public void testTargetValidationFailure() throws Exception {
VOMSAA aa = Utils.getVOMSAA();

View file

@ -1,24 +1,19 @@
Name: voms-api-java
Version: 3.3.0
Release: 11%{?dist}
Version: 3.3.2
Release: 1%{?dist}
Summary: Virtual Organization Membership Service Java API
License: ASL 2.0
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
BuildRequires: mvn(eu.eu-emi.security:canl) >= 2.5
BuildRequires: mvn(eu.eu-emi.security:canl) >= 2.6
BuildRequires: mvn(junit:junit)
BuildRequires: mvn(org.hamcrest:hamcrest-library)
BuildRequires: mvn(org.mockito:mockito-core)
Requires: mvn(eu.eu-emi.security:canl) >= 2.5
Requires: mvn(eu.eu-emi.security:canl) >= 2.6
%description
The Virtual Organization Membership Service (VOMS) is an attribute authority
@ -38,8 +33,6 @@ 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
@ -78,6 +71,10 @@ Virtual Organization Membership Service (VOMS) Java API Documentation.
%license LICENSE
%changelog
* Tue Oct 13 2020 Mattias Ellert <mattias.ellert@physics.uu.se> - 3.3.2-1
- Update to version 3.3.2 - matches canl-java 2.6.x
- Drop patches voms-api-java-javadoc-source.patch and -no-local.patch
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.0-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild