From 490ca2fc809426fc9219dd14f340661311368820 Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Thu, 11 Feb 2016 13:20:33 +0100 Subject: [PATCH] Backport fix for failing test due to new canl-java version --- voms-api-java-testfix.patch | 13 +++++++++++++ voms-api-java.spec | 12 +++++++----- 2 files changed, 20 insertions(+), 5 deletions(-) create mode 100644 voms-api-java-testfix.patch diff --git a/voms-api-java-testfix.patch b/voms-api-java-testfix.patch new file mode 100644 index 0000000..11a9c0b --- /dev/null +++ b/voms-api-java-testfix.patch @@ -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); + diff --git a/voms-api-java.spec b/voms-api-java.spec index 071b324..b03ee1c 100644 --- a/voms-api-java.spec +++ b/voms-api-java.spec @@ -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 - 3.0.5-5 +- Backport fix for failing test due to new canl-java version + * Fri Feb 05 2016 Fedora Release Engineering - 3.0.5-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild