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

Backport fix for failing test due to new canl-java version

Browse source
This commit is contained in:
Mattias Ellert 2016-02-11 13:20:33 +01:00
commit 490ca2fc80
2 changed files with 20 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
voms-api-java-testfix.patch Normal file
View file

@ -0,0 +1,13 @@
diff --git a/src/test/java/org/italiangrid/voms/test/ac/TestACGeneration.java b/src/test/java/org/italiangrid/voms/test/ac/TestACGeneration.java
index 1faf709..bc7557c 100644
--- a/src/test/java/org/italiangrid/voms/test/ac/TestACGeneration.java
+++ b/src/test/java/org/italiangrid/voms/test/ac/TestACGeneration.java
@@ -143,7 +143,7 @@ public class TestACGeneration {
expiredCertCRLErrorMessage = newErrorMessage(
canlError,
- "CRL for an expired certificate was not resolved Cause: No CRLs found for issuer \"CN=Test CA, O=IGI, C=IT\"");
+ "CRL for an expired certificate was not resolved Cause: No CRLs found for issuer \"cn=Test CA,o=IGI,c=IT\"");
final Date revocationDate = new Date(1348673124000L);

12
voms-api-java.spec
View file

@ -1,6 +1,6 @@
Name: voms-api-java
Version: 3.0.5
Release: 4%{?dist}
Release: 5%{?dist}
Summary: Virtual Organization Membership Service Java API
Group: Development/Libraries
@ -13,6 +13,8 @@ Patch0: %{name}-bc147.patch
Patch1: %{name}-no-local.patch
# Fix javadoc warnings/errors
Patch2: %{name}-javadoc.patch
# Modify test for canl-java 2.2.0 (Backport from upstream)
Patch3: %{name}-testfix.patch
BuildArch: noarch
BuildRequires: maven-local
@ -52,6 +54,7 @@ Virtual Organization Membership Service (VOMS) Java API Documentation.
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%pom_xpath_set "pom:project/pom:dependencies/pom:dependency[pom:artifactId='bcmail']/pom:groupId" "org.bouncycastle"
%pom_xpath_set "pom:project/pom:dependencies/pom:dependency[pom:artifactId='bcmail']/pom:artifactId" "bcpkix-jdk15on"
@ -74,10 +77,6 @@ Virtual Organization Membership Service (VOMS) Java API Documentation.
%mvn_install -J target/site/javadoc/apidocs
%files -f .mfiles
%dir %{_javadir}/%{name}
%if %{?fedora}%{!?fedora:0} >= 21 || %{?rhel}%{!?rhel:0} >= 8
%dir %{_mavenpomdir}/%{name}
%endif
%doc AUTHORS README.md
%license LICENSE
@ -85,6 +84,9 @@ Virtual Organization Membership Service (VOMS) Java API Documentation.
%license LICENSE
%changelog
* Thu Feb 11 2016 Mattias Ellert <mattias.ellert@fysast.uu.se> - 3.0.5-5
- Backport fix for failing test due to new canl-java version
* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.5-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild