From 35f5216882c72570d248e5f5d27d2414ba21bd28 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 02:49:15 +0000 Subject: [PATCH 01/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- voms-api-java.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/voms-api-java.spec b/voms-api-java.spec index dc4acbc..071b324 100644 --- a/voms-api-java.spec +++ b/voms-api-java.spec @@ -1,6 +1,6 @@ Name: voms-api-java Version: 3.0.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Virtual Organization Membership Service Java API Group: Development/Libraries @@ -85,6 +85,9 @@ Virtual Organization Membership Service (VOMS) Java API Documentation. %license LICENSE %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 3.0.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Sat Jul 11 2015 Mattias Ellert - 3.0.5-3 - Remove build-dependency on cobertura-maven-plugin (cobertura was removed from Fedora due to licensing issues) From 490ca2fc809426fc9219dd14f340661311368820 Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Thu, 11 Feb 2016 13:20:33 +0100 Subject: [PATCH 02/51] 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 From 0f44f3f540b9d9cae055178ad49f04bc7d7f2c1e Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Sun, 14 Feb 2016 15:58:56 +0100 Subject: [PATCH 03/51] Update to version 3.2.0 - matches canl-java 2.2.x - Drop patches: voms-api-java-bc147.patch, -javadoc.patch and -testfix.patch --- sources | 2 +- voms-api-java-bc147.patch | 336 ------------------------ voms-api-java-javadoc.patch | 509 ------------------------------------ voms-api-java-testfix.patch | 13 - voms-api-java.spec | 38 +-- 5 files changed, 9 insertions(+), 889 deletions(-) delete mode 100644 voms-api-java-bc147.patch delete mode 100644 voms-api-java-javadoc.patch delete mode 100644 voms-api-java-testfix.patch diff --git a/sources b/sources index a337770..e7eccf8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3753669f345146bfc7060612fa4d5a3d v3.0.5.tar.gz +e45f034c5477b9310043b31d1a310b98 v3.2.0.tar.gz diff --git a/voms-api-java-bc147.patch b/voms-api-java-bc147.patch deleted file mode 100644 index 22a4e22..0000000 --- a/voms-api-java-bc147.patch +++ /dev/null @@ -1,336 +0,0 @@ -diff -ur voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/ac/impl/DefaultVOMSValidationStrategy.java voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/ac/impl/DefaultVOMSValidationStrategy.java ---- voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/ac/impl/DefaultVOMSValidationStrategy.java 2014-12-09 10:55:31.000000000 +0100 -+++ voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/ac/impl/DefaultVOMSValidationStrategy.java 2014-12-17 09:19:10.674934059 +0100 -@@ -39,7 +39,7 @@ - import javax.security.auth.x500.X500Principal; - - import org.bouncycastle.asn1.ASN1ObjectIdentifier; --import org.bouncycastle.asn1.x509.X509Extension; -+import org.bouncycastle.asn1.x509.Extension; - import org.bouncycastle.cert.X509CertificateHolder; - import org.bouncycastle.cert.jcajce.JcaX509CertificateHolder; - import org.bouncycastle.operator.ContentVerifierProvider; -@@ -239,8 +239,8 @@ - private boolean checkNoRevAvailExtension(VOMSAttribute attributes, - List validationErrors) { - -- X509Extension noRevAvail = attributes.getVOMSAC().getExtension( -- X509Extension.noRevAvail); -+ Extension noRevAvail = attributes.getVOMSAC().getExtension( -+ Extension.noRevAvail); - if (noRevAvail != null && noRevAvail.isCritical()) { - validationErrors.add(newErrorMessage(other, - "NoRevAvail AC extension cannot be critical!")); -@@ -252,8 +252,8 @@ - private boolean checkAuthorityKeyIdentifierExtension( - VOMSAttribute attributes, List validationErrors) { - -- X509Extension authKeyId = attributes.getVOMSAC().getExtension( -- X509Extension.authorityKeyIdentifier); -+ Extension authKeyId = attributes.getVOMSAC().getExtension( -+ Extension.authorityKeyIdentifier); - if (authKeyId != null && authKeyId.isCritical()) { - validationErrors.add(newErrorMessage(other, - "AuthorityKeyIdentifier AC extension cannot be critical!")); -diff -ur voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/asn1/VOMSACGenerator.java voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/asn1/VOMSACGenerator.java ---- voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/asn1/VOMSACGenerator.java 2014-12-09 10:55:31.000000000 +0100 -+++ voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/asn1/VOMSACGenerator.java 2014-12-17 09:45:43.404176616 +0100 -@@ -30,20 +30,21 @@ - import org.bouncycastle.asn1.ASN1Encodable; - import org.bouncycastle.asn1.ASN1EncodableVector; - import org.bouncycastle.asn1.ASN1InputStream; -+import org.bouncycastle.asn1.ASN1Object; - import org.bouncycastle.asn1.ASN1ObjectIdentifier; --import org.bouncycastle.asn1.DEREncodable; -+import org.bouncycastle.asn1.ASN1Primitive; - import org.bouncycastle.asn1.DERNull; --import org.bouncycastle.asn1.DERObject; - import org.bouncycastle.asn1.DEROctetString; - import org.bouncycastle.asn1.DERSequence; - import org.bouncycastle.asn1.DERTaggedObject; - import org.bouncycastle.asn1.x509.AlgorithmIdentifier; - import org.bouncycastle.asn1.x509.AuthorityKeyIdentifier; -+import org.bouncycastle.asn1.x509.Extension; - import org.bouncycastle.asn1.x509.GeneralName; - import org.bouncycastle.asn1.x509.GeneralNames; --import org.bouncycastle.asn1.x509.X509Extension; - import org.bouncycastle.cert.AttributeCertificateHolder; - import org.bouncycastle.cert.AttributeCertificateIssuer; -+import org.bouncycastle.cert.CertIOException; - import org.bouncycastle.cert.X509AttributeCertificateHolder; - import org.bouncycastle.cert.X509v2AttributeCertificateBuilder; - import org.bouncycastle.cert.jcajce.JcaX509CertificateHolder; -@@ -156,7 +157,7 @@ - return String.format("%s://%s:%d", voName, host, port); - } - -- private ASN1Encodable buildACCertsExtensionContent( -+ private ASN1Object buildACCertsExtensionContent( - EnumSet properties) { - - ASN1EncodableVector issuerCertsContainer = new ASN1EncodableVector(); -@@ -166,7 +167,7 @@ - issuerCertsContainer.add(new DERSequence()); - else - issuerCertsContainer.add(new DERSequence( -- getCertAsDEREncodable(aaCredential.getCertificate()))); -+ getCertAsASN1Encodable(aaCredential.getCertificate()))); - - return new DERSequence(issuerCertsContainer); - } -@@ -174,7 +175,7 @@ - private AuthorityKeyIdentifier buildAuthorityKeyIdentifier() { - - byte[] authKeyId = aaCredential.getCertificate().getExtensionValue( -- X509Extension.authorityKeyIdentifier.toString()); -+ Extension.authorityKeyIdentifier.toString()); - - if (authKeyId != null) { - return new AuthorityKeyIdentifier(authKeyId); -@@ -183,7 +184,7 @@ - return null; - } - -- private ASN1Encodable buildFQANsAttributeContent(List fqans, -+ private ASN1Object buildFQANsAttributeContent(List fqans, - GeneralName policyAuthorityInfo) { - - ASN1EncodableVector container = new ASN1EncodableVector(); -@@ -201,7 +202,7 @@ - return new DERSequence(container); - } - -- private ASN1Encodable buildGAExtensionContent( -+ private ASN1Object buildGAExtensionContent( - EnumSet properties, List gas, - GeneralName policyAuthorityInfo) { - -@@ -262,7 +263,7 @@ - - } - -- private ASN1Encodable buildTargetsExtensionContent( -+ private ASN1Object buildTargetsExtensionContent( - EnumSet properties, List targets) { - - ASN1EncodableVector targetSeq = new ASN1EncodableVector(); -@@ -315,6 +316,8 @@ - GeneralName policyAuthorityInfo = buildPolicyAuthorityInfo(voName, host, - port); - -+ try { -+ - builder.addAttribute(VOMS_FQANS_OID, - buildFQANsAttributeContent(fqans, policyAuthorityInfo)); - -@@ -327,7 +330,7 @@ - policyAuthorityInfo)); - - if (targets != null && !targets.isEmpty()) -- builder.addExtension(X509Extension.targetInformation, true, -+ builder.addExtension(Extension.targetInformation, true, - buildTargetsExtensionContent(generationProperties, targets)); - - if (!generationProperties -@@ -350,13 +353,17 @@ - .contains(ACGenerationProperties.INCLUDE_CRITICAL_AKID_EXTENSION)) - akidIsCritical = true; - -- builder.addExtension(X509Extension.noRevAvail, noRevAvailIsCritical, -- new DERNull()); -+ builder.addExtension(Extension.noRevAvail, noRevAvailIsCritical, -+ DERNull.INSTANCE); - - AuthorityKeyIdentifier akid = buildAuthorityKeyIdentifier(); - -- builder.addExtension(X509Extension.authorityKeyIdentifier, akidIsCritical, -- akid != null ? akid : new DERNull()); -+ builder.addExtension(Extension.authorityKeyIdentifier, akidIsCritical, -+ akid != null ? akid : DERNull.INSTANCE); -+ -+ } catch (CertIOException e) { -+ throw new VOMSError(e.getMessage(), e); -+ } - - return builder.build(getSigner(generationProperties)); - -@@ -373,19 +380,19 @@ - DERSequence acSeq = new DERSequence(vomsACs); - - CertificateExtension ext = new CertificateExtension( -- VOMS_EXTENSION_OID.getId(), acSeq.toASN1Object(), false); -+ VOMS_EXTENSION_OID.getId(), acSeq.toASN1Primitive(), false); - - return ext; - } - -- private DEREncodable getCertAsDEREncodable(X509Certificate cert) { -+ private ASN1Encodable getCertAsASN1Encodable(X509Certificate cert) { - - try { - byte[] certBytes = cert.getEncoded(); - - ByteArrayInputStream bais = new ByteArrayInputStream(certBytes); - ASN1InputStream is = new ASN1InputStream(bais); -- DERObject derCert = is.readObject(); -+ ASN1Primitive derCert = is.readObject(); - is.close(); - return derCert; - -diff -ur voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/asn1/VOMSACUtils.java voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/asn1/VOMSACUtils.java ---- voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/asn1/VOMSACUtils.java 2014-12-09 10:55:31.000000000 +0100 -+++ voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/asn1/VOMSACUtils.java 2014-12-17 09:51:02.983413156 +0100 -@@ -31,21 +31,21 @@ - - import org.bouncycastle.asn1.ASN1InputStream; - import org.bouncycastle.asn1.ASN1OctetString; -+import org.bouncycastle.asn1.ASN1Primitive; - import org.bouncycastle.asn1.ASN1Sequence; - import org.bouncycastle.asn1.ASN1TaggedObject; - import org.bouncycastle.asn1.DERIA5String; --import org.bouncycastle.asn1.DERObject; - import org.bouncycastle.asn1.DEROctetString; --import org.bouncycastle.asn1.DERSequence; -+import org.bouncycastle.asn1.DLSequence; - import org.bouncycastle.asn1.x509.Attribute; - import org.bouncycastle.asn1.x509.AttributeCertificate; -+import org.bouncycastle.asn1.x509.Certificate; -+import org.bouncycastle.asn1.x509.Extension; - import org.bouncycastle.asn1.x509.GeneralName; - import org.bouncycastle.asn1.x509.IetfAttrSyntax; - import org.bouncycastle.asn1.x509.Target; - import org.bouncycastle.asn1.x509.TargetInformation; - import org.bouncycastle.asn1.x509.Targets; --import org.bouncycastle.asn1.x509.X509CertificateStructure; --import org.bouncycastle.asn1.x509.X509Extension; - import org.bouncycastle.cert.X509AttributeCertificateHolder; - import org.bouncycastle.jce.provider.BouncyCastleProvider; - import org.bouncycastle.jce.provider.X509CertificateObject; -@@ -124,7 +124,7 @@ - - while (theACs.hasMoreElements()) { - -- AttributeCertificate parsedAC = new AttributeCertificate( -+ AttributeCertificate parsedAC = AttributeCertificate.getInstance( - theACs.nextElement()); - acs.add(parsedAC); - } -@@ -178,8 +178,8 @@ - - List targets = new ArrayList(); - -- X509Extension targetExtension = ac -- .getExtension(X509Extension.targetInformation); -+ Extension targetExtension = ac -+ .getExtension(Extension.targetInformation); - - if (targetExtension == null) - return targets; -@@ -193,7 +193,7 @@ - // The deserialization has to be done by hand since it seems VOMS - // does not correctly encode the ACTargets extension... - ASN1Sequence targetSequence = (ASN1Sequence) asn1TargetContainer -- .getDERObject(); -+ .toASN1Primitive(); - Target[] asn1Targets = new Target[targetSequence.size()]; - - int count = 0; -@@ -291,8 +291,8 @@ - Attribute[] asn1Attrs = acHolder.getAttributes(VOMS_FQANS_OID); - - for (Attribute a : asn1Attrs) { -- DERObject theVOMSDerObject = a.getAttributeValues()[0].getDERObject(); -- IetfAttrSyntax attrSyntax = new IetfAttrSyntax( -+ ASN1Primitive theVOMSDerObject = a.getAttributeValues()[0].toASN1Primitive(); -+ IetfAttrSyntax attrSyntax = IetfAttrSyntax.getInstance( - ASN1Sequence.getInstance(theVOMSDerObject)); - - String policyAuthority = policyAuthoritySanityChecks(attrSyntax); -@@ -350,7 +350,7 @@ - - List gas = new ArrayList(); - -- X509Extension gasExtension = ac.getExtension(VOMS_GENERIC_ATTRS_OID); -+ Extension gasExtension = ac.getExtension(VOMS_GENERIC_ATTRS_OID); - - if (gasExtension == null) - return gas; -@@ -416,7 +416,7 @@ - - List certs = new ArrayList(); - -- X509Extension e = ac.getExtension(VOMS_CERTS_OID); -+ Extension e = ac.getExtension(VOMS_CERTS_OID); - - if (e == null) - return null; -@@ -429,7 +429,7 @@ - certSeq = (ASN1Sequence) certSeq.getObjectAt(0); - - @SuppressWarnings("unchecked") -- Enumeration encodedCerts = certSeq.getObjects(); -+ Enumeration encodedCerts = certSeq.getObjects(); - - CertificateFactory cf = null; - -@@ -443,7 +443,7 @@ - - while (encodedCerts.hasMoreElements()) { - -- DERSequence s = encodedCerts.nextElement(); -+ DLSequence s = encodedCerts.nextElement(); - X509CertificateObject certObj = null; - byte[] certData = null; - X509Certificate theCert = null; -@@ -451,7 +451,7 @@ - try { - - certObj = new X509CertificateObject( -- X509CertificateStructure.getInstance(ASN1Sequence.getInstance(s))); -+ Certificate.getInstance(ASN1Sequence.getInstance(s))); - certData = certObj.getEncoded(); - theCert = (X509Certificate) cf - .generateCertificate(new ByteArrayInputStream(certData)); -diff -ur voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/asn1/VOMSConstants.java voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/asn1/VOMSConstants.java ---- voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/asn1/VOMSConstants.java 2014-12-09 10:55:31.000000000 +0100 -+++ voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/asn1/VOMSConstants.java 2014-12-17 09:19:10.761933034 +0100 -@@ -20,7 +20,7 @@ - import java.util.Set; - - import org.bouncycastle.asn1.ASN1ObjectIdentifier; --import org.bouncycastle.asn1.x509.X509Extension; -+import org.bouncycastle.asn1.x509.Extension; - - /** - * A set of useful constants for ASN.1 parsing of VOMS attributes. -@@ -56,7 +56,7 @@ - - public final Set VOMS_HANDLED_EXTENSIONS = new HashSet( - Arrays.asList(VOMS_FQANS_OID, VOMS_CERTS_OID, VOMS_GENERIC_ATTRS_OID, -- X509Extension.targetInformation, X509Extension.noRevAvail, -- X509Extension.authorityKeyIdentifier)); -+ Extension.targetInformation, Extension.noRevAvail, -+ Extension.authorityKeyIdentifier)); - - } -diff -ur voms-api-java-3.0.5.orig/src/test/java/org/italiangrid/voms/test/ac/TestNoExtensionValidation.java voms-api-java-3.0.5/src/test/java/org/italiangrid/voms/test/ac/TestNoExtensionValidation.java ---- voms-api-java-3.0.5.orig/src/test/java/org/italiangrid/voms/test/ac/TestNoExtensionValidation.java 2014-12-09 10:55:31.000000000 +0100 -+++ voms-api-java-3.0.5/src/test/java/org/italiangrid/voms/test/ac/TestNoExtensionValidation.java 2014-12-17 09:19:10.761933034 +0100 -@@ -15,6 +15,7 @@ - */ - package org.italiangrid.voms.test.ac; - -+import java.io.IOException; - import java.security.InvalidKeyException; - import java.security.NoSuchAlgorithmException; - import java.security.SignatureException; -@@ -55,7 +56,8 @@ - - @Test - public void testNoExtensionValidation() throws InvalidKeyException, -- CertificateParsingException, SignatureException, NoSuchAlgorithmException { -+ CertificateParsingException, SignatureException, NoSuchAlgorithmException, -+ IOException { - - ProxyCertificateOptions options = new ProxyCertificateOptions( - cred.getCertificateChain()); diff --git a/voms-api-java-javadoc.patch b/voms-api-java-javadoc.patch deleted file mode 100644 index 237cb85..0000000 --- a/voms-api-java-javadoc.patch +++ /dev/null @@ -1,509 +0,0 @@ -diff -ur voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/ac/VOMSACLookupStrategy.java voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/ac/VOMSACLookupStrategy.java ---- voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/ac/VOMSACLookupStrategy.java 2014-12-09 10:55:31.000000000 +0100 -+++ voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/ac/VOMSACLookupStrategy.java 2015-07-11 22:03:24.435478016 +0200 -@@ -32,6 +32,7 @@ - * This method defines how a set of VOMS Attribute Certificates is looked for - * in a certificate chain. - * -+ * @param certChain certificate chain - * @return a {@link List} of {@link ACParsingContext} that describes the - * lookup outcome - */ -diff -ur voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/ac/VOMSACValidator.java voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/ac/VOMSACValidator.java ---- voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/ac/VOMSACValidator.java 2014-12-09 10:55:31.000000000 +0100 -+++ voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/ac/VOMSACValidator.java 2015-07-11 22:04:13.910971096 +0200 -@@ -63,7 +63,7 @@ - * about validation without relying on the registration of a - * {@link ValidationResultListener}. - * -- * @param validatedChain -+ * @param validatedChain validated chain - * @return a possibly empty list of {@link VOMSValidationResult} object - * providing access to validation results and related attributes - */ -diff -ur voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/ac/VOMSAttributesNormalizationStrategy.java voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/ac/VOMSAttributesNormalizationStrategy.java ---- voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/ac/VOMSAttributesNormalizationStrategy.java 2014-12-09 10:55:31.000000000 +0100 -+++ voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/ac/VOMSAttributesNormalizationStrategy.java 2015-07-11 22:06:19.019217943 +0200 -@@ -35,7 +35,7 @@ - * Returns the normalized view of VOMS Authorization information starting from - * a list of VOMS Attribute certificates. - * -- * @param acs -+ * @param acs a list of VOMS Attribute certificates - * @return a possibly empty list {@link VOMSAttribute} object - */ - public List normalizeAttributes(List acs); -diff -ur voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/ac/VOMSValidationResult.java voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/ac/VOMSValidationResult.java ---- voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/ac/VOMSValidationResult.java 2014-12-09 10:55:31.000000000 +0100 -+++ voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/ac/VOMSValidationResult.java 2015-07-11 23:17:04.240921381 +0200 -@@ -43,7 +43,7 @@ - * Default constructor. - * - * @param attributes -- * the attributes this validation result refer to -+ * the attributes this validation result refers to - * @param valid - * true in case of validation success, - * false otherwise -@@ -56,6 +56,8 @@ - /** - * This constructor is used to pass in a list of validation errors as well. - * -+ * @param attributes -+ * the attributes this validation result refers to - * @param valid - * true in case of validation success, - * false otherwise -diff -ur voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/asn1/VOMSACUtils.java voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/asn1/VOMSACUtils.java ---- voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/asn1/VOMSACUtils.java 2014-12-09 10:55:31.000000000 +0100 -+++ voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/asn1/VOMSACUtils.java 2015-07-11 21:52:38.473040258 +0200 -@@ -82,10 +82,10 @@ - * Deserializes the VOMS Attribute certificates in a given certificate - * extension - * -- * @param vomsExtension -+ * @param vomsExtension VOMS extension - * @return the possybly empty {@link List} of {@link AttributeCertificate} - * extracted from a given extension -- * @throws IOException -+ * @throws IOException IO exception - */ - public static List getACsFromVOMSExtension( - byte[] vomsExtension) throws IOException { -@@ -141,7 +141,7 @@ - * the {@link X509Certificate} where the ACs will be searched - * @return the possibly empty {@link List} of {@link AttributeCertificate} - * objects extracted from the VOMS extension -- * @throws IOException -+ * @throws IOException IO exception - */ - public static List getACsFromCertificate( - X509Certificate cert) throws IOException { -diff -ur voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/credential/LoadCredentialsEventListener.java voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/credential/LoadCredentialsEventListener.java ---- voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/credential/LoadCredentialsEventListener.java 2014-12-09 10:55:31.000000000 +0100 -+++ voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/credential/LoadCredentialsEventListener.java 2015-07-11 21:59:55.389394631 +0200 -@@ -25,10 +25,11 @@ - public interface LoadCredentialsEventListener { - - /** -- * Informs that credentials are been looked for in the locations passed as -+ * Informs that credentials have been looked for in the locations passed as - * argument. - * - * @param locations -+ * the locations where the credentials have been looked for - */ - public void notifyCredentialLookup(String... locations); - -@@ -37,6 +38,7 @@ - * passed as argument. - * - * @param locations -+ * the locations where the credentials have been loaded from - */ - public void notifyLoadCredentialSuccess(String... locations); - -@@ -48,7 +50,7 @@ - * the {@link Throwable} that caused the credential load operation to - * fail - * @param locations -- * the locations where the credentials where loaded from -+ * the locations where the credentials were loaded from - */ - public void notifyLoadCredentialFailure(Throwable error, String... locations); - } -diff -ur voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/examples/ValidationExample.java voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/examples/ValidationExample.java ---- voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/examples/ValidationExample.java 2014-12-09 10:55:31.000000000 +0100 -+++ voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/examples/ValidationExample.java 2015-07-11 22:02:03.237668786 +0200 -@@ -58,11 +58,11 @@ - } - - /** -- * @param args -- * @throws IOException -- * @throws FileNotFoundException -- * @throws CertificateException -- * @throws KeyStoreException -+ * @param args arguments -+ * @throws KeyStoreException key store exception -+ * @throws CertificateException certificate exception -+ * @throws FileNotFoundException file not found exception -+ * @throws IOException IO exception - */ - public static void main(String[] args) throws KeyStoreException, - CertificateException, FileNotFoundException, IOException { -diff -ur voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/request/impl/AbstractVOMSProtocol.java voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/request/impl/AbstractVOMSProtocol.java ---- voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/request/impl/AbstractVOMSProtocol.java 2014-12-09 10:55:31.000000000 +0100 -+++ voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/request/impl/AbstractVOMSProtocol.java 2015-07-11 22:36:27.944060573 +0200 -@@ -164,7 +164,7 @@ - /** - * Sets whether this protocol will skip SSL hostname checks - * -- * @param skipHostnameChecks -+ * @param skipHostnameChecks skip hostname checks - */ - public void setSkipHostnameChecks(boolean skipHostnameChecks) { - -diff -ur voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/request/impl/DefaultVOMSACService.java voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/request/impl/DefaultVOMSACService.java ---- voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/request/impl/DefaultVOMSACService.java 2014-12-09 10:55:31.000000000 +0100 -+++ voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/request/impl/DefaultVOMSACService.java 2015-07-11 22:58:43.620615468 +0200 -@@ -513,7 +513,7 @@ - * Sets the http protocol implementation - * - * @param httpProtocol -- * the http protocol implementatino -+ * the http protocol implementatioh - * @return this {@link Builder} instance - */ - public Builder httpProtocol(VOMSProtocol httpProtocol) { -@@ -524,6 +524,10 @@ - - /** - * Sets the legacy protocol implementation -+ * -+ * @param legacyProtocol -+ * the legacy protocol implementatioh -+ * @return this {@link Builder} instance - */ - public Builder legacyProtocol(VOMSProtocol legacyProtocol) { - -diff -ur voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/request/impl/LegacyRequestSender.java voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/request/impl/LegacyRequestSender.java ---- voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/request/impl/LegacyRequestSender.java 2014-12-09 10:55:31.000000000 +0100 -+++ voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/request/impl/LegacyRequestSender.java 2015-07-11 23:01:29.503319467 +0200 -@@ -97,6 +97,8 @@ - * - * @param acRequest - * the AC request parameters. See {@link VOMSACRequest}. -+ * @param endpoint -+ * VOMS server endpoint - * @param stream - * an output stream. - */ -diff -ur voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/request/impl/LegacyVOMSResponse.java voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/request/impl/LegacyVOMSResponse.java ---- voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/request/impl/LegacyVOMSResponse.java 2014-12-09 10:55:31.000000000 +0100 -+++ voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/request/impl/LegacyVOMSResponse.java 2015-07-11 23:04:31.083184711 +0200 -@@ -37,7 +37,7 @@ - * Builds a VOMSResponse starting from a DOM an XML document (see - * {@link Document}). - * -- * @param res -+ * @param res XML response - */ - public LegacyVOMSResponse(Document res) { - -diff -ur voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/store/impl/DefaultVOMSTrustStore.java voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/store/impl/DefaultVOMSTrustStore.java ---- voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/store/impl/DefaultVOMSTrustStore.java 2014-12-09 10:55:31.000000000 +0100 -+++ voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/store/impl/DefaultVOMSTrustStore.java 2015-07-11 23:12:10.653905564 +0200 -@@ -106,6 +106,8 @@ - /** - * Builds a list of trusted directories containing only - * {@link #DEFAULT_VOMS_DIR}. -+ * -+ * @return list of trusted directories - **/ - protected static List buildDefaultTrustedDirs() { - -@@ -118,6 +120,8 @@ - * - * @param localTrustDirs - * a non-null list of local trust directories -+ * @param listener -+ * trust store status listener - * @throws IllegalArgumentException - * when the list passed as argument is null - */ -diff -ur voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/store/impl/VOMSThread.java voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/store/impl/VOMSThread.java ---- voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/store/impl/VOMSThread.java 2014-12-09 10:55:31.000000000 +0100 -+++ voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/store/impl/VOMSThread.java 2015-07-11 23:13:36.831790810 +0200 -@@ -32,6 +32,8 @@ - * the object whose run method is called. - * @param name - * the name of the new thread. -+ * @param handler -+ * uncaught exception handler - */ - public VOMSThread(Runnable target, String name, - UncaughtExceptionHandler handler) { -diff -ur voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/store/LSCInfo.java voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/store/LSCInfo.java ---- voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/store/LSCInfo.java 2014-12-09 10:55:31.000000000 +0100 -+++ voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/store/LSCInfo.java 2015-07-11 23:49:42.371477209 +0200 -@@ -60,8 +60,8 @@ - * and hostname. - * - * The certificate chain description is a list of X.500 distinguished names -- * encoded as strings according to the OpenSSL slash-separated format, as in: -- * /C=IT/O=INFN/CN=INFN CA -+ * encoded as strings according to the OpenSSL slash-separated format, as -+ * in: @verbatim /C=IT/O=INFN/CN=INFN CA @endverbatim - * - * The first element in the description is the leaf certificate, while the - * last is the CA certificate. -@@ -75,7 +75,7 @@ - * Checks if the certificate chain description maintained in the LSC - * information matches the certificate chain passed as argument. - * -- * @param certChain -+ * @param certChain certificate chain - * @return true if the description matches, false - * otherwise - */ -diff -ur voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/util/CachingCertificateValidator.java voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/util/CachingCertificateValidator.java ---- voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/util/CachingCertificateValidator.java 2014-12-09 10:55:31.000000000 +0100 -+++ voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/util/CachingCertificateValidator.java 2015-07-11 22:19:44.450154294 +0200 -@@ -132,7 +132,7 @@ - * Validates a certificate chain using the wrapped validator, caching the - * result for future validation calls. - * -- * @param certChain -+ * @param certChain certificate chain - * @return a possibly cached {@link ValidationResult} - * @see eu.emi.security.authn.x509.X509CertChainValidator#validate(java.security.cert.X509Certificate[]) - */ -@@ -187,7 +187,7 @@ - } - - /** -- * @param certPath -+ * @param certPath certificate path - * @return the {@link ValidationResult} - * @see eu.emi.security.authn.x509.X509CertChainValidator#validate(java.security.cert.CertPath) - */ -@@ -215,7 +215,7 @@ - } - - /** -- * @param listener -+ * @param listener validation listener - * @see eu.emi.security.authn.x509.X509CertChainValidator#addValidationListener(eu.emi.security.authn.x509.ValidationErrorListener) - */ - public void addValidationListener(ValidationErrorListener listener) { -@@ -224,7 +224,7 @@ - } - - /** -- * @param listener -+ * @param listener validation listener - * @see eu.emi.security.authn.x509.X509CertChainValidator#removeValidationListener(eu.emi.security.authn.x509.ValidationErrorListener) - */ - public void removeValidationListener(ValidationErrorListener listener) { -@@ -233,7 +233,7 @@ - } - - /** -- * @param listener -+ * @param listener validation listener - * @see eu.emi.security.authn.x509.X509CertChainValidator#addUpdateListener(eu.emi.security.authn.x509.StoreUpdateListener) - */ - public void addUpdateListener(StoreUpdateListener listener) { -@@ -242,7 +242,7 @@ - } - - /** -- * @param listener -+ * @param listener validation listener - * @see eu.emi.security.authn.x509.X509CertChainValidator#removeUpdateListener(eu.emi.security.authn.x509.StoreUpdateListener) - */ - public void removeUpdateListener(StoreUpdateListener listener) { -diff -ur voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/util/CertificateValidatorBuilder.java voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/util/CertificateValidatorBuilder.java ---- voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/util/CertificateValidatorBuilder.java 2014-12-09 10:55:31.000000000 +0100 -+++ voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/util/CertificateValidatorBuilder.java 2015-07-11 22:23:13.028201344 +0200 -@@ -142,7 +142,7 @@ - /** - * Sets whether the created validator will be lazy in loading anchors - * -- * @param lazyness -+ * @param lazyness lazyness - * @return the builder object - */ - public CertificateValidatorBuilder lazyAnchorsLoading(boolean lazyness) { -@@ -227,6 +227,9 @@ - * @param validationErrorListener - * the listener that will receive notification about validation - * errors -+ * @param storeUpdateListener -+ * the listener that will receive notification about trust -+ * anchor store updates - * @param updateInterval - * the trust anchor store update interval - * @param namespaceChecks -@@ -259,6 +262,9 @@ - * @param validationErrorListener - * the listener that will receive notification about validation - * errors -+ * @param storeUpdateListener -+ * the listener that will receive notification about trust -+ * anchor store updates - * @param updateInterval - * the trust anchor store update interval - * @param namespaceChecks -diff -ur voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/util/CredentialsUtils.java voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/util/CredentialsUtils.java ---- voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/util/CredentialsUtils.java 2014-12-09 10:55:31.000000000 +0100 -+++ voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/util/CredentialsUtils.java 2015-07-11 22:34:03.331626827 +0200 -@@ -62,11 +62,11 @@ - /** - * Serializes a private key to an output stream according to an encoding. - * -- * @param os -- * @param key -- * @param encoding -- * @throws IllegalArgumentException -- * @throws IOException -+ * @param os output stream -+ * @param key private key -+ * @param encoding private key encoding -+ * @throws IllegalArgumentException illegal argument exception -+ * @throws IOException IO exception - */ - public static void savePrivateKey(OutputStream os, PrivateKey key, - PrivateKeyEncoding encoding) throws IllegalArgumentException, IOException { -@@ -90,10 +90,10 @@ - * This method just delegates to canl, but provides a much more understandable - * signature. - * -- * @param os -- * @param key -- * @throws IllegalArgumentException -- * @throws IOException -+ * @param os output stream -+ * @param key private key -+ * @throws IllegalArgumentException illegal argument exception -+ * @throws IOException IO exception - */ - private static void savePrivateKeyPKCS8(OutputStream os, PrivateKey key) - throws IllegalArgumentException, IOException { -@@ -108,10 +108,10 @@ - * This method just delegates to canl, but provides a much more understandable - * signature. - * -- * @param os -- * @param key -- * @throws IllegalArgumentException -- * @throws IOException -+ * @param os output stream -+ * @param key provate key -+ * @throws IllegalArgumentException illegal argument exception -+ * @throws IOException IO exception - */ - private static void savePrivateKeyPKCS1(OutputStream os, PrivateKey key) - throws IllegalArgumentException, IOException { -@@ -125,16 +125,16 @@ - * Saves user credentials as a plain text PEM data.
- * Writes the user certificate chain first, then the user key. - * -- * @param os -- * @param uc -- * @param encoding -- * @throws UnrecoverableKeyException -- * @throws KeyStoreException -- * @throws IllegalArgumentException -- * @throws NoSuchAlgorithmException -- * @throws IOException -- * @throws NoSuchProviderException -- * @throws CertificateException -+ * @param os output stream -+ * @param uc user credential -+ * @param encoding private key encoding -+ * @throws UnrecoverableKeyException unrecoverable key exception -+ * @throws KeyStoreException key store exception -+ * @throws IllegalArgumentException illegal argument exception -+ * @throws NoSuchAlgorithmException no such algorithm exception -+ * @throws IOException IO exception -+ * @throws NoSuchProviderException no such provider exception -+ * @throws CertificateException certificate exception - */ - public static void saveProxyCredentials(OutputStream os, X509Credential uc, - PrivateKeyEncoding encoding) throws UnrecoverableKeyException, -@@ -174,15 +174,15 @@ - * Writes the user certificate chain first, then the user key, using the - * default encoding specified in {@link #DEFAULT_ENCONDING}. - * -- * @param os -- * @param uc -- * @throws UnrecoverableKeyException -- * @throws KeyStoreException -- * @throws IllegalArgumentException -- * @throws NoSuchAlgorithmException -- * @throws IOException -- * @throws NoSuchProviderException -- * @throws CertificateException -+ * @param os output stream -+ * @param uc user credendial -+ * @throws UnrecoverableKeyException unrecoverable key exception -+ * @throws KeyStoreException key store exception -+ * @throws IllegalArgumentException illegal argument exception -+ * @throws NoSuchAlgorithmException no such algorithm exception -+ * @throws IOException IO exception -+ * @throws NoSuchProviderException no such provider exception -+ * @throws CertificateException certificate exception - */ - public static void saveProxyCredentials(OutputStream os, X509Credential uc) - throws UnrecoverableKeyException, KeyStoreException, -@@ -202,13 +202,13 @@ - * the credential to be saved - * @param encoding - * the private key encoding -- * @throws IOException -- * @throws UnrecoverableKeyException -- * @throws KeyStoreException -- * @throws IllegalArgumentException -- * @throws NoSuchAlgorithmException -- * @throws NoSuchProviderException -- * @throws CertificateException -+ * @throws IOException IOException -+ * @throws UnrecoverableKeyException unrecoverable key exception -+ * @throws KeyStoreException key store exception -+ * @throws IllegalArgumentException illegal argument exception -+ * @throws NoSuchAlgorithmException no such algorithm exception -+ * @throws NoSuchProviderException no such provider exception -+ * @throws CertificateException certificate exception - */ - public static void saveProxyCredentials(String proxyFileName, - X509Credential uc, PrivateKeyEncoding encoding) throws IOException, -@@ -238,14 +238,16 @@ - * encoding specified in {@link #DEFAULT_ENCONDING}. - * - * @param proxyFileName -+ * the file where the proxy will be saved - * @param uc -- * @throws UnrecoverableKeyException -- * @throws KeyStoreException -- * @throws IllegalArgumentException -- * @throws NoSuchAlgorithmException -- * @throws NoSuchProviderException -- * @throws CertificateException -- * @throws IOException -+ * the credential to be saved -+ * @throws UnrecoverableKeyException unrecoverable key exception -+ * @throws KeyStoreException key store exception -+ * @throws IllegalArgumentException illegal argument exception -+ * @throws NoSuchAlgorithmException no such algorithm exception -+ * @throws NoSuchProviderException no such provider exception -+ * @throws CertificateException certificate exception -+ * @throws IOException IOException - */ - public static void saveProxyCredentials(String proxyFileName, - X509Credential uc) throws UnrecoverableKeyException, KeyStoreException, -diff -ur voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/util/VOMSFQANNamingScheme.java voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/util/VOMSFQANNamingScheme.java ---- voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/util/VOMSFQANNamingScheme.java 2014-12-09 10:55:31.000000000 +0100 -+++ voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/util/VOMSFQANNamingScheme.java 2015-07-11 22:35:15.189339253 +0200 -@@ -96,7 +96,7 @@ - * syntax used by voms to identify roles. - * - * -- * @param roleName -+ * @param roleName role name - * @throws VOMSError - * If the string passed as argument doens not comply with the voms - * sytax. -diff -ur voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/VOMSAttribute.java voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/VOMSAttribute.java ---- voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/VOMSAttribute.java 2014-12-09 10:55:31.000000000 +0100 -+++ voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/VOMSAttribute.java 2015-07-11 21:53:57.511827971 +0200 -@@ -117,7 +117,7 @@ - * This method checks whether the attributes are valid in a given time passed - * as argument. No validation is performed on the attributes. - * -- * @param time -+ * @param time time - * @return true if valid, false otherwise - */ - public boolean validAt(Date time); diff --git a/voms-api-java-testfix.patch b/voms-api-java-testfix.patch deleted file mode 100644 index 11a9c0b..0000000 --- a/voms-api-java-testfix.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 b03ee1c..85b839e 100644 --- a/voms-api-java.spec +++ b/voms-api-java.spec @@ -1,36 +1,22 @@ Name: voms-api-java -Version: 3.0.5 -Release: 5%{?dist} +Version: 3.2.0 +Release: 1%{?dist} Summary: Virtual Organization Membership Service Java API Group: Development/Libraries License: ASL 2.0 URL: https://wiki.italiangrid.it/VOMS Source0: https://github.com/italiangrid/%{name}/archive/v%{version}.tar.gz -# Patch for bouncycastle 1.47+ (Fedora 21+, EPEL 7+) -Patch0: %{name}-bc147.patch # Disable tests using non-local network interface -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 +Patch0: %{name}-no-local.patch BuildArch: noarch BuildRequires: maven-local -BuildRequires: mvn(org.apache.maven.plugins:maven-assembly-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-compiler-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-javadoc-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-release-plugin) BuildRequires: mvn(eu.eu-emi.security:canl) -BuildRequires: mvn(org.bouncycastle:bcpkix-jdk15on) BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.mockito:mockito-core) -%if %{?fedora}%{!?fedora:0} -# Missing in EPEL BuildRequires: mvn(com.mycila.maven-license-plugin:maven-license-plugin) BuildRequires: mvn(net.jcip:jcip-annotations) -%endif %description The Virtual Organization Membership Service (VOMS) is an attribute authority @@ -52,29 +38,17 @@ Virtual Organization Membership Service (VOMS) Java API Documentation. %prep %setup -q %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" %pom_remove_plugin org.codehaus.mojo:cobertura-maven-plugin -%if %{?fedora}%{!?fedora:0} %pom_xpath_inject "pom:project/pom:build/pom:plugins/pom:plugin[pom:groupId='com.mycila.maven-license-plugin']/pom:configuration/pom:excludes" ".xmvn/**" %pom_xpath_remove "pom:project/pom:build/pom:plugins/pom:plugin[pom:groupId='com.mycila.maven-license-plugin']/pom:configuration/pom:strictCheck" -%else -# Missing in EPEL -%pom_remove_plugin com.mycila.maven-license-plugin:maven-license-plugin -%pom_remove_dep net.jcip:jcip-annotations -%endif %build %mvn_build %install -%mvn_install -J target/site/javadoc/apidocs +%mvn_install %files -f .mfiles %doc AUTHORS README.md @@ -84,6 +58,10 @@ Virtual Organization Membership Service (VOMS) Java API Documentation. %license LICENSE %changelog +* Sun Feb 14 2016 Mattias Ellert - 3.2.0-1 +- Update to version 3.2.0 - matches canl-java 2.2.x +- Drop patches: voms-api-java-bc147.patch, -javadoc.patch and -testfix.patch + * Thu Feb 11 2016 Mattias Ellert - 3.0.5-5 - Backport fix for failing test due to new canl-java version From 1fd95a14d6c0e370192a4b44ef967455b21a7b6f Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Sun, 14 Feb 2016 17:22:54 +0100 Subject: [PATCH 04/51] Update to version 3.1.0 - matches canl-java 2.1.x - Drop patches: voms-api-java-bc147.patch and -javadoc.patch --- sources | 2 +- voms-api-java-bc147.patch | 336 ------------------------ voms-api-java-javadoc.patch | 509 ------------------------------------ voms-api-java.spec | 24 +- 4 files changed, 8 insertions(+), 863 deletions(-) delete mode 100644 voms-api-java-bc147.patch delete mode 100644 voms-api-java-javadoc.patch diff --git a/sources b/sources index a337770..aba9c66 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3753669f345146bfc7060612fa4d5a3d v3.0.5.tar.gz +3076b30f06646d03706a944a6130dcc3 v3.1.0.tar.gz diff --git a/voms-api-java-bc147.patch b/voms-api-java-bc147.patch deleted file mode 100644 index 22a4e22..0000000 --- a/voms-api-java-bc147.patch +++ /dev/null @@ -1,336 +0,0 @@ -diff -ur voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/ac/impl/DefaultVOMSValidationStrategy.java voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/ac/impl/DefaultVOMSValidationStrategy.java ---- voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/ac/impl/DefaultVOMSValidationStrategy.java 2014-12-09 10:55:31.000000000 +0100 -+++ voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/ac/impl/DefaultVOMSValidationStrategy.java 2014-12-17 09:19:10.674934059 +0100 -@@ -39,7 +39,7 @@ - import javax.security.auth.x500.X500Principal; - - import org.bouncycastle.asn1.ASN1ObjectIdentifier; --import org.bouncycastle.asn1.x509.X509Extension; -+import org.bouncycastle.asn1.x509.Extension; - import org.bouncycastle.cert.X509CertificateHolder; - import org.bouncycastle.cert.jcajce.JcaX509CertificateHolder; - import org.bouncycastle.operator.ContentVerifierProvider; -@@ -239,8 +239,8 @@ - private boolean checkNoRevAvailExtension(VOMSAttribute attributes, - List validationErrors) { - -- X509Extension noRevAvail = attributes.getVOMSAC().getExtension( -- X509Extension.noRevAvail); -+ Extension noRevAvail = attributes.getVOMSAC().getExtension( -+ Extension.noRevAvail); - if (noRevAvail != null && noRevAvail.isCritical()) { - validationErrors.add(newErrorMessage(other, - "NoRevAvail AC extension cannot be critical!")); -@@ -252,8 +252,8 @@ - private boolean checkAuthorityKeyIdentifierExtension( - VOMSAttribute attributes, List validationErrors) { - -- X509Extension authKeyId = attributes.getVOMSAC().getExtension( -- X509Extension.authorityKeyIdentifier); -+ Extension authKeyId = attributes.getVOMSAC().getExtension( -+ Extension.authorityKeyIdentifier); - if (authKeyId != null && authKeyId.isCritical()) { - validationErrors.add(newErrorMessage(other, - "AuthorityKeyIdentifier AC extension cannot be critical!")); -diff -ur voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/asn1/VOMSACGenerator.java voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/asn1/VOMSACGenerator.java ---- voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/asn1/VOMSACGenerator.java 2014-12-09 10:55:31.000000000 +0100 -+++ voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/asn1/VOMSACGenerator.java 2014-12-17 09:45:43.404176616 +0100 -@@ -30,20 +30,21 @@ - import org.bouncycastle.asn1.ASN1Encodable; - import org.bouncycastle.asn1.ASN1EncodableVector; - import org.bouncycastle.asn1.ASN1InputStream; -+import org.bouncycastle.asn1.ASN1Object; - import org.bouncycastle.asn1.ASN1ObjectIdentifier; --import org.bouncycastle.asn1.DEREncodable; -+import org.bouncycastle.asn1.ASN1Primitive; - import org.bouncycastle.asn1.DERNull; --import org.bouncycastle.asn1.DERObject; - import org.bouncycastle.asn1.DEROctetString; - import org.bouncycastle.asn1.DERSequence; - import org.bouncycastle.asn1.DERTaggedObject; - import org.bouncycastle.asn1.x509.AlgorithmIdentifier; - import org.bouncycastle.asn1.x509.AuthorityKeyIdentifier; -+import org.bouncycastle.asn1.x509.Extension; - import org.bouncycastle.asn1.x509.GeneralName; - import org.bouncycastle.asn1.x509.GeneralNames; --import org.bouncycastle.asn1.x509.X509Extension; - import org.bouncycastle.cert.AttributeCertificateHolder; - import org.bouncycastle.cert.AttributeCertificateIssuer; -+import org.bouncycastle.cert.CertIOException; - import org.bouncycastle.cert.X509AttributeCertificateHolder; - import org.bouncycastle.cert.X509v2AttributeCertificateBuilder; - import org.bouncycastle.cert.jcajce.JcaX509CertificateHolder; -@@ -156,7 +157,7 @@ - return String.format("%s://%s:%d", voName, host, port); - } - -- private ASN1Encodable buildACCertsExtensionContent( -+ private ASN1Object buildACCertsExtensionContent( - EnumSet properties) { - - ASN1EncodableVector issuerCertsContainer = new ASN1EncodableVector(); -@@ -166,7 +167,7 @@ - issuerCertsContainer.add(new DERSequence()); - else - issuerCertsContainer.add(new DERSequence( -- getCertAsDEREncodable(aaCredential.getCertificate()))); -+ getCertAsASN1Encodable(aaCredential.getCertificate()))); - - return new DERSequence(issuerCertsContainer); - } -@@ -174,7 +175,7 @@ - private AuthorityKeyIdentifier buildAuthorityKeyIdentifier() { - - byte[] authKeyId = aaCredential.getCertificate().getExtensionValue( -- X509Extension.authorityKeyIdentifier.toString()); -+ Extension.authorityKeyIdentifier.toString()); - - if (authKeyId != null) { - return new AuthorityKeyIdentifier(authKeyId); -@@ -183,7 +184,7 @@ - return null; - } - -- private ASN1Encodable buildFQANsAttributeContent(List fqans, -+ private ASN1Object buildFQANsAttributeContent(List fqans, - GeneralName policyAuthorityInfo) { - - ASN1EncodableVector container = new ASN1EncodableVector(); -@@ -201,7 +202,7 @@ - return new DERSequence(container); - } - -- private ASN1Encodable buildGAExtensionContent( -+ private ASN1Object buildGAExtensionContent( - EnumSet properties, List gas, - GeneralName policyAuthorityInfo) { - -@@ -262,7 +263,7 @@ - - } - -- private ASN1Encodable buildTargetsExtensionContent( -+ private ASN1Object buildTargetsExtensionContent( - EnumSet properties, List targets) { - - ASN1EncodableVector targetSeq = new ASN1EncodableVector(); -@@ -315,6 +316,8 @@ - GeneralName policyAuthorityInfo = buildPolicyAuthorityInfo(voName, host, - port); - -+ try { -+ - builder.addAttribute(VOMS_FQANS_OID, - buildFQANsAttributeContent(fqans, policyAuthorityInfo)); - -@@ -327,7 +330,7 @@ - policyAuthorityInfo)); - - if (targets != null && !targets.isEmpty()) -- builder.addExtension(X509Extension.targetInformation, true, -+ builder.addExtension(Extension.targetInformation, true, - buildTargetsExtensionContent(generationProperties, targets)); - - if (!generationProperties -@@ -350,13 +353,17 @@ - .contains(ACGenerationProperties.INCLUDE_CRITICAL_AKID_EXTENSION)) - akidIsCritical = true; - -- builder.addExtension(X509Extension.noRevAvail, noRevAvailIsCritical, -- new DERNull()); -+ builder.addExtension(Extension.noRevAvail, noRevAvailIsCritical, -+ DERNull.INSTANCE); - - AuthorityKeyIdentifier akid = buildAuthorityKeyIdentifier(); - -- builder.addExtension(X509Extension.authorityKeyIdentifier, akidIsCritical, -- akid != null ? akid : new DERNull()); -+ builder.addExtension(Extension.authorityKeyIdentifier, akidIsCritical, -+ akid != null ? akid : DERNull.INSTANCE); -+ -+ } catch (CertIOException e) { -+ throw new VOMSError(e.getMessage(), e); -+ } - - return builder.build(getSigner(generationProperties)); - -@@ -373,19 +380,19 @@ - DERSequence acSeq = new DERSequence(vomsACs); - - CertificateExtension ext = new CertificateExtension( -- VOMS_EXTENSION_OID.getId(), acSeq.toASN1Object(), false); -+ VOMS_EXTENSION_OID.getId(), acSeq.toASN1Primitive(), false); - - return ext; - } - -- private DEREncodable getCertAsDEREncodable(X509Certificate cert) { -+ private ASN1Encodable getCertAsASN1Encodable(X509Certificate cert) { - - try { - byte[] certBytes = cert.getEncoded(); - - ByteArrayInputStream bais = new ByteArrayInputStream(certBytes); - ASN1InputStream is = new ASN1InputStream(bais); -- DERObject derCert = is.readObject(); -+ ASN1Primitive derCert = is.readObject(); - is.close(); - return derCert; - -diff -ur voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/asn1/VOMSACUtils.java voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/asn1/VOMSACUtils.java ---- voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/asn1/VOMSACUtils.java 2014-12-09 10:55:31.000000000 +0100 -+++ voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/asn1/VOMSACUtils.java 2014-12-17 09:51:02.983413156 +0100 -@@ -31,21 +31,21 @@ - - import org.bouncycastle.asn1.ASN1InputStream; - import org.bouncycastle.asn1.ASN1OctetString; -+import org.bouncycastle.asn1.ASN1Primitive; - import org.bouncycastle.asn1.ASN1Sequence; - import org.bouncycastle.asn1.ASN1TaggedObject; - import org.bouncycastle.asn1.DERIA5String; --import org.bouncycastle.asn1.DERObject; - import org.bouncycastle.asn1.DEROctetString; --import org.bouncycastle.asn1.DERSequence; -+import org.bouncycastle.asn1.DLSequence; - import org.bouncycastle.asn1.x509.Attribute; - import org.bouncycastle.asn1.x509.AttributeCertificate; -+import org.bouncycastle.asn1.x509.Certificate; -+import org.bouncycastle.asn1.x509.Extension; - import org.bouncycastle.asn1.x509.GeneralName; - import org.bouncycastle.asn1.x509.IetfAttrSyntax; - import org.bouncycastle.asn1.x509.Target; - import org.bouncycastle.asn1.x509.TargetInformation; - import org.bouncycastle.asn1.x509.Targets; --import org.bouncycastle.asn1.x509.X509CertificateStructure; --import org.bouncycastle.asn1.x509.X509Extension; - import org.bouncycastle.cert.X509AttributeCertificateHolder; - import org.bouncycastle.jce.provider.BouncyCastleProvider; - import org.bouncycastle.jce.provider.X509CertificateObject; -@@ -124,7 +124,7 @@ - - while (theACs.hasMoreElements()) { - -- AttributeCertificate parsedAC = new AttributeCertificate( -+ AttributeCertificate parsedAC = AttributeCertificate.getInstance( - theACs.nextElement()); - acs.add(parsedAC); - } -@@ -178,8 +178,8 @@ - - List targets = new ArrayList(); - -- X509Extension targetExtension = ac -- .getExtension(X509Extension.targetInformation); -+ Extension targetExtension = ac -+ .getExtension(Extension.targetInformation); - - if (targetExtension == null) - return targets; -@@ -193,7 +193,7 @@ - // The deserialization has to be done by hand since it seems VOMS - // does not correctly encode the ACTargets extension... - ASN1Sequence targetSequence = (ASN1Sequence) asn1TargetContainer -- .getDERObject(); -+ .toASN1Primitive(); - Target[] asn1Targets = new Target[targetSequence.size()]; - - int count = 0; -@@ -291,8 +291,8 @@ - Attribute[] asn1Attrs = acHolder.getAttributes(VOMS_FQANS_OID); - - for (Attribute a : asn1Attrs) { -- DERObject theVOMSDerObject = a.getAttributeValues()[0].getDERObject(); -- IetfAttrSyntax attrSyntax = new IetfAttrSyntax( -+ ASN1Primitive theVOMSDerObject = a.getAttributeValues()[0].toASN1Primitive(); -+ IetfAttrSyntax attrSyntax = IetfAttrSyntax.getInstance( - ASN1Sequence.getInstance(theVOMSDerObject)); - - String policyAuthority = policyAuthoritySanityChecks(attrSyntax); -@@ -350,7 +350,7 @@ - - List gas = new ArrayList(); - -- X509Extension gasExtension = ac.getExtension(VOMS_GENERIC_ATTRS_OID); -+ Extension gasExtension = ac.getExtension(VOMS_GENERIC_ATTRS_OID); - - if (gasExtension == null) - return gas; -@@ -416,7 +416,7 @@ - - List certs = new ArrayList(); - -- X509Extension e = ac.getExtension(VOMS_CERTS_OID); -+ Extension e = ac.getExtension(VOMS_CERTS_OID); - - if (e == null) - return null; -@@ -429,7 +429,7 @@ - certSeq = (ASN1Sequence) certSeq.getObjectAt(0); - - @SuppressWarnings("unchecked") -- Enumeration encodedCerts = certSeq.getObjects(); -+ Enumeration encodedCerts = certSeq.getObjects(); - - CertificateFactory cf = null; - -@@ -443,7 +443,7 @@ - - while (encodedCerts.hasMoreElements()) { - -- DERSequence s = encodedCerts.nextElement(); -+ DLSequence s = encodedCerts.nextElement(); - X509CertificateObject certObj = null; - byte[] certData = null; - X509Certificate theCert = null; -@@ -451,7 +451,7 @@ - try { - - certObj = new X509CertificateObject( -- X509CertificateStructure.getInstance(ASN1Sequence.getInstance(s))); -+ Certificate.getInstance(ASN1Sequence.getInstance(s))); - certData = certObj.getEncoded(); - theCert = (X509Certificate) cf - .generateCertificate(new ByteArrayInputStream(certData)); -diff -ur voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/asn1/VOMSConstants.java voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/asn1/VOMSConstants.java ---- voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/asn1/VOMSConstants.java 2014-12-09 10:55:31.000000000 +0100 -+++ voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/asn1/VOMSConstants.java 2014-12-17 09:19:10.761933034 +0100 -@@ -20,7 +20,7 @@ - import java.util.Set; - - import org.bouncycastle.asn1.ASN1ObjectIdentifier; --import org.bouncycastle.asn1.x509.X509Extension; -+import org.bouncycastle.asn1.x509.Extension; - - /** - * A set of useful constants for ASN.1 parsing of VOMS attributes. -@@ -56,7 +56,7 @@ - - public final Set VOMS_HANDLED_EXTENSIONS = new HashSet( - Arrays.asList(VOMS_FQANS_OID, VOMS_CERTS_OID, VOMS_GENERIC_ATTRS_OID, -- X509Extension.targetInformation, X509Extension.noRevAvail, -- X509Extension.authorityKeyIdentifier)); -+ Extension.targetInformation, Extension.noRevAvail, -+ Extension.authorityKeyIdentifier)); - - } -diff -ur voms-api-java-3.0.5.orig/src/test/java/org/italiangrid/voms/test/ac/TestNoExtensionValidation.java voms-api-java-3.0.5/src/test/java/org/italiangrid/voms/test/ac/TestNoExtensionValidation.java ---- voms-api-java-3.0.5.orig/src/test/java/org/italiangrid/voms/test/ac/TestNoExtensionValidation.java 2014-12-09 10:55:31.000000000 +0100 -+++ voms-api-java-3.0.5/src/test/java/org/italiangrid/voms/test/ac/TestNoExtensionValidation.java 2014-12-17 09:19:10.761933034 +0100 -@@ -15,6 +15,7 @@ - */ - package org.italiangrid.voms.test.ac; - -+import java.io.IOException; - import java.security.InvalidKeyException; - import java.security.NoSuchAlgorithmException; - import java.security.SignatureException; -@@ -55,7 +56,8 @@ - - @Test - public void testNoExtensionValidation() throws InvalidKeyException, -- CertificateParsingException, SignatureException, NoSuchAlgorithmException { -+ CertificateParsingException, SignatureException, NoSuchAlgorithmException, -+ IOException { - - ProxyCertificateOptions options = new ProxyCertificateOptions( - cred.getCertificateChain()); diff --git a/voms-api-java-javadoc.patch b/voms-api-java-javadoc.patch deleted file mode 100644 index 237cb85..0000000 --- a/voms-api-java-javadoc.patch +++ /dev/null @@ -1,509 +0,0 @@ -diff -ur voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/ac/VOMSACLookupStrategy.java voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/ac/VOMSACLookupStrategy.java ---- voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/ac/VOMSACLookupStrategy.java 2014-12-09 10:55:31.000000000 +0100 -+++ voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/ac/VOMSACLookupStrategy.java 2015-07-11 22:03:24.435478016 +0200 -@@ -32,6 +32,7 @@ - * This method defines how a set of VOMS Attribute Certificates is looked for - * in a certificate chain. - * -+ * @param certChain certificate chain - * @return a {@link List} of {@link ACParsingContext} that describes the - * lookup outcome - */ -diff -ur voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/ac/VOMSACValidator.java voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/ac/VOMSACValidator.java ---- voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/ac/VOMSACValidator.java 2014-12-09 10:55:31.000000000 +0100 -+++ voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/ac/VOMSACValidator.java 2015-07-11 22:04:13.910971096 +0200 -@@ -63,7 +63,7 @@ - * about validation without relying on the registration of a - * {@link ValidationResultListener}. - * -- * @param validatedChain -+ * @param validatedChain validated chain - * @return a possibly empty list of {@link VOMSValidationResult} object - * providing access to validation results and related attributes - */ -diff -ur voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/ac/VOMSAttributesNormalizationStrategy.java voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/ac/VOMSAttributesNormalizationStrategy.java ---- voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/ac/VOMSAttributesNormalizationStrategy.java 2014-12-09 10:55:31.000000000 +0100 -+++ voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/ac/VOMSAttributesNormalizationStrategy.java 2015-07-11 22:06:19.019217943 +0200 -@@ -35,7 +35,7 @@ - * Returns the normalized view of VOMS Authorization information starting from - * a list of VOMS Attribute certificates. - * -- * @param acs -+ * @param acs a list of VOMS Attribute certificates - * @return a possibly empty list {@link VOMSAttribute} object - */ - public List normalizeAttributes(List acs); -diff -ur voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/ac/VOMSValidationResult.java voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/ac/VOMSValidationResult.java ---- voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/ac/VOMSValidationResult.java 2014-12-09 10:55:31.000000000 +0100 -+++ voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/ac/VOMSValidationResult.java 2015-07-11 23:17:04.240921381 +0200 -@@ -43,7 +43,7 @@ - * Default constructor. - * - * @param attributes -- * the attributes this validation result refer to -+ * the attributes this validation result refers to - * @param valid - * true in case of validation success, - * false otherwise -@@ -56,6 +56,8 @@ - /** - * This constructor is used to pass in a list of validation errors as well. - * -+ * @param attributes -+ * the attributes this validation result refers to - * @param valid - * true in case of validation success, - * false otherwise -diff -ur voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/asn1/VOMSACUtils.java voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/asn1/VOMSACUtils.java ---- voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/asn1/VOMSACUtils.java 2014-12-09 10:55:31.000000000 +0100 -+++ voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/asn1/VOMSACUtils.java 2015-07-11 21:52:38.473040258 +0200 -@@ -82,10 +82,10 @@ - * Deserializes the VOMS Attribute certificates in a given certificate - * extension - * -- * @param vomsExtension -+ * @param vomsExtension VOMS extension - * @return the possybly empty {@link List} of {@link AttributeCertificate} - * extracted from a given extension -- * @throws IOException -+ * @throws IOException IO exception - */ - public static List getACsFromVOMSExtension( - byte[] vomsExtension) throws IOException { -@@ -141,7 +141,7 @@ - * the {@link X509Certificate} where the ACs will be searched - * @return the possibly empty {@link List} of {@link AttributeCertificate} - * objects extracted from the VOMS extension -- * @throws IOException -+ * @throws IOException IO exception - */ - public static List getACsFromCertificate( - X509Certificate cert) throws IOException { -diff -ur voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/credential/LoadCredentialsEventListener.java voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/credential/LoadCredentialsEventListener.java ---- voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/credential/LoadCredentialsEventListener.java 2014-12-09 10:55:31.000000000 +0100 -+++ voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/credential/LoadCredentialsEventListener.java 2015-07-11 21:59:55.389394631 +0200 -@@ -25,10 +25,11 @@ - public interface LoadCredentialsEventListener { - - /** -- * Informs that credentials are been looked for in the locations passed as -+ * Informs that credentials have been looked for in the locations passed as - * argument. - * - * @param locations -+ * the locations where the credentials have been looked for - */ - public void notifyCredentialLookup(String... locations); - -@@ -37,6 +38,7 @@ - * passed as argument. - * - * @param locations -+ * the locations where the credentials have been loaded from - */ - public void notifyLoadCredentialSuccess(String... locations); - -@@ -48,7 +50,7 @@ - * the {@link Throwable} that caused the credential load operation to - * fail - * @param locations -- * the locations where the credentials where loaded from -+ * the locations where the credentials were loaded from - */ - public void notifyLoadCredentialFailure(Throwable error, String... locations); - } -diff -ur voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/examples/ValidationExample.java voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/examples/ValidationExample.java ---- voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/examples/ValidationExample.java 2014-12-09 10:55:31.000000000 +0100 -+++ voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/examples/ValidationExample.java 2015-07-11 22:02:03.237668786 +0200 -@@ -58,11 +58,11 @@ - } - - /** -- * @param args -- * @throws IOException -- * @throws FileNotFoundException -- * @throws CertificateException -- * @throws KeyStoreException -+ * @param args arguments -+ * @throws KeyStoreException key store exception -+ * @throws CertificateException certificate exception -+ * @throws FileNotFoundException file not found exception -+ * @throws IOException IO exception - */ - public static void main(String[] args) throws KeyStoreException, - CertificateException, FileNotFoundException, IOException { -diff -ur voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/request/impl/AbstractVOMSProtocol.java voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/request/impl/AbstractVOMSProtocol.java ---- voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/request/impl/AbstractVOMSProtocol.java 2014-12-09 10:55:31.000000000 +0100 -+++ voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/request/impl/AbstractVOMSProtocol.java 2015-07-11 22:36:27.944060573 +0200 -@@ -164,7 +164,7 @@ - /** - * Sets whether this protocol will skip SSL hostname checks - * -- * @param skipHostnameChecks -+ * @param skipHostnameChecks skip hostname checks - */ - public void setSkipHostnameChecks(boolean skipHostnameChecks) { - -diff -ur voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/request/impl/DefaultVOMSACService.java voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/request/impl/DefaultVOMSACService.java ---- voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/request/impl/DefaultVOMSACService.java 2014-12-09 10:55:31.000000000 +0100 -+++ voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/request/impl/DefaultVOMSACService.java 2015-07-11 22:58:43.620615468 +0200 -@@ -513,7 +513,7 @@ - * Sets the http protocol implementation - * - * @param httpProtocol -- * the http protocol implementatino -+ * the http protocol implementatioh - * @return this {@link Builder} instance - */ - public Builder httpProtocol(VOMSProtocol httpProtocol) { -@@ -524,6 +524,10 @@ - - /** - * Sets the legacy protocol implementation -+ * -+ * @param legacyProtocol -+ * the legacy protocol implementatioh -+ * @return this {@link Builder} instance - */ - public Builder legacyProtocol(VOMSProtocol legacyProtocol) { - -diff -ur voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/request/impl/LegacyRequestSender.java voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/request/impl/LegacyRequestSender.java ---- voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/request/impl/LegacyRequestSender.java 2014-12-09 10:55:31.000000000 +0100 -+++ voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/request/impl/LegacyRequestSender.java 2015-07-11 23:01:29.503319467 +0200 -@@ -97,6 +97,8 @@ - * - * @param acRequest - * the AC request parameters. See {@link VOMSACRequest}. -+ * @param endpoint -+ * VOMS server endpoint - * @param stream - * an output stream. - */ -diff -ur voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/request/impl/LegacyVOMSResponse.java voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/request/impl/LegacyVOMSResponse.java ---- voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/request/impl/LegacyVOMSResponse.java 2014-12-09 10:55:31.000000000 +0100 -+++ voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/request/impl/LegacyVOMSResponse.java 2015-07-11 23:04:31.083184711 +0200 -@@ -37,7 +37,7 @@ - * Builds a VOMSResponse starting from a DOM an XML document (see - * {@link Document}). - * -- * @param res -+ * @param res XML response - */ - public LegacyVOMSResponse(Document res) { - -diff -ur voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/store/impl/DefaultVOMSTrustStore.java voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/store/impl/DefaultVOMSTrustStore.java ---- voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/store/impl/DefaultVOMSTrustStore.java 2014-12-09 10:55:31.000000000 +0100 -+++ voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/store/impl/DefaultVOMSTrustStore.java 2015-07-11 23:12:10.653905564 +0200 -@@ -106,6 +106,8 @@ - /** - * Builds a list of trusted directories containing only - * {@link #DEFAULT_VOMS_DIR}. -+ * -+ * @return list of trusted directories - **/ - protected static List buildDefaultTrustedDirs() { - -@@ -118,6 +120,8 @@ - * - * @param localTrustDirs - * a non-null list of local trust directories -+ * @param listener -+ * trust store status listener - * @throws IllegalArgumentException - * when the list passed as argument is null - */ -diff -ur voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/store/impl/VOMSThread.java voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/store/impl/VOMSThread.java ---- voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/store/impl/VOMSThread.java 2014-12-09 10:55:31.000000000 +0100 -+++ voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/store/impl/VOMSThread.java 2015-07-11 23:13:36.831790810 +0200 -@@ -32,6 +32,8 @@ - * the object whose run method is called. - * @param name - * the name of the new thread. -+ * @param handler -+ * uncaught exception handler - */ - public VOMSThread(Runnable target, String name, - UncaughtExceptionHandler handler) { -diff -ur voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/store/LSCInfo.java voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/store/LSCInfo.java ---- voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/store/LSCInfo.java 2014-12-09 10:55:31.000000000 +0100 -+++ voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/store/LSCInfo.java 2015-07-11 23:49:42.371477209 +0200 -@@ -60,8 +60,8 @@ - * and hostname. - * - * The certificate chain description is a list of X.500 distinguished names -- * encoded as strings according to the OpenSSL slash-separated format, as in: -- * /C=IT/O=INFN/CN=INFN CA -+ * encoded as strings according to the OpenSSL slash-separated format, as -+ * in: @verbatim /C=IT/O=INFN/CN=INFN CA @endverbatim - * - * The first element in the description is the leaf certificate, while the - * last is the CA certificate. -@@ -75,7 +75,7 @@ - * Checks if the certificate chain description maintained in the LSC - * information matches the certificate chain passed as argument. - * -- * @param certChain -+ * @param certChain certificate chain - * @return true if the description matches, false - * otherwise - */ -diff -ur voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/util/CachingCertificateValidator.java voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/util/CachingCertificateValidator.java ---- voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/util/CachingCertificateValidator.java 2014-12-09 10:55:31.000000000 +0100 -+++ voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/util/CachingCertificateValidator.java 2015-07-11 22:19:44.450154294 +0200 -@@ -132,7 +132,7 @@ - * Validates a certificate chain using the wrapped validator, caching the - * result for future validation calls. - * -- * @param certChain -+ * @param certChain certificate chain - * @return a possibly cached {@link ValidationResult} - * @see eu.emi.security.authn.x509.X509CertChainValidator#validate(java.security.cert.X509Certificate[]) - */ -@@ -187,7 +187,7 @@ - } - - /** -- * @param certPath -+ * @param certPath certificate path - * @return the {@link ValidationResult} - * @see eu.emi.security.authn.x509.X509CertChainValidator#validate(java.security.cert.CertPath) - */ -@@ -215,7 +215,7 @@ - } - - /** -- * @param listener -+ * @param listener validation listener - * @see eu.emi.security.authn.x509.X509CertChainValidator#addValidationListener(eu.emi.security.authn.x509.ValidationErrorListener) - */ - public void addValidationListener(ValidationErrorListener listener) { -@@ -224,7 +224,7 @@ - } - - /** -- * @param listener -+ * @param listener validation listener - * @see eu.emi.security.authn.x509.X509CertChainValidator#removeValidationListener(eu.emi.security.authn.x509.ValidationErrorListener) - */ - public void removeValidationListener(ValidationErrorListener listener) { -@@ -233,7 +233,7 @@ - } - - /** -- * @param listener -+ * @param listener validation listener - * @see eu.emi.security.authn.x509.X509CertChainValidator#addUpdateListener(eu.emi.security.authn.x509.StoreUpdateListener) - */ - public void addUpdateListener(StoreUpdateListener listener) { -@@ -242,7 +242,7 @@ - } - - /** -- * @param listener -+ * @param listener validation listener - * @see eu.emi.security.authn.x509.X509CertChainValidator#removeUpdateListener(eu.emi.security.authn.x509.StoreUpdateListener) - */ - public void removeUpdateListener(StoreUpdateListener listener) { -diff -ur voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/util/CertificateValidatorBuilder.java voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/util/CertificateValidatorBuilder.java ---- voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/util/CertificateValidatorBuilder.java 2014-12-09 10:55:31.000000000 +0100 -+++ voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/util/CertificateValidatorBuilder.java 2015-07-11 22:23:13.028201344 +0200 -@@ -142,7 +142,7 @@ - /** - * Sets whether the created validator will be lazy in loading anchors - * -- * @param lazyness -+ * @param lazyness lazyness - * @return the builder object - */ - public CertificateValidatorBuilder lazyAnchorsLoading(boolean lazyness) { -@@ -227,6 +227,9 @@ - * @param validationErrorListener - * the listener that will receive notification about validation - * errors -+ * @param storeUpdateListener -+ * the listener that will receive notification about trust -+ * anchor store updates - * @param updateInterval - * the trust anchor store update interval - * @param namespaceChecks -@@ -259,6 +262,9 @@ - * @param validationErrorListener - * the listener that will receive notification about validation - * errors -+ * @param storeUpdateListener -+ * the listener that will receive notification about trust -+ * anchor store updates - * @param updateInterval - * the trust anchor store update interval - * @param namespaceChecks -diff -ur voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/util/CredentialsUtils.java voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/util/CredentialsUtils.java ---- voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/util/CredentialsUtils.java 2014-12-09 10:55:31.000000000 +0100 -+++ voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/util/CredentialsUtils.java 2015-07-11 22:34:03.331626827 +0200 -@@ -62,11 +62,11 @@ - /** - * Serializes a private key to an output stream according to an encoding. - * -- * @param os -- * @param key -- * @param encoding -- * @throws IllegalArgumentException -- * @throws IOException -+ * @param os output stream -+ * @param key private key -+ * @param encoding private key encoding -+ * @throws IllegalArgumentException illegal argument exception -+ * @throws IOException IO exception - */ - public static void savePrivateKey(OutputStream os, PrivateKey key, - PrivateKeyEncoding encoding) throws IllegalArgumentException, IOException { -@@ -90,10 +90,10 @@ - * This method just delegates to canl, but provides a much more understandable - * signature. - * -- * @param os -- * @param key -- * @throws IllegalArgumentException -- * @throws IOException -+ * @param os output stream -+ * @param key private key -+ * @throws IllegalArgumentException illegal argument exception -+ * @throws IOException IO exception - */ - private static void savePrivateKeyPKCS8(OutputStream os, PrivateKey key) - throws IllegalArgumentException, IOException { -@@ -108,10 +108,10 @@ - * This method just delegates to canl, but provides a much more understandable - * signature. - * -- * @param os -- * @param key -- * @throws IllegalArgumentException -- * @throws IOException -+ * @param os output stream -+ * @param key provate key -+ * @throws IllegalArgumentException illegal argument exception -+ * @throws IOException IO exception - */ - private static void savePrivateKeyPKCS1(OutputStream os, PrivateKey key) - throws IllegalArgumentException, IOException { -@@ -125,16 +125,16 @@ - * Saves user credentials as a plain text PEM data.
- * Writes the user certificate chain first, then the user key. - * -- * @param os -- * @param uc -- * @param encoding -- * @throws UnrecoverableKeyException -- * @throws KeyStoreException -- * @throws IllegalArgumentException -- * @throws NoSuchAlgorithmException -- * @throws IOException -- * @throws NoSuchProviderException -- * @throws CertificateException -+ * @param os output stream -+ * @param uc user credential -+ * @param encoding private key encoding -+ * @throws UnrecoverableKeyException unrecoverable key exception -+ * @throws KeyStoreException key store exception -+ * @throws IllegalArgumentException illegal argument exception -+ * @throws NoSuchAlgorithmException no such algorithm exception -+ * @throws IOException IO exception -+ * @throws NoSuchProviderException no such provider exception -+ * @throws CertificateException certificate exception - */ - public static void saveProxyCredentials(OutputStream os, X509Credential uc, - PrivateKeyEncoding encoding) throws UnrecoverableKeyException, -@@ -174,15 +174,15 @@ - * Writes the user certificate chain first, then the user key, using the - * default encoding specified in {@link #DEFAULT_ENCONDING}. - * -- * @param os -- * @param uc -- * @throws UnrecoverableKeyException -- * @throws KeyStoreException -- * @throws IllegalArgumentException -- * @throws NoSuchAlgorithmException -- * @throws IOException -- * @throws NoSuchProviderException -- * @throws CertificateException -+ * @param os output stream -+ * @param uc user credendial -+ * @throws UnrecoverableKeyException unrecoverable key exception -+ * @throws KeyStoreException key store exception -+ * @throws IllegalArgumentException illegal argument exception -+ * @throws NoSuchAlgorithmException no such algorithm exception -+ * @throws IOException IO exception -+ * @throws NoSuchProviderException no such provider exception -+ * @throws CertificateException certificate exception - */ - public static void saveProxyCredentials(OutputStream os, X509Credential uc) - throws UnrecoverableKeyException, KeyStoreException, -@@ -202,13 +202,13 @@ - * the credential to be saved - * @param encoding - * the private key encoding -- * @throws IOException -- * @throws UnrecoverableKeyException -- * @throws KeyStoreException -- * @throws IllegalArgumentException -- * @throws NoSuchAlgorithmException -- * @throws NoSuchProviderException -- * @throws CertificateException -+ * @throws IOException IOException -+ * @throws UnrecoverableKeyException unrecoverable key exception -+ * @throws KeyStoreException key store exception -+ * @throws IllegalArgumentException illegal argument exception -+ * @throws NoSuchAlgorithmException no such algorithm exception -+ * @throws NoSuchProviderException no such provider exception -+ * @throws CertificateException certificate exception - */ - public static void saveProxyCredentials(String proxyFileName, - X509Credential uc, PrivateKeyEncoding encoding) throws IOException, -@@ -238,14 +238,16 @@ - * encoding specified in {@link #DEFAULT_ENCONDING}. - * - * @param proxyFileName -+ * the file where the proxy will be saved - * @param uc -- * @throws UnrecoverableKeyException -- * @throws KeyStoreException -- * @throws IllegalArgumentException -- * @throws NoSuchAlgorithmException -- * @throws NoSuchProviderException -- * @throws CertificateException -- * @throws IOException -+ * the credential to be saved -+ * @throws UnrecoverableKeyException unrecoverable key exception -+ * @throws KeyStoreException key store exception -+ * @throws IllegalArgumentException illegal argument exception -+ * @throws NoSuchAlgorithmException no such algorithm exception -+ * @throws NoSuchProviderException no such provider exception -+ * @throws CertificateException certificate exception -+ * @throws IOException IOException - */ - public static void saveProxyCredentials(String proxyFileName, - X509Credential uc) throws UnrecoverableKeyException, KeyStoreException, -diff -ur voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/util/VOMSFQANNamingScheme.java voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/util/VOMSFQANNamingScheme.java ---- voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/util/VOMSFQANNamingScheme.java 2014-12-09 10:55:31.000000000 +0100 -+++ voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/util/VOMSFQANNamingScheme.java 2015-07-11 22:35:15.189339253 +0200 -@@ -96,7 +96,7 @@ - * syntax used by voms to identify roles. - * - * -- * @param roleName -+ * @param roleName role name - * @throws VOMSError - * If the string passed as argument doens not comply with the voms - * sytax. -diff -ur voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/VOMSAttribute.java voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/VOMSAttribute.java ---- voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/VOMSAttribute.java 2014-12-09 10:55:31.000000000 +0100 -+++ voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/VOMSAttribute.java 2015-07-11 21:53:57.511827971 +0200 -@@ -117,7 +117,7 @@ - * This method checks whether the attributes are valid in a given time passed - * as argument. No validation is performed on the attributes. - * -- * @param time -+ * @param time time - * @return true if valid, false otherwise - */ - public boolean validAt(Date time); diff --git a/voms-api-java.spec b/voms-api-java.spec index dc4acbc..2cc0f4a 100644 --- a/voms-api-java.spec +++ b/voms-api-java.spec @@ -1,27 +1,18 @@ Name: voms-api-java -Version: 3.0.5 -Release: 3%{?dist} +Version: 3.1.0 +Release: 1%{?dist} Summary: Virtual Organization Membership Service Java API Group: Development/Libraries License: ASL 2.0 URL: https://wiki.italiangrid.it/VOMS Source0: https://github.com/italiangrid/%{name}/archive/v%{version}.tar.gz -# Patch for bouncycastle 1.47+ (Fedora 21+, EPEL 7+) -Patch0: %{name}-bc147.patch # Disable tests using non-local network interface -Patch1: %{name}-no-local.patch -# Fix javadoc warnings/errors -Patch2: %{name}-javadoc.patch +Patch0: %{name}-no-local.patch BuildArch: noarch BuildRequires: maven-local -BuildRequires: mvn(org.apache.maven.plugins:maven-assembly-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-compiler-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-javadoc-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-release-plugin) BuildRequires: mvn(eu.eu-emi.security:canl) -BuildRequires: mvn(org.bouncycastle:bcpkix-jdk15on) BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.mockito:mockito-core) %if %{?fedora}%{!?fedora:0} @@ -50,11 +41,6 @@ Virtual Organization Membership Service (VOMS) Java API Documentation. %prep %setup -q %patch0 -p1 -%patch1 -p1 -%patch2 -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" %pom_remove_plugin org.codehaus.mojo:cobertura-maven-plugin @@ -85,6 +71,10 @@ Virtual Organization Membership Service (VOMS) Java API Documentation. %license LICENSE %changelog +* Sun Feb 14 2016 Mattias Ellert - 3.1.0-1 +- Update to version 3.1.0 - matches canl-java 2.1.x +- Drop patches: voms-api-java-bc147.patch and -javadoc.patch + * Sat Jul 11 2015 Mattias Ellert - 3.0.5-3 - Remove build-dependency on cobertura-maven-plugin (cobertura was removed from Fedora due to licensing issues) From c58d924d3ef5c335b5b5aa90a53c59cb1f7ecf96 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 17:10:12 +0000 Subject: [PATCH 05/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- voms-api-java.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/voms-api-java.spec b/voms-api-java.spec index 85b839e..e26604b 100644 --- a/voms-api-java.spec +++ b/voms-api-java.spec @@ -1,6 +1,6 @@ Name: voms-api-java Version: 3.2.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Virtual Organization Membership Service Java API Group: Development/Libraries @@ -58,6 +58,9 @@ Virtual Organization Membership Service (VOMS) Java API Documentation. %license LICENSE %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 3.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Sun Feb 14 2016 Mattias Ellert - 3.2.0-1 - Update to version 3.2.0 - matches canl-java 2.2.x - Drop patches: voms-api-java-bc147.patch, -javadoc.patch and -testfix.patch From 24525e54474e4220a97561a1d4ed30f1653b1847 Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Thu, 16 Feb 2017 12:53:19 +0100 Subject: [PATCH 06/51] Remove maven source plugin --- voms-api-java.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/voms-api-java.spec b/voms-api-java.spec index e26604b..ec51a20 100644 --- a/voms-api-java.spec +++ b/voms-api-java.spec @@ -1,9 +1,8 @@ Name: voms-api-java Version: 3.2.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Virtual Organization Membership Service Java API -Group: Development/Libraries License: ASL 2.0 URL: https://wiki.italiangrid.it/VOMS Source0: https://github.com/italiangrid/%{name}/archive/v%{version}.tar.gz @@ -30,7 +29,6 @@ This package provides a java client API for VOMS. %package javadoc Summary: Virtual Organization Membership Service Java API Documentation -Group: Documentation %description javadoc Virtual Organization Membership Service (VOMS) Java API Documentation. @@ -39,6 +37,7 @@ Virtual Organization Membership Service (VOMS) Java API Documentation. %setup -q %patch0 -p1 +%pom_remove_plugin org.apache.maven.plugins:maven-source-plugin %pom_remove_plugin org.codehaus.mojo:cobertura-maven-plugin %pom_xpath_inject "pom:project/pom:build/pom:plugins/pom:plugin[pom:groupId='com.mycila.maven-license-plugin']/pom:configuration/pom:excludes" ".xmvn/**" @@ -58,6 +57,9 @@ Virtual Organization Membership Service (VOMS) Java API Documentation. %license LICENSE %changelog +* Thu Feb 16 2017 Mattias Ellert - 3.2.0-3 +- Remove maven source plugin + * Sat Feb 11 2017 Fedora Release Engineering - 3.2.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 44b2b02eff8985fb5ad7ffa8f574bd65d0f2b408 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 21:24:38 +0000 Subject: [PATCH 07/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- voms-api-java.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/voms-api-java.spec b/voms-api-java.spec index ec51a20..173a6b5 100644 --- a/voms-api-java.spec +++ b/voms-api-java.spec @@ -1,6 +1,6 @@ Name: voms-api-java Version: 3.2.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Virtual Organization Membership Service Java API License: ASL 2.0 @@ -57,6 +57,9 @@ Virtual Organization Membership Service (VOMS) Java API Documentation. %license LICENSE %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 3.2.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Thu Feb 16 2017 Mattias Ellert - 3.2.0-3 - Remove maven source plugin From 27671863cce7de537ddbf83c5ab80e02635a6616 Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Thu, 8 Feb 2018 17:17:14 +0100 Subject: [PATCH 08/51] Update to version 3.3.0 - matches canl-java 2.5.x Drop patch voms-api-java-canl-2.5.patch --- sources | 2 +- voms-api-java-canl-2.5.patch | 197 ----------------------------------- voms-api-java.spec | 13 +-- 3 files changed, 8 insertions(+), 204 deletions(-) delete mode 100644 voms-api-java-canl-2.5.patch diff --git a/sources b/sources index e7eccf8..2fafc4d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e45f034c5477b9310043b31d1a310b98 v3.2.0.tar.gz +SHA512 (voms-api-java-3.3.0.tar.gz) = 10994bf7bdffb6896f6b6d3cb3dcb5ee8c05183553f96288107d1ba8223b35c3b998536e6753c41b1989c40e58f98efdbe9410235f1d4f3e5a25a8f450b3a958 diff --git a/voms-api-java-canl-2.5.patch b/voms-api-java-canl-2.5.patch deleted file mode 100644 index d170c0f..0000000 --- a/voms-api-java-canl-2.5.patch +++ /dev/null @@ -1,197 +0,0 @@ -diff -ur voms-api-java-3.2.0.orig/src/main/java/org/italiangrid/voms/credential/impl/AbstractLoadCredentialsStrategy.java voms-api-java-3.2.0/src/main/java/org/italiangrid/voms/credential/impl/AbstractLoadCredentialsStrategy.java ---- voms-api-java-3.2.0.orig/src/main/java/org/italiangrid/voms/credential/impl/AbstractLoadCredentialsStrategy.java 2016-02-11 16:57:01.000000000 +0100 -+++ voms-api-java-3.2.0/src/main/java/org/italiangrid/voms/credential/impl/AbstractLoadCredentialsStrategy.java 2018-01-05 12:30:30.853119209 +0100 -@@ -19,7 +19,7 @@ - import java.io.FileInputStream; - import java.io.FileNotFoundException; - --import org.bouncycastle.openssl.PasswordFinder; -+import eu.emi.security.authn.x509.helpers.PasswordSupplier; - import org.italiangrid.voms.credential.LoadCredentialsEventListener; - import org.italiangrid.voms.credential.LoadCredentialsStrategy; - import org.italiangrid.voms.credential.VOMSEnvironmentVariables; -@@ -83,13 +83,13 @@ - * @param certificatePath - * the path to the certificate - * @param pf -- * a {@link PasswordFinder} used to resolve the private key password -+ * a {@link PasswordSupplier} used to resolve the private key password - * when needed - * @return the loaded {@link X509Credential}, or null if the - * credential couldn't be loaded - */ - protected X509Credential loadPEMCredential(String privateKeyPath, -- String certificatePath, PasswordFinder pf) { -+ String certificatePath, PasswordSupplier pf) { - - PEMCredential cred = null; - -@@ -120,12 +120,12 @@ - * @param pkcs12FilePath - * the path to the pkcs12 credential - * @param pf -- * a {@link PasswordFinder} used to resolve the private key password -+ * a {@link PasswordSupplier} used to resolve the private key password - * @return the loaded {@link X509Credential}, or null if the - * credential couldn't be loaded - */ - protected X509Credential loadPKCS12Credential(String pkcs12FilePath, -- PasswordFinder pf) { -+ PasswordSupplier pf) { - - KeystoreCredential cred = null; - -diff -ur voms-api-java-3.2.0.orig/src/main/java/org/italiangrid/voms/credential/impl/DefaultLoadCredentialsStrategy.java voms-api-java-3.2.0/src/main/java/org/italiangrid/voms/credential/impl/DefaultLoadCredentialsStrategy.java ---- voms-api-java-3.2.0.orig/src/main/java/org/italiangrid/voms/credential/impl/DefaultLoadCredentialsStrategy.java 2016-02-11 16:57:01.000000000 +0100 -+++ voms-api-java-3.2.0/src/main/java/org/italiangrid/voms/credential/impl/DefaultLoadCredentialsStrategy.java 2018-01-05 12:30:30.854119198 +0100 -@@ -15,7 +15,7 @@ - */ - package org.italiangrid.voms.credential.impl; - --import org.bouncycastle.openssl.PasswordFinder; -+import eu.emi.security.authn.x509.helpers.PasswordSupplier; - import org.italiangrid.voms.VOMSError; - import org.italiangrid.voms.credential.LoadCredentialsEventListener; - import org.italiangrid.voms.credential.ProxyNamingPolicy; -@@ -115,7 +115,7 @@ - return val; - } - -- public X509Credential loadCredentials(PasswordFinder pf) { -+ public X509Credential loadCredentials(PasswordSupplier pf) { - - if (pf == null) - throw new IllegalArgumentException( -@@ -163,7 +163,7 @@ - return null; - } - -- protected X509Credential loadPEMCredentialFromEnv(PasswordFinder pf) { -+ protected X509Credential loadPEMCredentialFromEnv(PasswordSupplier pf) { - - String certPath = getFromEnvOrSystemProperty(X509_USER_CERT); - String keyPath = getFromEnvOrSystemProperty(X509_USER_KEY); -@@ -175,7 +175,7 @@ - return null; - } - -- protected X509Credential loadPKCS12CredentialFromEnv(PasswordFinder pf) { -+ protected X509Credential loadPKCS12CredentialFromEnv(PasswordSupplier pf) { - - String pkcs12Path = getFromEnvOrSystemProperty(PKCS12_USER_CERT); - -@@ -185,7 +185,7 @@ - return null; - } - -- protected X509Credential loadPKCS12CredentialsFromGlobusDir(PasswordFinder pf) { -+ protected X509Credential loadPKCS12CredentialsFromGlobusDir(PasswordSupplier pf) { - - String credPath = String.format("%s/%s", home, - GLOBUS_PKCS12_CRED_PATH_SUFFIX); -@@ -193,7 +193,7 @@ - - } - -- protected X509Credential loadPEMCredentialsFromGlobusDir(PasswordFinder pf) { -+ protected X509Credential loadPEMCredentialsFromGlobusDir(PasswordSupplier pf) { - - String certPath = String.format("%s/%s", home, GLOBUS_PEM_CERT_PATH_SUFFIX); - String keyPath = String.format("%s/%s", home, GLOBUS_PEM_KEY_PATH_SUFFIX); -diff -ur voms-api-java-3.2.0.orig/src/main/java/org/italiangrid/voms/credential/LoadCredentialsStrategy.java voms-api-java-3.2.0/src/main/java/org/italiangrid/voms/credential/LoadCredentialsStrategy.java ---- voms-api-java-3.2.0.orig/src/main/java/org/italiangrid/voms/credential/LoadCredentialsStrategy.java 2016-02-11 16:57:01.000000000 +0100 -+++ voms-api-java-3.2.0/src/main/java/org/italiangrid/voms/credential/LoadCredentialsStrategy.java 2018-01-05 12:30:30.852119219 +0100 -@@ -15,7 +15,7 @@ - */ - package org.italiangrid.voms.credential; - --import org.bouncycastle.openssl.PasswordFinder; -+import eu.emi.security.authn.x509.helpers.PasswordSupplier; - - import eu.emi.security.authn.x509.X509Credential; - -@@ -37,5 +37,5 @@ - * @return an {@link X509Credential}, or null if no credential - * was found - */ -- public X509Credential loadCredentials(PasswordFinder passwordFinder); -+ public X509Credential loadCredentials(PasswordSupplier passwordFinder); - } -diff -ur voms-api-java-3.2.0.orig/src/main/java/org/italiangrid/voms/credential/UserCredentials.java voms-api-java-3.2.0/src/main/java/org/italiangrid/voms/credential/UserCredentials.java ---- voms-api-java-3.2.0.orig/src/main/java/org/italiangrid/voms/credential/UserCredentials.java 2016-02-11 16:57:01.000000000 +0100 -+++ voms-api-java-3.2.0/src/main/java/org/italiangrid/voms/credential/UserCredentials.java 2018-01-05 12:30:30.852119219 +0100 -@@ -15,7 +15,7 @@ - */ - package org.italiangrid.voms.credential; - --import org.bouncycastle.openssl.PasswordFinder; -+import eu.emi.security.authn.x509.helpers.PasswordSupplier; - import org.italiangrid.voms.credential.impl.DefaultLoadCredentialsStrategy; - - import eu.emi.security.authn.x509.X509Credential; -@@ -43,7 +43,7 @@ - - public static X509Credential loadCredentials(final char[] keyPassword) { - -- PasswordFinder pf = new PasswordFinder() { -+ PasswordSupplier pf = new PasswordSupplier() { - - public char[] getPassword() { - -@@ -54,7 +54,7 @@ - return loadCredentialsStrategy.loadCredentials(pf); - } - -- public static X509Credential loadCredentials(PasswordFinder passwordFinder) { -+ public static X509Credential loadCredentials(PasswordSupplier passwordFinder) { - - return loadCredentialsStrategy.loadCredentials(passwordFinder); - } -diff -ur voms-api-java-3.2.0.orig/src/test/java/org/italiangrid/voms/test/cred/TestLoadCredential.java voms-api-java-3.2.0/src/test/java/org/italiangrid/voms/test/cred/TestLoadCredential.java ---- voms-api-java-3.2.0.orig/src/test/java/org/italiangrid/voms/test/cred/TestLoadCredential.java 2016-02-11 16:57:01.000000000 +0100 -+++ voms-api-java-3.2.0/src/test/java/org/italiangrid/voms/test/cred/TestLoadCredential.java 2018-01-05 12:30:30.852119219 +0100 -@@ -15,7 +15,7 @@ - */ - package org.italiangrid.voms.test.cred; - --import org.bouncycastle.openssl.PasswordFinder; -+import eu.emi.security.authn.x509.helpers.PasswordSupplier; - import org.italiangrid.voms.credential.impl.AbstractLoadCredentialsStrategy; - import org.italiangrid.voms.credential.impl.DefaultLoadCredentialsStrategy; - import org.italiangrid.voms.util.FilePermissionHelper; -@@ -51,7 +51,7 @@ - + "/.globus/usercred.p12"); - } - -- static class TestPasswordFinder implements PasswordFinder { -+ static class TestPasswordFinder implements PasswordSupplier { - - public char[] getPassword() { - -@@ -59,7 +59,7 @@ - } - } - -- static class NullPasswordFinder implements PasswordFinder { -+ static class NullPasswordSupplier implements PasswordSupplier { - - public char[] getPassword() { - -@@ -72,7 +72,7 @@ - - AbstractLoadCredentialsStrategy strategy = new DefaultLoadCredentialsStrategy( - emptyHome); -- X509Credential cred = strategy.loadCredentials(new NullPasswordFinder()); -+ X509Credential cred = strategy.loadCredentials(new NullPasswordSupplier()); - Assert.assertNull(cred); - } - -@@ -81,7 +81,7 @@ - - AbstractLoadCredentialsStrategy strategy = new DefaultLoadCredentialsStrategy( - emptyGlobusHome); -- X509Credential cred = strategy.loadCredentials(new NullPasswordFinder()); -+ X509Credential cred = strategy.loadCredentials(new NullPasswordSupplier()); - Assert.assertNull(cred); - } - diff --git a/voms-api-java.spec b/voms-api-java.spec index 84b8fdf..421540c 100644 --- a/voms-api-java.spec +++ b/voms-api-java.spec @@ -1,15 +1,13 @@ Name: voms-api-java -Version: 3.2.0 -Release: 5%{?dist} +Version: 3.3.0 +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}.tar.gz +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 -# Adapt to canl-java version 2.5 -Patch1: %{name}-canl-2.5.patch BuildArch: noarch BuildRequires: maven-local @@ -38,7 +36,6 @@ Virtual Organization Membership Service (VOMS) Java API Documentation. %prep %setup -q %patch0 -p1 -%patch1 -p1 # Do not create source jars %pom_remove_plugin org.apache.maven.plugins:maven-source-plugin @@ -64,6 +61,10 @@ Virtual Organization Membership Service (VOMS) Java API Documentation. %license LICENSE %changelog +* Thu Feb 08 2018 Mattias Ellert - 3.3.0-1 +- Update to version 3.3.0 - matches canl-java 2.5.x +- Drop patch voms-api-java-canl-2.5.patch + * Fri Jan 05 2018 Mattias Ellert - 3.2.0-5 - Adapt to canl-java 2.5 - Use jcip-annotations for EPEL 7 build From 4116c314fc967e5effaee7a1c8efbc164bc74c8e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 08:38:25 +0000 Subject: [PATCH 09/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- voms-api-java.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/voms-api-java.spec b/voms-api-java.spec index 421540c..d35a5ca 100644 --- a/voms-api-java.spec +++ b/voms-api-java.spec @@ -1,6 +1,6 @@ Name: voms-api-java Version: 3.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Virtual Organization Membership Service Java API License: ASL 2.0 @@ -61,6 +61,9 @@ Virtual Organization Membership Service (VOMS) Java API Documentation. %license LICENSE %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 3.3.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Thu Feb 08 2018 Mattias Ellert - 3.3.0-1 - Update to version 3.3.0 - matches canl-java 2.5.x - Drop patch voms-api-java-canl-2.5.patch From 157c221f9a8c1c2aa382f00a37acbaad9e6aa64d Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Fri, 7 Dec 2018 15:55:03 +0100 Subject: [PATCH 10/51] Add BuildRequires on hamcrest-library (no longer pulled in by mockito) --- voms-api-java.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/voms-api-java.spec b/voms-api-java.spec index d35a5ca..8bc4db9 100644 --- a/voms-api-java.spec +++ b/voms-api-java.spec @@ -1,6 +1,6 @@ Name: voms-api-java Version: 3.3.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Virtual Organization Membership Service Java API License: ASL 2.0 @@ -13,6 +13,7 @@ BuildArch: noarch BuildRequires: maven-local 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 @@ -61,6 +62,9 @@ Virtual Organization Membership Service (VOMS) Java API Documentation. %license LICENSE %changelog +* Fri Dec 07 2018 Mattias Ellert - 3.3.0-3 +- Add BuildRequires on hamcrest-library (no longer pulled in by mockito) + * Sat Jul 14 2018 Fedora Release Engineering - 3.3.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From c34c1cbd814ac41304de32ee16597c2c5d2d275d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 11:25:51 +0000 Subject: [PATCH 11/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- voms-api-java.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/voms-api-java.spec b/voms-api-java.spec index 8bc4db9..f368a6b 100644 --- a/voms-api-java.spec +++ b/voms-api-java.spec @@ -1,6 +1,6 @@ Name: voms-api-java Version: 3.3.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Virtual Organization Membership Service Java API License: ASL 2.0 @@ -62,6 +62,9 @@ Virtual Organization Membership Service (VOMS) Java API Documentation. %license LICENSE %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 3.3.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Dec 07 2018 Mattias Ellert - 3.3.0-3 - Add BuildRequires on hamcrest-library (no longer pulled in by mockito) From ad0b456c0ba889ba94e4703f8119327c0bb96e11 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 03:09:27 +0000 Subject: [PATCH 12/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- voms-api-java.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/voms-api-java.spec b/voms-api-java.spec index f368a6b..9432d3c 100644 --- a/voms-api-java.spec +++ b/voms-api-java.spec @@ -1,6 +1,6 @@ Name: voms-api-java Version: 3.3.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Virtual Organization Membership Service Java API License: ASL 2.0 @@ -62,6 +62,9 @@ Virtual Organization Membership Service (VOMS) Java API Documentation. %license LICENSE %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 3.3.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 03 2019 Fedora Release Engineering - 3.3.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 93ac4b4bff0775f17e43f814ea1676033077f330 Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Tue, 20 Aug 2019 08:07:02 +0200 Subject: [PATCH 13/51] 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 From 44e430c71b1f5b3af40a0ec1f62752ea20c78fed Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 03:21:42 +0000 Subject: [PATCH 14/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- voms-api-java.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/voms-api-java.spec b/voms-api-java.spec index 7e6c0b6..e22dffb 100644 --- a/voms-api-java.spec +++ b/voms-api-java.spec @@ -1,6 +1,6 @@ Name: voms-api-java Version: 3.3.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Virtual Organization Membership Service Java API License: ASL 2.0 @@ -69,6 +69,9 @@ Virtual Organization Membership Service (VOMS) Java API Documentation. %license LICENSE %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 3.3.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Tue Aug 20 2019 Mattias Ellert - 3.3.0-6 - Remove maven-javadoc-plugin configuration - Remove unused dependency net.jcip:jcip-annotations From 823730ac2fa15381e4a372882f4de4d854c7f5a1 Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Wed, 6 May 2020 01:24:17 +0200 Subject: [PATCH 15/51] Only remove the maven-javadoc-plugin configuration on EPEL 8 Add source version to javadoc configuration (backported from git) --- voms-api-java-javadoc-source.patch | 24 ++++++++++++++++++++++++ voms-api-java.spec | 21 +++++++++++++++++---- 2 files changed, 41 insertions(+), 4 deletions(-) create mode 100644 voms-api-java-javadoc-source.patch diff --git a/voms-api-java-javadoc-source.patch b/voms-api-java-javadoc-source.patch new file mode 100644 index 0000000..dd69157 --- /dev/null +++ b/voms-api-java-javadoc-source.patch @@ -0,0 +1,24 @@ +From f0fd4e08e94d70630d7948da2a8e2acf2a337697 Mon Sep 17 00:00:00 2001 +From: Mattias Ellert +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 @@ + maven-javadoc-plugin + ${plugin.javadoc.version} + ++ 1.8 + ${project.build.directory}/javadoc + ${project.reporting.outputDirectory}/javadoc + +-- +2.25.4 + diff --git a/voms-api-java.spec b/voms-api-java.spec index e22dffb..1232080 100644 --- a/voms-api-java.spec +++ b/voms-api-java.spec @@ -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 - 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 - 3.3.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 6894faabb2ceff1603858beeb591d5dc0df0a07d Mon Sep 17 00:00:00 2001 From: Jiri Date: Sat, 11 Jul 2020 08:12:00 +0200 Subject: [PATCH 16/51] Rebuilt for JDK-11 --- voms-api-java.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/voms-api-java.spec b/voms-api-java.spec index 1232080..55b2016 100644 --- a/voms-api-java.spec +++ b/voms-api-java.spec @@ -1,6 +1,6 @@ Name: voms-api-java Version: 3.3.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Virtual Organization Membership Service Java API License: ASL 2.0 @@ -78,6 +78,9 @@ Virtual Organization Membership Service (VOMS) Java API Documentation. %license LICENSE %changelog +* Sat Jul 11 2020 Jiri Vanek - 3.3.0-9 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + * Tue May 05 2020 Mattias Ellert - 3.3.0-8 - Only remove the maven-javadoc-plugin configuration on EPEL 8 - Add source version to javadoc configuration (backported from git) From ca5c064cd185f1ff1c171074d89a981d62661801 Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Wed, 15 Jul 2020 06:49:47 +0200 Subject: [PATCH 17/51] Fedora 33 builds javadoc the same way EPEL 8 does --- voms-api-java.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/voms-api-java.spec b/voms-api-java.spec index 55b2016..54b21e9 100644 --- a/voms-api-java.spec +++ b/voms-api-java.spec @@ -1,6 +1,6 @@ Name: voms-api-java Version: 3.3.0 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Virtual Organization Membership Service Java API License: ASL 2.0 @@ -48,8 +48,8 @@ Virtual Organization Membership Service (VOMS) Java API Documentation. %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 +%if %{?fedora}%{!?fedora:0} >= 33 || %{?rhel}%{!?rhel:0} >= 8 +# F33+ and EPEL8+ 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 @@ -78,6 +78,9 @@ Virtual Organization Membership Service (VOMS) Java API Documentation. %license LICENSE %changelog +* Wed Jul 15 2020 Mattias Ellert - 3.3.0-10 +- Fedora 33 builds javadoc the same way EPEL 8 does + * Sat Jul 11 2020 Jiri Vanek - 3.3.0-9 - Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 From 9b66864caacd12a9e6ed20ec2b4e0c46b05ce966 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 13:52:02 +0000 Subject: [PATCH 18/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- voms-api-java.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/voms-api-java.spec b/voms-api-java.spec index 54b21e9..2f6d3e9 100644 --- a/voms-api-java.spec +++ b/voms-api-java.spec @@ -1,6 +1,6 @@ Name: voms-api-java Version: 3.3.0 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Virtual Organization Membership Service Java API License: ASL 2.0 @@ -78,6 +78,9 @@ Virtual Organization Membership Service (VOMS) Java API Documentation. %license LICENSE %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 3.3.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jul 15 2020 Mattias Ellert - 3.3.0-10 - Fedora 33 builds javadoc the same way EPEL 8 does From 9d602ff70445fbd329fa6caf7950a2c087ce35e8 Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Tue, 13 Oct 2020 19:23:25 +0200 Subject: [PATCH 19/51] Update to version 3.3.2 - matches canl-java 2.6.x Drop patches voms-api-java-javadoc-source.patch and -no-local.patch --- sources | 2 +- voms-api-java-javadoc-source.patch | 24 ------------------------ voms-api-java-no-local.patch | 21 --------------------- voms-api-java.spec | 19 ++++++++----------- 4 files changed, 9 insertions(+), 57 deletions(-) delete mode 100644 voms-api-java-javadoc-source.patch delete mode 100644 voms-api-java-no-local.patch diff --git a/sources b/sources index 2fafc4d..e9e119c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (voms-api-java-3.3.0.tar.gz) = 10994bf7bdffb6896f6b6d3cb3dcb5ee8c05183553f96288107d1ba8223b35c3b998536e6753c41b1989c40e58f98efdbe9410235f1d4f3e5a25a8f450b3a958 +SHA512 (voms-api-java-3.3.2.tar.gz) = 7de09abd3e1605a7596c29bb0f16553945d6c13098c667451580ed4e22a671814db254355b56ec12696fce011854487510fb9e627e4f13474fbfedec6db1c422 diff --git a/voms-api-java-javadoc-source.patch b/voms-api-java-javadoc-source.patch deleted file mode 100644 index dd69157..0000000 --- a/voms-api-java-javadoc-source.patch +++ /dev/null @@ -1,24 +0,0 @@ -From f0fd4e08e94d70630d7948da2a8e2acf2a337697 Mon Sep 17 00:00:00 2001 -From: Mattias Ellert -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 @@ - maven-javadoc-plugin - ${plugin.javadoc.version} - -+ 1.8 - ${project.build.directory}/javadoc - ${project.reporting.outputDirectory}/javadoc - --- -2.25.4 - diff --git a/voms-api-java-no-local.patch b/voms-api-java-no-local.patch deleted file mode 100644 index e63d618..0000000 --- a/voms-api-java-no-local.patch +++ /dev/null @@ -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(); diff --git a/voms-api-java.spec b/voms-api-java.spec index 2f6d3e9..4674fd3 100644 --- a/voms-api-java.spec +++ b/voms-api-java.spec @@ -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 - 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 - 3.3.0-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From e1e0bbec10e2d6f1a70eb4ea234547f7d4c8fc57 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 23:13:45 +0000 Subject: [PATCH 20/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- voms-api-java.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/voms-api-java.spec b/voms-api-java.spec index 4674fd3..afba06a 100644 --- a/voms-api-java.spec +++ b/voms-api-java.spec @@ -1,6 +1,6 @@ Name: voms-api-java Version: 3.3.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Virtual Organization Membership Service Java API License: ASL 2.0 @@ -71,6 +71,9 @@ Virtual Organization Membership Service (VOMS) Java API Documentation. %license LICENSE %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 3.3.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Oct 13 2020 Mattias Ellert - 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 From cb56554d95693c810483b1c16b26282f82f2eb59 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 20:39:01 +0000 Subject: [PATCH 21/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- voms-api-java.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/voms-api-java.spec b/voms-api-java.spec index afba06a..f7d1840 100644 --- a/voms-api-java.spec +++ b/voms-api-java.spec @@ -1,6 +1,6 @@ Name: voms-api-java Version: 3.3.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Virtual Organization Membership Service Java API License: ASL 2.0 @@ -71,6 +71,9 @@ Virtual Organization Membership Service (VOMS) Java API Documentation. %license LICENSE %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 3.3.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Jan 27 2021 Fedora Release Engineering - 3.3.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 802372a16ff8f9010b9265beba32dba66814a0d2 Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Fri, 14 Jan 2022 09:15:19 +0100 Subject: [PATCH 22/51] Disable failing tests due to changes in bouncycastle --- voms-api-java.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/voms-api-java.spec b/voms-api-java.spec index f7d1840..e19a814 100644 --- a/voms-api-java.spec +++ b/voms-api-java.spec @@ -1,6 +1,6 @@ Name: voms-api-java Version: 3.3.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Virtual Organization Membership Service Java API License: ASL 2.0 @@ -56,6 +56,12 @@ Virtual Organization Membership Service (VOMS) Java API Documentation. # Remove license plugin %pom_remove_plugin com.mycila.maven-license-plugin:maven-license-plugin +# These tests fail due to changes to the ASN1TaggedObject class in +# bouncycastle 1.70 - remove until fixed +# https://github.com/italiangrid/voms-api-java/issues/28 +rm src/test/java/org/italiangrid/voms/test/ac/TestACGeneration.java +rm src/test/java/org/italiangrid/voms/test/ac/TestFakeVOMSACService.java + %build %mvn_build @@ -71,6 +77,9 @@ Virtual Organization Membership Service (VOMS) Java API Documentation. %license LICENSE %changelog +* Fri Jan 14 2022 Mattias Ellert - 3.3.2-4 +- Disable failing tests due to changes in bouncycastle + * Fri Jul 23 2021 Fedora Release Engineering - 3.3.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From c910482e8dbff8ba00150c7e013d5d5d14fd385e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 04:09:47 +0000 Subject: [PATCH 23/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- voms-api-java.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/voms-api-java.spec b/voms-api-java.spec index e19a814..143e6bb 100644 --- a/voms-api-java.spec +++ b/voms-api-java.spec @@ -1,6 +1,6 @@ Name: voms-api-java Version: 3.3.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Virtual Organization Membership Service Java API License: ASL 2.0 @@ -77,6 +77,9 @@ rm src/test/java/org/italiangrid/voms/test/ac/TestFakeVOMSACService.java %license LICENSE %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 3.3.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jan 14 2022 Mattias Ellert - 3.3.2-4 - Disable failing tests due to changes in bouncycastle From 5d03c7adbf149d5d25718021565814e0418d4813 Mon Sep 17 00:00:00 2001 From: Jiri Date: Sun, 6 Feb 2022 00:35:18 +0100 Subject: [PATCH 24/51] Rebuilt for java-17-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java17 --- voms-api-java.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/voms-api-java.spec b/voms-api-java.spec index 143e6bb..1916404 100644 --- a/voms-api-java.spec +++ b/voms-api-java.spec @@ -1,6 +1,6 @@ Name: voms-api-java Version: 3.3.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Virtual Organization Membership Service Java API License: ASL 2.0 @@ -77,6 +77,9 @@ rm src/test/java/org/italiangrid/voms/test/ac/TestFakeVOMSACService.java %license LICENSE %changelog +* Sat Feb 05 2022 Jiri Vanek - 3.3.2-6 +- Rebuilt for java-17-openjdk as system jdk + * Sat Jan 22 2022 Fedora Release Engineering - 3.3.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From c83aa15b2aa564e929efb4e8db19e1389f855ea6 Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 8 Jul 2022 16:58:45 +0200 Subject: [PATCH 25/51] Rebuilt for Drop i686 JDKs https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs --- voms-api-java.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/voms-api-java.spec b/voms-api-java.spec index 1916404..7a8f6b3 100644 --- a/voms-api-java.spec +++ b/voms-api-java.spec @@ -1,12 +1,13 @@ Name: voms-api-java Version: 3.3.2 -Release: 6%{?dist} +Release: 7%{?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 BuildArch: noarch +ExclusiveArch: %{java_arches} noarch BuildRequires: maven-local BuildRequires: mvn(eu.eu-emi.security:canl) >= 2.6 @@ -77,6 +78,9 @@ rm src/test/java/org/italiangrid/voms/test/ac/TestFakeVOMSACService.java %license LICENSE %changelog +* Fri Jul 08 2022 Jiri Vanek - 3.3.2-7 +- Rebuilt for Drop i686 JDKs + * Sat Feb 05 2022 Jiri Vanek - 3.3.2-6 - Rebuilt for java-17-openjdk as system jdk From 1c47cf4074baf3b6c6b864ef0368d3433ddd7826 Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Mon, 18 Jul 2022 23:52:32 +0200 Subject: [PATCH 26/51] mixed-use-of-spaces-and-tabs --- voms-api-java.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/voms-api-java.spec b/voms-api-java.spec index 7a8f6b3..94aa0b4 100644 --- a/voms-api-java.spec +++ b/voms-api-java.spec @@ -7,7 +7,7 @@ License: ASL 2.0 URL: https://wiki.italiangrid.it/VOMS Source0: https://github.com/italiangrid/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz BuildArch: noarch -ExclusiveArch: %{java_arches} noarch +ExclusiveArch: %{java_arches} noarch BuildRequires: maven-local BuildRequires: mvn(eu.eu-emi.security:canl) >= 2.6 From d3199e1cca5985d04e596ea21eec13a3abd366a7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 12:05:38 +0000 Subject: [PATCH 27/51] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- voms-api-java.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/voms-api-java.spec b/voms-api-java.spec index 94aa0b4..07c7ff1 100644 --- a/voms-api-java.spec +++ b/voms-api-java.spec @@ -1,6 +1,6 @@ Name: voms-api-java Version: 3.3.2 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Virtual Organization Membership Service Java API License: ASL 2.0 @@ -78,6 +78,9 @@ rm src/test/java/org/italiangrid/voms/test/ac/TestFakeVOMSACService.java %license LICENSE %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 3.3.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Fri Jul 08 2022 Jiri Vanek - 3.3.2-7 - Rebuilt for Drop i686 JDKs From 6673df8150f38501ecb2fd4a9a59b42c56e28ef7 Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Wed, 28 Sep 2022 15:51:24 +0200 Subject: [PATCH 28/51] Disable failing multi-thread test Disable tests using obsolete hashes (md5/sha1) --- voms-api-java-crypto-policy.patch | 35 +++++++++++++++ voms-api-java-disable-some-tests.patch | 62 ++++++++++++++++++++++++++ voms-api-java-no-mt-test.patch | 13 ++++++ voms-api-java.spec | 23 +++++++--- 4 files changed, 127 insertions(+), 6 deletions(-) create mode 100644 voms-api-java-crypto-policy.patch create mode 100644 voms-api-java-disable-some-tests.patch create mode 100644 voms-api-java-no-mt-test.patch diff --git a/voms-api-java-crypto-policy.patch b/voms-api-java-crypto-policy.patch new file mode 100644 index 0000000..81be0c0 --- /dev/null +++ b/voms-api-java-crypto-policy.patch @@ -0,0 +1,35 @@ +diff --git a/src/test/java/org/italiangrid/voms/test/TestOpensslHashFunction.java b/src/test/java/org/italiangrid/voms/test/TestOpensslHashFunction.java +index 6f57833..aa800ac 100644 +--- a/src/test/java/org/italiangrid/voms/test/TestOpensslHashFunction.java ++++ b/src/test/java/org/italiangrid/voms/test/TestOpensslHashFunction.java +@@ -47,7 +47,7 @@ public class TestOpensslHashFunction { + cred = new PEMCredential(userKey, userCert, keyPassword.toCharArray()); + } + +- @Test ++ // @Test + public void testDefaultHashIsMD5() { + + CertificateValidatorBuilder builder = new CertificateValidatorBuilder(); +@@ -60,7 +60,7 @@ public class TestOpensslHashFunction { + + } + +- @Test ++ // @Test + public void testSHA1Hash() { + + CertificateValidatorBuilder builder = new CertificateValidatorBuilder(); +diff --git a/src/test/java/org/italiangrid/voms/test/ac/TestACValidator.java b/src/test/java/org/italiangrid/voms/test/ac/TestACValidator.java +index 8b420a9..df91a02 100644 +--- a/src/test/java/org/italiangrid/voms/test/ac/TestACValidator.java ++++ b/src/test/java/org/italiangrid/voms/test/ac/TestACValidator.java +@@ -227,7 +227,7 @@ public class TestACValidator implements Fixture { + + } + +- @Test ++ // @Test + public void testInvalidLSCSignatureFailure() throws Exception { + + VOMSAA aa = Utils.getVOMSAA(); diff --git a/voms-api-java-disable-some-tests.patch b/voms-api-java-disable-some-tests.patch new file mode 100644 index 0000000..5f2cc99 --- /dev/null +++ b/voms-api-java-disable-some-tests.patch @@ -0,0 +1,62 @@ +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 bc7557c..32ba7a5 100644 +--- a/src/test/java/org/italiangrid/voms/test/ac/TestACGeneration.java ++++ b/src/test/java/org/italiangrid/voms/test/ac/TestACGeneration.java +@@ -191,7 +191,7 @@ public class TestACGeneration { + return ga; + } + +- @Test ++ // @Test + public void testGeneratedACParsing() throws KeyStoreException, + CertificateException, FileNotFoundException, IOException, + OperatorCreationException { +@@ -230,7 +230,7 @@ public class TestACGeneration { + + } + +- @Test ++ // @Test + public void testACValidation() { + + ValidationResultChecker c = new ValidationResultChecker(true); +@@ -247,7 +247,7 @@ public class TestACGeneration { + + } + +- @Test ++ // @Test + public void testLSCValidationFailure() { + + ValidationResultChecker c = new ValidationResultChecker(false, +@@ -264,7 +264,7 @@ public class TestACGeneration { + assertEquals(validatedAttrs.size(), 0); + } + +- @Test ++ // @Test + public void testExpiredAACertValidationFailure() + throws OperatorCreationException { + +@@ -284,7 +284,7 @@ public class TestACGeneration { + assertEquals(validatedAttrs.size(), 0); + } + +- @Test ++ // @Test + public void testRevokedAACertValidationFailure() { + + ValidationResultChecker c = new ValidationResultChecker(false, +diff --git a/src/test/java/org/italiangrid/voms/test/ac/TestFakeVOMSACService.java b/src/test/java/org/italiangrid/voms/test/ac/TestFakeVOMSACService.java +index 6eca55f..49f0498 100644 +--- a/src/test/java/org/italiangrid/voms/test/ac/TestFakeVOMSACService.java ++++ b/src/test/java/org/italiangrid/voms/test/ac/TestFakeVOMSACService.java +@@ -54,7 +54,7 @@ public class TestFakeVOMSACService extends TestACSupport { + initializeCredentials(); + } + +- @Test ++ // @Test + public void testFakeAcServiceCreation() { + + ACGenerationParams params = ACGenerationParams.builder() diff --git a/voms-api-java-no-mt-test.patch b/voms-api-java-no-mt-test.patch new file mode 100644 index 0000000..75df0ed --- /dev/null +++ b/voms-api-java-no-mt-test.patch @@ -0,0 +1,13 @@ +diff --git a/src/test/java/org/italiangrid/voms/test/mt/TestConcurrentValidation.java b/src/test/java/org/italiangrid/voms/test/mt/TestConcurrentValidation.java +index 496455e..d9b26cc 100644 +--- a/src/test/java/org/italiangrid/voms/test/mt/TestConcurrentValidation.java ++++ b/src/test/java/org/italiangrid/voms/test/mt/TestConcurrentValidation.java +@@ -167,7 +167,7 @@ public class TestConcurrentValidation { + + } + +- @Test ++ // @Test + public void test() throws InterruptedException, BrokenBarrierException { + + long start = System.currentTimeMillis(); diff --git a/voms-api-java.spec b/voms-api-java.spec index 07c7ff1..d49904c 100644 --- a/voms-api-java.spec +++ b/voms-api-java.spec @@ -6,6 +6,16 @@ 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 failing tests +# IllegalState object explicit - implicit expected. +# https://github.com/italiangrid/voms-api-java/issues/29 +Patch0: %{name}-disable-some-tests.patch +# Disable failing multi-thread test +Patch1: %{name}-no-mt-test.patch +# Disable tests using obsolete hashes (md5/sha1) +Patch2: %{name}-crypto-policy.patch + BuildArch: noarch ExclusiveArch: %{java_arches} noarch @@ -34,6 +44,9 @@ Virtual Organization Membership Service (VOMS) Java API Documentation. %prep %setup -q +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 # Remove unused dependency %pom_remove_dep net.jcip:jcip-annotations @@ -57,12 +70,6 @@ Virtual Organization Membership Service (VOMS) Java API Documentation. # Remove license plugin %pom_remove_plugin com.mycila.maven-license-plugin:maven-license-plugin -# These tests fail due to changes to the ASN1TaggedObject class in -# bouncycastle 1.70 - remove until fixed -# https://github.com/italiangrid/voms-api-java/issues/28 -rm src/test/java/org/italiangrid/voms/test/ac/TestACGeneration.java -rm src/test/java/org/italiangrid/voms/test/ac/TestFakeVOMSACService.java - %build %mvn_build @@ -78,6 +85,10 @@ rm src/test/java/org/italiangrid/voms/test/ac/TestFakeVOMSACService.java %license LICENSE %changelog +* Wed Sep 28 2022 Mattias Ellert - 3.3.2-8 +- Disable failing multi-thread test +- Disable tests using obsolete hashes (md5/sha1) + * Sat Jul 23 2022 Fedora Release Engineering - 3.3.2-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 2addb062e3ef42e142e4c1c2c2841ae9c1d28b44 Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Wed, 28 Sep 2022 16:53:36 +0200 Subject: [PATCH 29/51] Bump release --- voms-api-java.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/voms-api-java.spec b/voms-api-java.spec index d49904c..1b653d0 100644 --- a/voms-api-java.spec +++ b/voms-api-java.spec @@ -1,6 +1,6 @@ Name: voms-api-java Version: 3.3.2 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Virtual Organization Membership Service Java API License: ASL 2.0 @@ -85,7 +85,7 @@ Virtual Organization Membership Service (VOMS) Java API Documentation. %license LICENSE %changelog -* Wed Sep 28 2022 Mattias Ellert - 3.3.2-8 +* Wed Sep 28 2022 Mattias Ellert - 3.3.2-9 - Disable failing multi-thread test - Disable tests using obsolete hashes (md5/sha1) From d311afd85f803c2bd6f26f2e1c2b883d8249422d Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Tue, 18 Oct 2022 05:41:19 +0200 Subject: [PATCH 30/51] Disable tests that fail due to expired certificates --- ... => voms-api-java-expired-2022-09-24.patch | 13 ++ voms-api-java-expired-2022-10-08.patch | 111 ++++++++++++++++++ voms-api-java-no-mt-test.patch | 13 -- voms-api-java.spec | 25 ++-- 4 files changed, 141 insertions(+), 21 deletions(-) rename voms-api-java-crypto-policy.patch => voms-api-java-expired-2022-09-24.patch (70%) create mode 100644 voms-api-java-expired-2022-10-08.patch delete mode 100644 voms-api-java-no-mt-test.patch diff --git a/voms-api-java-crypto-policy.patch b/voms-api-java-expired-2022-09-24.patch similarity index 70% rename from voms-api-java-crypto-policy.patch rename to voms-api-java-expired-2022-09-24.patch index 81be0c0..7169433 100644 --- a/voms-api-java-crypto-policy.patch +++ b/voms-api-java-expired-2022-09-24.patch @@ -33,3 +33,16 @@ index 8b420a9..df91a02 100644 public void testInvalidLSCSignatureFailure() throws Exception { VOMSAA aa = Utils.getVOMSAA(); +diff --git a/src/test/java/org/italiangrid/voms/test/mt/TestConcurrentValidation.java b/src/test/java/org/italiangrid/voms/test/mt/TestConcurrentValidation.java +index 496455e..d9b26cc 100644 +--- a/src/test/java/org/italiangrid/voms/test/mt/TestConcurrentValidation.java ++++ b/src/test/java/org/italiangrid/voms/test/mt/TestConcurrentValidation.java +@@ -167,7 +167,7 @@ public class TestConcurrentValidation { + + } + +- @Test ++ // @Test + public void test() throws InterruptedException, BrokenBarrierException { + + long start = System.currentTimeMillis(); diff --git a/voms-api-java-expired-2022-10-08.patch b/voms-api-java-expired-2022-10-08.patch new file mode 100644 index 0000000..24839bb --- /dev/null +++ b/voms-api-java-expired-2022-10-08.patch @@ -0,0 +1,111 @@ +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 bc7557c..80120db 100644 +--- a/src/test/java/org/italiangrid/voms/test/ac/TestACGeneration.java ++++ b/src/test/java/org/italiangrid/voms/test/ac/TestACGeneration.java +@@ -301,7 +301,7 @@ public class TestACGeneration { + assertEquals(validatedAttrs.size(), 0); + } + +- @Test ++ // @Test + public void testSuccesfullACExtractionFromProxy() { + + ValidationResultChecker c = new ValidationResultChecker(true); +diff --git a/src/test/java/org/italiangrid/voms/test/ac/TestACValidator.java b/src/test/java/org/italiangrid/voms/test/ac/TestACValidator.java +index 8b420a9..b35aa8a 100644 +--- a/src/test/java/org/italiangrid/voms/test/ac/TestACValidator.java ++++ b/src/test/java/org/italiangrid/voms/test/ac/TestACValidator.java +@@ -62,7 +62,7 @@ public class TestACValidator implements Fixture { + + } + +- @Test ++ // @Test + public void testValidityCheckSuccess() throws Exception { + + ProxyCertificate proxy = Utils.getVOMSAA().createVOMSProxy(holder, defaultVOFqans); +@@ -96,7 +96,7 @@ public class TestACValidator implements Fixture { + Assert.assertEquals(VOMSValidationErrorCode.acNotValidAtCurrentTime, m.getErrorCode()); + } + +- @Test ++ // @Test + public void testHolderCheckFailure() throws Exception { + + ProxyCertificate proxy = +@@ -172,7 +172,7 @@ public class TestACValidator implements Fixture { + + } + +- @Test ++ // @Test + public void testEmptyACCertsExtensionSuccess() throws Exception { + + VOMSAA aa = Utils.getVOMSAA(); +@@ -256,7 +256,7 @@ public class TestACValidator implements Fixture { + r.getValidationErrors().get(1).getErrorCode()); + } + +- @Test ++ // @Test + public void testUnknownCriticalExtensionFailure() throws Exception { + + VOMSAA aa = Utils.getVOMSAA(); +@@ -281,7 +281,7 @@ public class TestACValidator implements Fixture { + r.getValidationErrors().get(0).getMessage()); + } + +- @Test ++ // @Test + public void testCriticalAKIDFailure() throws Exception { + + VOMSAA aa = Utils.getVOMSAA(); +@@ -304,7 +304,7 @@ public class TestACValidator implements Fixture { + r.getValidationErrors().get(0).getMessage()); + } + +- @Test ++ // @Test + public void testCriticalNoRevAvailFailure() throws Exception { + + VOMSAA aa = Utils.getVOMSAA(); +@@ -329,7 +329,7 @@ public class TestACValidator implements Fixture { + r.getValidationErrors().get(0).getMessage()); + } + +- @Test ++ // @Test + public void testTargetValidationSuccess() throws Exception { + + VOMSAA aa = Utils.getVOMSAA(); +@@ -355,7 +355,7 @@ public class TestACValidator implements Fixture { + Assert.assertTrue(r.isValid()); + } + +- @Test ++ // @Test + public void testTargetValidationFailure() throws Exception { + + VOMSAA aa = Utils.getVOMSAA(); +@@ -375,7 +375,7 @@ public class TestACValidator implements Fixture { + + } + +- @Test ++ // @Test + public void testResolveHostnameException() throws Exception { + + VOMSAA aa = Utils.getVOMSAA(); +diff --git a/src/test/java/org/italiangrid/voms/test/req/TestRequests.java b/src/test/java/org/italiangrid/voms/test/req/TestRequests.java +index d00ad46..214bde7 100644 +--- a/src/test/java/org/italiangrid/voms/test/req/TestRequests.java ++++ b/src/test/java/org/italiangrid/voms/test/req/TestRequests.java +@@ -41,7 +41,7 @@ import eu.emi.security.authn.x509.impl.PEMCredential; + + public class TestRequests implements Fixture { + +- @Test ++ // @Test + public void testEchoRequest() throws Exception { + + VOMSACService acService = Utils.buildACService(new EchoVOMSProtocol(Utils.getAACredential())); diff --git a/voms-api-java-no-mt-test.patch b/voms-api-java-no-mt-test.patch deleted file mode 100644 index 75df0ed..0000000 --- a/voms-api-java-no-mt-test.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/test/java/org/italiangrid/voms/test/mt/TestConcurrentValidation.java b/src/test/java/org/italiangrid/voms/test/mt/TestConcurrentValidation.java -index 496455e..d9b26cc 100644 ---- a/src/test/java/org/italiangrid/voms/test/mt/TestConcurrentValidation.java -+++ b/src/test/java/org/italiangrid/voms/test/mt/TestConcurrentValidation.java -@@ -167,7 +167,7 @@ public class TestConcurrentValidation { - - } - -- @Test -+ // @Test - public void test() throws InterruptedException, BrokenBarrierException { - - long start = System.currentTimeMillis(); diff --git a/voms-api-java.spec b/voms-api-java.spec index 1b653d0..fa42e09 100644 --- a/voms-api-java.spec +++ b/voms-api-java.spec @@ -1,20 +1,26 @@ +%if %{?rhel}%{!?rhel:0} == 7 +%global java_arches ppc64le x86_64 +%endif + Name: voms-api-java Version: 3.3.2 -Release: 9%{?dist} +Release: 10%{?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 failing tests -# IllegalState object explicit - implicit expected. -# https://github.com/italiangrid/voms-api-java/issues/29 +# Disable failing tests +# IllegalState object explicit - implicit expected. +# https://github.com/italiangrid/voms-api-java/issues/29 Patch0: %{name}-disable-some-tests.patch -# Disable failing multi-thread test -Patch1: %{name}-no-mt-test.patch -# Disable tests using obsolete hashes (md5/sha1) -Patch2: %{name}-crypto-policy.patch +# Disable tests that fail due to expired certificates +# https://github.com/italiangrid/voms-api-java/issues/30 +# 2022-09-24 (test0.cert.pem, wilco_cnaf_infn_it.cert.pem) +Patch1: %{name}-expired-2022-09-24.patch +# 2022-10-08 (test_host_cnaf_infn_it.cert.pem) +Patch2: %{name}-expired-2022-10-08.patch BuildArch: noarch ExclusiveArch: %{java_arches} noarch @@ -85,6 +91,9 @@ Virtual Organization Membership Service (VOMS) Java API Documentation. %license LICENSE %changelog +* Mon Oct 17 2022 Mattias Ellert - 3.3.2-10 +- Disable tests that fail due to expired certificates + * Wed Sep 28 2022 Mattias Ellert - 3.3.2-9 - Disable failing multi-thread test - Disable tests using obsolete hashes (md5/sha1) From fc44e8d91240b06bd06047796d4a980649b52a80 Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Tue, 13 Dec 2022 07:39:11 +0100 Subject: [PATCH 31/51] Disable tests that fail due to more expired certificates --- voms-api-java-expired-2022-12-12.patch | 13 +++++++++++++ voms-api-java.spec | 8 +++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 voms-api-java-expired-2022-12-12.patch diff --git a/voms-api-java-expired-2022-12-12.patch b/voms-api-java-expired-2022-12-12.patch new file mode 100644 index 0000000..7e13740 --- /dev/null +++ b/voms-api-java-expired-2022-12-12.patch @@ -0,0 +1,13 @@ +diff --git a/src/test/java/org/italiangrid/voms/test/ac/TestACValidator.java b/src/test/java/org/italiangrid/voms/test/ac/TestACValidator.java +index 8b420a9..ef0b14a 100644 +--- a/src/test/java/org/italiangrid/voms/test/ac/TestACValidator.java ++++ b/src/test/java/org/italiangrid/voms/test/ac/TestACValidator.java +@@ -111,7 +111,7 @@ public class TestACValidator implements Fixture { + Assert.assertEquals(VOMSValidationErrorCode.acHolderDoesntMatchCertChain, m.getErrorCode()); + } + +- @Test ++ // @Test + public void testSignatureCheckFailure() throws Exception { + + ProxyCertificate proxy = Utils.getVOMSAA().createVOMSProxy(holder, defaultVOFqans); diff --git a/voms-api-java.spec b/voms-api-java.spec index fa42e09..f2839d6 100644 --- a/voms-api-java.spec +++ b/voms-api-java.spec @@ -4,7 +4,7 @@ Name: voms-api-java Version: 3.3.2 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Virtual Organization Membership Service Java API License: ASL 2.0 @@ -21,6 +21,8 @@ Patch0: %{name}-disable-some-tests.patch Patch1: %{name}-expired-2022-09-24.patch # 2022-10-08 (test_host_cnaf_infn_it.cert.pem) Patch2: %{name}-expired-2022-10-08.patch +# 2022-12-12 (test_host_2_cnaf_infn_it.cert.pem) +Patch3: %{name}-expired-2022-12-12.patch BuildArch: noarch ExclusiveArch: %{java_arches} noarch @@ -53,6 +55,7 @@ Virtual Organization Membership Service (VOMS) Java API Documentation. %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 # Remove unused dependency %pom_remove_dep net.jcip:jcip-annotations @@ -91,6 +94,9 @@ Virtual Organization Membership Service (VOMS) Java API Documentation. %license LICENSE %changelog +* Tue Dec 13 2022 Mattias Ellert - 3.3.2-11 +- Disable tests that fail due to more expired certificates + * Mon Oct 17 2022 Mattias Ellert - 3.3.2-10 - Disable tests that fail due to expired certificates From 832d3d37c8b27e8b6bc9e86982f90a865c54d7e1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 06:29:06 +0000 Subject: [PATCH 32/51] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- voms-api-java.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/voms-api-java.spec b/voms-api-java.spec index f2839d6..3ebed42 100644 --- a/voms-api-java.spec +++ b/voms-api-java.spec @@ -4,7 +4,7 @@ Name: voms-api-java Version: 3.3.2 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Virtual Organization Membership Service Java API License: ASL 2.0 @@ -94,6 +94,9 @@ Virtual Organization Membership Service (VOMS) Java API Documentation. %license LICENSE %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 3.3.2-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Tue Dec 13 2022 Mattias Ellert - 3.3.2-11 - Disable tests that fail due to more expired certificates From fa89eafea6ccaf4764c2e736eba4ca4882a5f0e7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 17:51:10 +0000 Subject: [PATCH 33/51] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- voms-api-java.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/voms-api-java.spec b/voms-api-java.spec index 3ebed42..7f68c1b 100644 --- a/voms-api-java.spec +++ b/voms-api-java.spec @@ -4,7 +4,7 @@ Name: voms-api-java Version: 3.3.2 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Virtual Organization Membership Service Java API License: ASL 2.0 @@ -94,6 +94,9 @@ Virtual Organization Membership Service (VOMS) Java API Documentation. %license LICENSE %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 3.3.2-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jan 21 2023 Fedora Release Engineering - 3.3.2-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 73096e7c375b8947acc26ce2e2cbdf15264168db Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Sat, 16 Dec 2023 20:45:31 +0100 Subject: [PATCH 34/51] Adjust to removed deprecaded API in Mockito --- voms-api-java-mockito4.patch | 12 ++++++++++++ voms-api-java.spec | 18 ++++++++++++------ 2 files changed, 24 insertions(+), 6 deletions(-) create mode 100644 voms-api-java-mockito4.patch diff --git a/voms-api-java-mockito4.patch b/voms-api-java-mockito4.patch new file mode 100644 index 0000000..31d3d69 --- /dev/null +++ b/voms-api-java-mockito4.patch @@ -0,0 +1,12 @@ +diff -ur voms-api-java-3.3.2.orig/src/test/java/org/italiangrid/voms/test/req/TestRequests.java voms-api-java-3.3.2/src/test/java/org/italiangrid/voms/test/req/TestRequests.java +--- voms-api-java-3.3.2.orig/src/test/java/org/italiangrid/voms/test/req/TestRequests.java 2023-12-16 19:39:51.637063458 +0100 ++++ voms-api-java-3.3.2/src/test/java/org/italiangrid/voms/test/req/TestRequests.java 2023-12-16 19:41:42.463357365 +0100 +@@ -179,7 +179,7 @@ + AttributeCertificate ac = + acService.getVOMSAttributeCertificate(Utils.getTestUserCredential(), req); + +- Mockito.verifyZeroInteractions(fallBackProtocol); ++ Mockito.verifyNoInteractions(fallBackProtocol); + + Assert.assertNull(ac); + } diff --git a/voms-api-java.spec b/voms-api-java.spec index 7f68c1b..ba67f86 100644 --- a/voms-api-java.spec +++ b/voms-api-java.spec @@ -4,10 +4,10 @@ Name: voms-api-java Version: 3.3.2 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Virtual Organization Membership Service Java API -License: ASL 2.0 +License: Apache-2.0 URL: https://wiki.italiangrid.it/VOMS Source0: https://github.com/italiangrid/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz @@ -23,6 +23,8 @@ Patch1: %{name}-expired-2022-09-24.patch Patch2: %{name}-expired-2022-10-08.patch # 2022-12-12 (test_host_2_cnaf_infn_it.cert.pem) Patch3: %{name}-expired-2022-12-12.patch +# Adjust to removed deprecaded API in Mockito +Patch4: %{name}-mockito4.patch BuildArch: noarch ExclusiveArch: %{java_arches} noarch @@ -52,10 +54,11 @@ Virtual Organization Membership Service (VOMS) Java API Documentation. %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 +%patch -P 0 -p1 +%patch -P 1 -p1 +%patch -P 2 -p1 +%patch -P 3 -p1 +%patch -P 4 -p1 # Remove unused dependency %pom_remove_dep net.jcip:jcip-annotations @@ -94,6 +97,9 @@ Virtual Organization Membership Service (VOMS) Java API Documentation. %license LICENSE %changelog +* Sat Dec 16 2023 Mattias Ellert - 3.3.2-14 +- Adjust to removed deprecaded API in Mockito + * Sat Jul 22 2023 Fedora Release Engineering - 3.3.2-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 3fd8597a56ccb3802ec97f848b0e58f1e27b2d05 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 08:10:56 +0000 Subject: [PATCH 35/51] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- voms-api-java.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/voms-api-java.spec b/voms-api-java.spec index ba67f86..bba0c06 100644 --- a/voms-api-java.spec +++ b/voms-api-java.spec @@ -4,7 +4,7 @@ Name: voms-api-java Version: 3.3.2 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Virtual Organization Membership Service Java API License: Apache-2.0 @@ -97,6 +97,9 @@ Virtual Organization Membership Service (VOMS) Java API Documentation. %license LICENSE %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 3.3.2-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Dec 16 2023 Mattias Ellert - 3.3.2-14 - Adjust to removed deprecaded API in Mockito From afce15368bf16ac7ada4e091105a16414c8218ef Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 27 Feb 2024 18:27:56 +0100 Subject: [PATCH 36/51] Rebuilt for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 --- voms-api-java.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/voms-api-java.spec b/voms-api-java.spec index bba0c06..3139515 100644 --- a/voms-api-java.spec +++ b/voms-api-java.spec @@ -4,7 +4,7 @@ Name: voms-api-java Version: 3.3.2 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Virtual Organization Membership Service Java API License: Apache-2.0 @@ -97,6 +97,9 @@ Virtual Organization Membership Service (VOMS) Java API Documentation. %license LICENSE %changelog +* Tue Feb 27 2024 Jiri Vanek - 3.3.2-16 +- Rebuilt for java-21-openjdk as system jdk + * Sat Jan 27 2024 Fedora Release Engineering - 3.3.2-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From e9ff4f0095d60e878d13bd1e414f601f02a11c33 Mon Sep 17 00:00:00 2001 From: Jiri Date: Sat, 2 Mar 2024 21:39:25 +0100 Subject: [PATCH 37/51] Rebuilt for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 --- voms-api-java.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/voms-api-java.spec b/voms-api-java.spec index bba0c06..10c716a 100644 --- a/voms-api-java.spec +++ b/voms-api-java.spec @@ -4,7 +4,7 @@ Name: voms-api-java Version: 3.3.2 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Virtual Organization Membership Service Java API License: Apache-2.0 @@ -97,6 +97,9 @@ Virtual Organization Membership Service (VOMS) Java API Documentation. %license LICENSE %changelog +* Sat Mar 02 2024 Jiri Vanek - 3.3.2-16 +- Rebuilt for java-21-openjdk as system jdk + * Sat Jan 27 2024 Fedora Release Engineering - 3.3.2-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 1d31450288b224d732b1ce8a0cc1192106d1ea27 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 08:59:50 +0000 Subject: [PATCH 38/51] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- voms-api-java.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/voms-api-java.spec b/voms-api-java.spec index f3ef3b0..bc8fcf5 100644 --- a/voms-api-java.spec +++ b/voms-api-java.spec @@ -1,6 +1,6 @@ Name: voms-api-java Version: 3.3.2 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Virtual Organization Membership Service Java API License: Apache-2.0 @@ -94,6 +94,9 @@ Virtual Organization Membership Service (VOMS) Java API Documentation. %license LICENSE %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 3.3.2-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Thu Mar 14 2024 Mattias Ellert - 3.3.2-17 - Update bouncycastle dependencies From d1636a091901f8f3fd583a483e2832c0789bd9ba Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Sat, 3 Aug 2024 23:08:44 +0200 Subject: [PATCH 39/51] Update to version 3.3.3 --- sources | 2 +- voms-api-java.spec | 21 +++++++++++++++++++-- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/sources b/sources index e9e119c..5596619 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (voms-api-java-3.3.2.tar.gz) = 7de09abd3e1605a7596c29bb0f16553945d6c13098c667451580ed4e22a671814db254355b56ec12696fce011854487510fb9e627e4f13474fbfedec6db1c422 +SHA512 (voms-api-java-3.3.3.tar.gz) = c66d412a4516634581685a3f7b4de42f922366ce30e994c36f7877a67c1545063030b58550e9d5ea691811cffa05c41396001b7be7ad2f034d20539f280b35d1 diff --git a/voms-api-java.spec b/voms-api-java.spec index bc8fcf5..af85b89 100644 --- a/voms-api-java.spec +++ b/voms-api-java.spec @@ -1,6 +1,6 @@ Name: voms-api-java -Version: 3.3.2 -Release: 18%{?dist} +Version: 3.3.3 +Release: 1%{?dist} Summary: Virtual Organization Membership Service Java API License: Apache-2.0 @@ -26,6 +26,11 @@ BuildArch: noarch ExclusiveArch: %{java_arches} noarch BuildRequires: maven-local +%if %{?rhel}%{!?rhel:0} == 8 +BuildRequires: mvn(com.google.guava:guava:20.0) +%else +BuildRequires: mvn(com.google.guava:guava) +%endif BuildRequires: mvn(eu.eu-emi.security:canl) >= 2.6 BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.hamcrest:hamcrest-library) @@ -54,7 +59,9 @@ Virtual Organization Membership Service (VOMS) Java API Documentation. %patch -P 1 -p1 %patch -P 2 -p1 %patch -P 3 -p1 +%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 9 %patch -P 4 -p1 +%endif # Remove unused dependency %pom_remove_dep net.jcip:jcip-annotations @@ -76,9 +83,16 @@ Virtual Organization Membership Service (VOMS) Java API Documentation. # Remove license plugin %pom_remove_plugin com.mycila.maven-license-plugin:maven-license-plugin +%if %{?fedora}%{!?fedora:0} >= 40 # Update bouncycastle dependencies %pom_change_dep org.bouncycastle:bcprov-jdk15on org.bouncycastle:bcprov-jdk18on %pom_change_dep org.bouncycastle:bcpkix-jdk15on org.bouncycastle:bcpkix-jdk18on +%endif + +%if %{?rhel}%{!?rhel:0} == 8 +# Adapt guava dependency for EPEL 8 +%pom_change_dep com.google.guava:guava:* com.google.guava:guava:20.0 +%endif %build %mvn_build @@ -94,6 +108,9 @@ Virtual Organization Membership Service (VOMS) Java API Documentation. %license LICENSE %changelog +* Sat Aug 03 2024 Mattias Ellert - 3.3.3-1 +- Update to version 3.3.3 + * Sat Jul 20 2024 Fedora Release Engineering - 3.3.2-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 3d0e3dc73eb8bd44f10a0e5b20507247d6214f1a Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Thu, 28 Nov 2024 14:21:03 +0100 Subject: [PATCH 40/51] Update bouncycastle dependencies for EPEL 10 --- voms-api-java.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/voms-api-java.spec b/voms-api-java.spec index af85b89..7743937 100644 --- a/voms-api-java.spec +++ b/voms-api-java.spec @@ -1,6 +1,6 @@ Name: voms-api-java Version: 3.3.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Virtual Organization Membership Service Java API License: Apache-2.0 @@ -83,7 +83,7 @@ Virtual Organization Membership Service (VOMS) Java API Documentation. # Remove license plugin %pom_remove_plugin com.mycila.maven-license-plugin:maven-license-plugin -%if %{?fedora}%{!?fedora:0} >= 40 +%if %{?fedora}%{!?fedora:0} >= 40 || %{?rhel}%{!?rhel:0} >= 10 # Update bouncycastle dependencies %pom_change_dep org.bouncycastle:bcprov-jdk15on org.bouncycastle:bcprov-jdk18on %pom_change_dep org.bouncycastle:bcpkix-jdk15on org.bouncycastle:bcpkix-jdk18on @@ -108,6 +108,9 @@ Virtual Organization Membership Service (VOMS) Java API Documentation. %license LICENSE %changelog +* Thu Nov 28 2024 Mattias Ellert - 3.3.3-2 +- Update bouncycastle dependencies for EPEL 10 + * Sat Aug 03 2024 Mattias Ellert - 3.3.3-1 - Update to version 3.3.3 From de2ac5cbb877d2c511c66f00153f28bba043a025 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 14:36:04 +0000 Subject: [PATCH 41/51] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- voms-api-java.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/voms-api-java.spec b/voms-api-java.spec index 7743937..8b8d6d9 100644 --- a/voms-api-java.spec +++ b/voms-api-java.spec @@ -1,6 +1,6 @@ Name: voms-api-java Version: 3.3.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Virtual Organization Membership Service Java API License: Apache-2.0 @@ -108,6 +108,9 @@ Virtual Organization Membership Service (VOMS) Java API Documentation. %license LICENSE %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 3.3.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Nov 28 2024 Mattias Ellert - 3.3.3-2 - Update bouncycastle dependencies for EPEL 10 From 180d7d53057b3858bc123105ddcd9352bd22b281 Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Sat, 19 Apr 2025 14:57:31 +0200 Subject: [PATCH 42/51] Update to version 3.3.5 Do not run tests some scripts needed for generating the test certificates are missing --- sources | 2 +- voms-api-java-disable-some-tests.patch | 62 -------------- voms-api-java-expired-2022-09-24.patch | 48 ----------- voms-api-java-expired-2022-10-08.patch | 111 ------------------------- voms-api-java-expired-2022-12-12.patch | 13 --- voms-api-java-mockito4.patch | 12 --- voms-api-java.spec | 71 +++++----------- 7 files changed, 20 insertions(+), 299 deletions(-) delete mode 100644 voms-api-java-disable-some-tests.patch delete mode 100644 voms-api-java-expired-2022-09-24.patch delete mode 100644 voms-api-java-expired-2022-10-08.patch delete mode 100644 voms-api-java-expired-2022-12-12.patch delete mode 100644 voms-api-java-mockito4.patch diff --git a/sources b/sources index 5596619..00a0753 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (voms-api-java-3.3.3.tar.gz) = c66d412a4516634581685a3f7b4de42f922366ce30e994c36f7877a67c1545063030b58550e9d5ea691811cffa05c41396001b7be7ad2f034d20539f280b35d1 +SHA512 (voms-api-java-3.3.5.tar.gz) = 722d509565cf5a071932d22f1fa2c2a9bdd6734df546a227175fa87a7eeab212d47243b7c46a079b0980dbd3e873486b0f8e74c076d1809c5c9f2c3b45fc184e diff --git a/voms-api-java-disable-some-tests.patch b/voms-api-java-disable-some-tests.patch deleted file mode 100644 index 5f2cc99..0000000 --- a/voms-api-java-disable-some-tests.patch +++ /dev/null @@ -1,62 +0,0 @@ -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 bc7557c..32ba7a5 100644 ---- a/src/test/java/org/italiangrid/voms/test/ac/TestACGeneration.java -+++ b/src/test/java/org/italiangrid/voms/test/ac/TestACGeneration.java -@@ -191,7 +191,7 @@ public class TestACGeneration { - return ga; - } - -- @Test -+ // @Test - public void testGeneratedACParsing() throws KeyStoreException, - CertificateException, FileNotFoundException, IOException, - OperatorCreationException { -@@ -230,7 +230,7 @@ public class TestACGeneration { - - } - -- @Test -+ // @Test - public void testACValidation() { - - ValidationResultChecker c = new ValidationResultChecker(true); -@@ -247,7 +247,7 @@ public class TestACGeneration { - - } - -- @Test -+ // @Test - public void testLSCValidationFailure() { - - ValidationResultChecker c = new ValidationResultChecker(false, -@@ -264,7 +264,7 @@ public class TestACGeneration { - assertEquals(validatedAttrs.size(), 0); - } - -- @Test -+ // @Test - public void testExpiredAACertValidationFailure() - throws OperatorCreationException { - -@@ -284,7 +284,7 @@ public class TestACGeneration { - assertEquals(validatedAttrs.size(), 0); - } - -- @Test -+ // @Test - public void testRevokedAACertValidationFailure() { - - ValidationResultChecker c = new ValidationResultChecker(false, -diff --git a/src/test/java/org/italiangrid/voms/test/ac/TestFakeVOMSACService.java b/src/test/java/org/italiangrid/voms/test/ac/TestFakeVOMSACService.java -index 6eca55f..49f0498 100644 ---- a/src/test/java/org/italiangrid/voms/test/ac/TestFakeVOMSACService.java -+++ b/src/test/java/org/italiangrid/voms/test/ac/TestFakeVOMSACService.java -@@ -54,7 +54,7 @@ public class TestFakeVOMSACService extends TestACSupport { - initializeCredentials(); - } - -- @Test -+ // @Test - public void testFakeAcServiceCreation() { - - ACGenerationParams params = ACGenerationParams.builder() diff --git a/voms-api-java-expired-2022-09-24.patch b/voms-api-java-expired-2022-09-24.patch deleted file mode 100644 index 7169433..0000000 --- a/voms-api-java-expired-2022-09-24.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff --git a/src/test/java/org/italiangrid/voms/test/TestOpensslHashFunction.java b/src/test/java/org/italiangrid/voms/test/TestOpensslHashFunction.java -index 6f57833..aa800ac 100644 ---- a/src/test/java/org/italiangrid/voms/test/TestOpensslHashFunction.java -+++ b/src/test/java/org/italiangrid/voms/test/TestOpensslHashFunction.java -@@ -47,7 +47,7 @@ public class TestOpensslHashFunction { - cred = new PEMCredential(userKey, userCert, keyPassword.toCharArray()); - } - -- @Test -+ // @Test - public void testDefaultHashIsMD5() { - - CertificateValidatorBuilder builder = new CertificateValidatorBuilder(); -@@ -60,7 +60,7 @@ public class TestOpensslHashFunction { - - } - -- @Test -+ // @Test - public void testSHA1Hash() { - - CertificateValidatorBuilder builder = new CertificateValidatorBuilder(); -diff --git a/src/test/java/org/italiangrid/voms/test/ac/TestACValidator.java b/src/test/java/org/italiangrid/voms/test/ac/TestACValidator.java -index 8b420a9..df91a02 100644 ---- a/src/test/java/org/italiangrid/voms/test/ac/TestACValidator.java -+++ b/src/test/java/org/italiangrid/voms/test/ac/TestACValidator.java -@@ -227,7 +227,7 @@ public class TestACValidator implements Fixture { - - } - -- @Test -+ // @Test - public void testInvalidLSCSignatureFailure() throws Exception { - - VOMSAA aa = Utils.getVOMSAA(); -diff --git a/src/test/java/org/italiangrid/voms/test/mt/TestConcurrentValidation.java b/src/test/java/org/italiangrid/voms/test/mt/TestConcurrentValidation.java -index 496455e..d9b26cc 100644 ---- a/src/test/java/org/italiangrid/voms/test/mt/TestConcurrentValidation.java -+++ b/src/test/java/org/italiangrid/voms/test/mt/TestConcurrentValidation.java -@@ -167,7 +167,7 @@ public class TestConcurrentValidation { - - } - -- @Test -+ // @Test - public void test() throws InterruptedException, BrokenBarrierException { - - long start = System.currentTimeMillis(); diff --git a/voms-api-java-expired-2022-10-08.patch b/voms-api-java-expired-2022-10-08.patch deleted file mode 100644 index 24839bb..0000000 --- a/voms-api-java-expired-2022-10-08.patch +++ /dev/null @@ -1,111 +0,0 @@ -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 bc7557c..80120db 100644 ---- a/src/test/java/org/italiangrid/voms/test/ac/TestACGeneration.java -+++ b/src/test/java/org/italiangrid/voms/test/ac/TestACGeneration.java -@@ -301,7 +301,7 @@ public class TestACGeneration { - assertEquals(validatedAttrs.size(), 0); - } - -- @Test -+ // @Test - public void testSuccesfullACExtractionFromProxy() { - - ValidationResultChecker c = new ValidationResultChecker(true); -diff --git a/src/test/java/org/italiangrid/voms/test/ac/TestACValidator.java b/src/test/java/org/italiangrid/voms/test/ac/TestACValidator.java -index 8b420a9..b35aa8a 100644 ---- a/src/test/java/org/italiangrid/voms/test/ac/TestACValidator.java -+++ b/src/test/java/org/italiangrid/voms/test/ac/TestACValidator.java -@@ -62,7 +62,7 @@ public class TestACValidator implements Fixture { - - } - -- @Test -+ // @Test - public void testValidityCheckSuccess() throws Exception { - - ProxyCertificate proxy = Utils.getVOMSAA().createVOMSProxy(holder, defaultVOFqans); -@@ -96,7 +96,7 @@ public class TestACValidator implements Fixture { - Assert.assertEquals(VOMSValidationErrorCode.acNotValidAtCurrentTime, m.getErrorCode()); - } - -- @Test -+ // @Test - public void testHolderCheckFailure() throws Exception { - - ProxyCertificate proxy = -@@ -172,7 +172,7 @@ public class TestACValidator implements Fixture { - - } - -- @Test -+ // @Test - public void testEmptyACCertsExtensionSuccess() throws Exception { - - VOMSAA aa = Utils.getVOMSAA(); -@@ -256,7 +256,7 @@ public class TestACValidator implements Fixture { - r.getValidationErrors().get(1).getErrorCode()); - } - -- @Test -+ // @Test - public void testUnknownCriticalExtensionFailure() throws Exception { - - VOMSAA aa = Utils.getVOMSAA(); -@@ -281,7 +281,7 @@ public class TestACValidator implements Fixture { - r.getValidationErrors().get(0).getMessage()); - } - -- @Test -+ // @Test - public void testCriticalAKIDFailure() throws Exception { - - VOMSAA aa = Utils.getVOMSAA(); -@@ -304,7 +304,7 @@ public class TestACValidator implements Fixture { - r.getValidationErrors().get(0).getMessage()); - } - -- @Test -+ // @Test - public void testCriticalNoRevAvailFailure() throws Exception { - - VOMSAA aa = Utils.getVOMSAA(); -@@ -329,7 +329,7 @@ public class TestACValidator implements Fixture { - r.getValidationErrors().get(0).getMessage()); - } - -- @Test -+ // @Test - public void testTargetValidationSuccess() throws Exception { - - VOMSAA aa = Utils.getVOMSAA(); -@@ -355,7 +355,7 @@ public class TestACValidator implements Fixture { - Assert.assertTrue(r.isValid()); - } - -- @Test -+ // @Test - public void testTargetValidationFailure() throws Exception { - - VOMSAA aa = Utils.getVOMSAA(); -@@ -375,7 +375,7 @@ public class TestACValidator implements Fixture { - - } - -- @Test -+ // @Test - public void testResolveHostnameException() throws Exception { - - VOMSAA aa = Utils.getVOMSAA(); -diff --git a/src/test/java/org/italiangrid/voms/test/req/TestRequests.java b/src/test/java/org/italiangrid/voms/test/req/TestRequests.java -index d00ad46..214bde7 100644 ---- a/src/test/java/org/italiangrid/voms/test/req/TestRequests.java -+++ b/src/test/java/org/italiangrid/voms/test/req/TestRequests.java -@@ -41,7 +41,7 @@ import eu.emi.security.authn.x509.impl.PEMCredential; - - public class TestRequests implements Fixture { - -- @Test -+ // @Test - public void testEchoRequest() throws Exception { - - VOMSACService acService = Utils.buildACService(new EchoVOMSProtocol(Utils.getAACredential())); diff --git a/voms-api-java-expired-2022-12-12.patch b/voms-api-java-expired-2022-12-12.patch deleted file mode 100644 index 7e13740..0000000 --- a/voms-api-java-expired-2022-12-12.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/test/java/org/italiangrid/voms/test/ac/TestACValidator.java b/src/test/java/org/italiangrid/voms/test/ac/TestACValidator.java -index 8b420a9..ef0b14a 100644 ---- a/src/test/java/org/italiangrid/voms/test/ac/TestACValidator.java -+++ b/src/test/java/org/italiangrid/voms/test/ac/TestACValidator.java -@@ -111,7 +111,7 @@ public class TestACValidator implements Fixture { - Assert.assertEquals(VOMSValidationErrorCode.acHolderDoesntMatchCertChain, m.getErrorCode()); - } - -- @Test -+ // @Test - public void testSignatureCheckFailure() throws Exception { - - ProxyCertificate proxy = Utils.getVOMSAA().createVOMSProxy(holder, defaultVOFqans); diff --git a/voms-api-java-mockito4.patch b/voms-api-java-mockito4.patch deleted file mode 100644 index 31d3d69..0000000 --- a/voms-api-java-mockito4.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur voms-api-java-3.3.2.orig/src/test/java/org/italiangrid/voms/test/req/TestRequests.java voms-api-java-3.3.2/src/test/java/org/italiangrid/voms/test/req/TestRequests.java ---- voms-api-java-3.3.2.orig/src/test/java/org/italiangrid/voms/test/req/TestRequests.java 2023-12-16 19:39:51.637063458 +0100 -+++ voms-api-java-3.3.2/src/test/java/org/italiangrid/voms/test/req/TestRequests.java 2023-12-16 19:41:42.463357365 +0100 -@@ -179,7 +179,7 @@ - AttributeCertificate ac = - acService.getVOMSAttributeCertificate(Utils.getTestUserCredential(), req); - -- Mockito.verifyZeroInteractions(fallBackProtocol); -+ Mockito.verifyNoInteractions(fallBackProtocol); - - Assert.assertNull(ac); - } diff --git a/voms-api-java.spec b/voms-api-java.spec index 8b8d6d9..01ec011 100644 --- a/voms-api-java.spec +++ b/voms-api-java.spec @@ -1,41 +1,18 @@ Name: voms-api-java -Version: 3.3.3 -Release: 3%{?dist} +Version: 3.3.5 +Release: 1%{?dist} Summary: Virtual Organization Membership Service Java API License: Apache-2.0 URL: https://wiki.italiangrid.it/VOMS Source0: https://github.com/italiangrid/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz -# Disable failing tests -# IllegalState object explicit - implicit expected. -# https://github.com/italiangrid/voms-api-java/issues/29 -Patch0: %{name}-disable-some-tests.patch -# Disable tests that fail due to expired certificates -# https://github.com/italiangrid/voms-api-java/issues/30 -# 2022-09-24 (test0.cert.pem, wilco_cnaf_infn_it.cert.pem) -Patch1: %{name}-expired-2022-09-24.patch -# 2022-10-08 (test_host_cnaf_infn_it.cert.pem) -Patch2: %{name}-expired-2022-10-08.patch -# 2022-12-12 (test_host_2_cnaf_infn_it.cert.pem) -Patch3: %{name}-expired-2022-12-12.patch -# Adjust to removed deprecaded API in Mockito -Patch4: %{name}-mockito4.patch - BuildArch: noarch ExclusiveArch: %{java_arches} noarch BuildRequires: maven-local -%if %{?rhel}%{!?rhel:0} == 8 -BuildRequires: mvn(com.google.guava:guava:20.0) -%else -BuildRequires: mvn(com.google.guava:guava) -%endif -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.6 +BuildRequires: mvn(eu.eu-emi.security:canl) >= 2.8.3 +Requires: mvn(eu.eu-emi.security:canl) >= 2.8.3 %description The Virtual Organization Membership Service (VOMS) is an attribute authority @@ -55,21 +32,10 @@ Virtual Organization Membership Service (VOMS) Java API Documentation. %prep %setup -q -%patch -P 0 -p1 -%patch -P 1 -p1 -%patch -P 2 -p1 -%patch -P 3 -p1 -%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 9 -%patch -P 4 -p1 -%endif # Remove unused dependency %pom_remove_dep net.jcip:jcip-annotations -# 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" - # F33+ and EPEL8+ 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 @@ -77,25 +43,21 @@ Virtual Organization Membership Service (VOMS) Java API Documentation. # Do not create source jars %pom_remove_plugin org.apache.maven.plugins:maven-source-plugin -# Cobertura no longer in Fedora due to licensing issues -%pom_remove_plugin org.codehaus.mojo:cobertura-maven-plugin +# Do not enforce requirements +%pom_remove_plugin org.apache.maven.plugins:maven-enforcer-plugin -# Remove license plugin -%pom_remove_plugin com.mycila.maven-license-plugin:maven-license-plugin +%if %{?rhel}%{!?rhel:0} == 9 +# Default openjdk in RHEL 9 is 11 +%pom_xpath_replace "//pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration/pom:release/text()" 11 +%pom_xpath_replace "//pom:properties/pom:maven.compiler.release/text()" 11 -%if %{?fedora}%{!?fedora:0} >= 40 || %{?rhel}%{!?rhel:0} >= 10 -# Update bouncycastle dependencies -%pom_change_dep org.bouncycastle:bcprov-jdk15on org.bouncycastle:bcprov-jdk18on -%pom_change_dep org.bouncycastle:bcpkix-jdk15on org.bouncycastle:bcpkix-jdk18on -%endif - -%if %{?rhel}%{!?rhel:0} == 8 -# Adapt guava dependency for EPEL 8 -%pom_change_dep com.google.guava:guava:* com.google.guava:guava:20.0 +# Modify bouncycastle dependencies for RHEL 9 +%pom_change_dep org.bouncycastle:bcprov-jdk18on org.bouncycastle:bcprov-jdk15on +%pom_change_dep org.bouncycastle:bcpkix-jdk18on org.bouncycastle:bcpkix-jdk15on %endif %build -%mvn_build +%mvn_build -f %install %mvn_install @@ -108,6 +70,11 @@ Virtual Organization Membership Service (VOMS) Java API Documentation. %license LICENSE %changelog +* Thu Apr 17 2025 Mattias Ellert - 3.3.5-1 +- Update to version 3.3.5 +- Do not run tests + - some scripts needed for generating the test certificates are missing + * Sun Jan 19 2025 Fedora Release Engineering - 3.3.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From e4da0a1d308bd7c024f1e5645b828882b7d2ec9b Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Tue, 22 Apr 2025 22:39:09 +0200 Subject: [PATCH 43/51] Update URL tag --- voms-api-java.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/voms-api-java.spec b/voms-api-java.spec index 01ec011..188b588 100644 --- a/voms-api-java.spec +++ b/voms-api-java.spec @@ -1,11 +1,11 @@ Name: voms-api-java Version: 3.3.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Virtual Organization Membership Service Java API License: Apache-2.0 -URL: https://wiki.italiangrid.it/VOMS -Source0: https://github.com/italiangrid/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz +URL: https://github.com/italiangrid/%{name} +Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz BuildArch: noarch ExclusiveArch: %{java_arches} noarch @@ -70,6 +70,9 @@ Virtual Organization Membership Service (VOMS) Java API Documentation. %license LICENSE %changelog +* Tue Apr 22 2025 Mattias Ellert - 3.3.5-2 +- Update URL tag + * Thu Apr 17 2025 Mattias Ellert - 3.3.5-1 - Update to version 3.3.5 - Do not run tests From e7a46d59b054c1aab3ab25708fa4d8c5200274f0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:13:04 +0000 Subject: [PATCH 44/51] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- voms-api-java.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/voms-api-java.spec b/voms-api-java.spec index 188b588..07e59f5 100644 --- a/voms-api-java.spec +++ b/voms-api-java.spec @@ -1,6 +1,6 @@ Name: voms-api-java Version: 3.3.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Virtual Organization Membership Service Java API License: Apache-2.0 @@ -70,6 +70,9 @@ Virtual Organization Membership Service (VOMS) Java API Documentation. %license LICENSE %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 3.3.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Tue Apr 22 2025 Mattias Ellert - 3.3.5-2 - Update URL tag From de796844706239931ac4941d19317998ae8b4849 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Wed, 30 Jul 2025 01:27:30 +0200 Subject: [PATCH 45/51] Rebuilt for java-25-openjdk as preffered jdk https://fedoraproject.org/wiki/Changes/Java25AndNoMoreSystemJdk Note, that since f43, you should be always explicit on what jdk to use. This commit should do exactly that. --- voms-api-java.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/voms-api-java.spec b/voms-api-java.spec index 07e59f5..132b3a1 100644 --- a/voms-api-java.spec +++ b/voms-api-java.spec @@ -1,6 +1,6 @@ Name: voms-api-java Version: 3.3.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Virtual Organization Membership Service Java API License: Apache-2.0 @@ -10,7 +10,7 @@ Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz BuildArch: noarch ExclusiveArch: %{java_arches} noarch -BuildRequires: maven-local +BuildRequires: maven-local-openjdk25 BuildRequires: mvn(eu.eu-emi.security:canl) >= 2.8.3 Requires: mvn(eu.eu-emi.security:canl) >= 2.8.3 @@ -70,6 +70,9 @@ Virtual Organization Membership Service (VOMS) Java API Documentation. %license LICENSE %changelog +* Tue Jul 29 2025 jiri vanek - 3.3.5-4 +- Rebuilt for java-25-openjdk as preffered jdk + * Fri Jul 25 2025 Fedora Release Engineering - 3.3.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 4557e74042f6fbc17d32e1f4bd5e7d98daaaf37b Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Tue, 5 Aug 2025 13:40:48 +0200 Subject: [PATCH 46/51] Update to version 3.3.6 --- sources | 2 +- voms-api-java.spec | 15 +++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/sources b/sources index 00a0753..d8b8e2a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (voms-api-java-3.3.5.tar.gz) = 722d509565cf5a071932d22f1fa2c2a9bdd6734df546a227175fa87a7eeab212d47243b7c46a079b0980dbd3e873486b0f8e74c076d1809c5c9f2c3b45fc184e +SHA512 (voms-api-java-3.3.6.tar.gz) = fb2f7c330de32b5523a33fd5de6bc16bdb7fa45de9a91f01fd2c066485e82b17a981f43c7e6762ec1cfb11241c0085db70ad194154623588a9a3845b0c9203b4 diff --git a/voms-api-java.spec b/voms-api-java.spec index 132b3a1..0e25fbd 100644 --- a/voms-api-java.spec +++ b/voms-api-java.spec @@ -1,6 +1,6 @@ Name: voms-api-java -Version: 3.3.5 -Release: 4%{?dist} +Version: 3.3.6 +Release: 1%{?dist} Summary: Virtual Organization Membership Service Java API License: Apache-2.0 @@ -10,7 +10,11 @@ Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz BuildArch: noarch ExclusiveArch: %{java_arches} noarch +%if %{?fedora}%{!?fedora:0} >= 43 BuildRequires: maven-local-openjdk25 +%else +BuildRequires: maven-local +%endif BuildRequires: mvn(eu.eu-emi.security:canl) >= 2.8.3 Requires: mvn(eu.eu-emi.security:canl) >= 2.8.3 @@ -47,10 +51,6 @@ Virtual Organization Membership Service (VOMS) Java API Documentation. %pom_remove_plugin org.apache.maven.plugins:maven-enforcer-plugin %if %{?rhel}%{!?rhel:0} == 9 -# Default openjdk in RHEL 9 is 11 -%pom_xpath_replace "//pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration/pom:release/text()" 11 -%pom_xpath_replace "//pom:properties/pom:maven.compiler.release/text()" 11 - # Modify bouncycastle dependencies for RHEL 9 %pom_change_dep org.bouncycastle:bcprov-jdk18on org.bouncycastle:bcprov-jdk15on %pom_change_dep org.bouncycastle:bcpkix-jdk18on org.bouncycastle:bcpkix-jdk15on @@ -70,6 +70,9 @@ Virtual Organization Membership Service (VOMS) Java API Documentation. %license LICENSE %changelog +* Tue Aug 05 2025 Mattias Ellert - 3.3.6-1 +- Update to version 3.3.6 + * Tue Jul 29 2025 jiri vanek - 3.3.5-4 - Rebuilt for java-25-openjdk as preffered jdk From 280976e0758dd34953c8ba68fb0954fb42f781f2 Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Tue, 9 Sep 2025 11:22:20 +0200 Subject: [PATCH 47/51] Include upstream's scripts for generating test certificates Enable tests again --- sources | 1 + voms-api-java-test.patch | 28 ++++++++++++++++++++++++++++ voms-api-java.spec | 29 +++++++++++++++++++++++------ 3 files changed, 52 insertions(+), 6 deletions(-) create mode 100644 voms-api-java-test.patch diff --git a/sources b/sources index d8b8e2a..47eb880 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (voms-api-java-3.3.6.tar.gz) = fb2f7c330de32b5523a33fd5de6bc16bdb7fa45de9a91f01fd2c066485e82b17a981f43c7e6762ec1cfb11241c0085db70ad194154623588a9a3845b0c9203b4 +SHA512 (helper-scripts-master.tar.gz) = 8704b5bdbee360c0db70e6ece2781a385c62c802c9000754f62efbd23bd22542ace77f68b8064661201f441b40234475a005d9f67b50f0aea435636a0a851225 diff --git a/voms-api-java-test.patch b/voms-api-java-test.patch new file mode 100644 index 0000000..b32fafc --- /dev/null +++ b/voms-api-java-test.patch @@ -0,0 +1,28 @@ +diff --git a/src/test/java/org/italiangrid/voms/test/ac/TestACValidator.java b/src/test/java/org/italiangrid/voms/test/ac/TestACValidator.java +index a0f7a87..4244925 100644 +--- a/src/test/java/org/italiangrid/voms/test/ac/TestACValidator.java ++++ b/src/test/java/org/italiangrid/voms/test/ac/TestACValidator.java +@@ -31,6 +31,7 @@ import org.italiangrid.voms.test.utils.Utils; + import org.italiangrid.voms.test.utils.VOMSAA; + import org.junit.Assert; + import org.junit.BeforeClass; ++import org.junit.Ignore; + import org.junit.Test; + + import eu.emi.security.authn.x509.X509CertChainValidatorExt; +@@ -316,6 +317,7 @@ public class TestACValidator implements Fixture { + } + + @Test ++ @Ignore + public void testTargetValidationSuccess() throws Exception { + + VOMSAA aa = Utils.getVOMSAA(); +@@ -342,6 +344,7 @@ public class TestACValidator implements Fixture { + } + + @Test ++ @Ignore + public void testTargetValidationFailure() throws Exception { + + VOMSAA aa = Utils.getVOMSAA(); diff --git a/voms-api-java.spec b/voms-api-java.spec index 0e25fbd..c0d7c16 100644 --- a/voms-api-java.spec +++ b/voms-api-java.spec @@ -1,11 +1,15 @@ Name: voms-api-java Version: 3.3.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Virtual Organization Membership Service Java API License: Apache-2.0 URL: https://github.com/italiangrid/%{name} Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz +# Helper scripts for generating test certificates +Source1: https://baltig.infn.it/mw-devel/helper-scripts/-/archive/master/helper-scripts-master.tar.gz +# Disable tests requiring non-local network +Patch0: %{name}-test.patch BuildArch: noarch ExclusiveArch: %{java_arches} noarch @@ -16,6 +20,11 @@ BuildRequires: maven-local-openjdk25 BuildRequires: maven-local %endif BuildRequires: mvn(eu.eu-emi.security:canl) >= 2.8.3 +BuildRequires: mvn(junit:junit) +BuildRequires: mvn(org.hamcrest:hamcrest-library) +BuildRequires: mvn(org.mockito:mockito-core) +BuildRequires: faketime +BuildRequires: openssl Requires: mvn(eu.eu-emi.security:canl) >= 2.8.3 %description @@ -35,7 +44,8 @@ Summary: Virtual Organization Membership Service Java API Documentation Virtual Organization Membership Service (VOMS) Java API Documentation. %prep -%setup -q +%setup -q -a 1 +%patch -P0 -p1 # Remove unused dependency %pom_remove_dep net.jcip:jcip-annotations @@ -47,17 +57,20 @@ Virtual Organization Membership Service (VOMS) Java API Documentation. # Do not create source jars %pom_remove_plugin org.apache.maven.plugins:maven-source-plugin -# Do not enforce requirements -%pom_remove_plugin org.apache.maven.plugins:maven-enforcer-plugin - %if %{?rhel}%{!?rhel:0} == 9 # Modify bouncycastle dependencies for RHEL 9 %pom_change_dep org.bouncycastle:bcprov-jdk18on org.bouncycastle:bcprov-jdk15on %pom_change_dep org.bouncycastle:bcpkix-jdk18on org.bouncycastle:bcpkix-jdk15on %endif +# Generate test certificates +export PATH=$PWD/helper-scripts-master/x509-scripts/scripts:$PATH +pushd src/test/resources +./setup.sh +popd + %build -%mvn_build -f +%mvn_build %install %mvn_install @@ -70,6 +83,10 @@ Virtual Organization Membership Service (VOMS) Java API Documentation. %license LICENSE %changelog +* Mon Sep 08 2025 Mattias Ellert - 3.3.6-2 +- Include upstream's scripts for generating test certificates +- Enable tests again + * Tue Aug 05 2025 Mattias Ellert - 3.3.6-1 - Update to version 3.3.6 From 0eaf9e6dac844633fb840bcbf7f8c2aca294882c Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Sun, 21 Dec 2025 05:19:55 +0100 Subject: [PATCH 48/51] Update to version 3.3.7 --- sources | 2 +- voms-api-java.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 47eb880..5df8bdb 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (voms-api-java-3.3.6.tar.gz) = fb2f7c330de32b5523a33fd5de6bc16bdb7fa45de9a91f01fd2c066485e82b17a981f43c7e6762ec1cfb11241c0085db70ad194154623588a9a3845b0c9203b4 +SHA512 (voms-api-java-3.3.7.tar.gz) = b623480b972742625e0c7cd95bfefee36a580f743240434d5591a9f35a19977a4d7d3abc90b598666e86f8e6d3a40a6c6ca66e19309a1ea8d2be979af57aaa58 SHA512 (helper-scripts-master.tar.gz) = 8704b5bdbee360c0db70e6ece2781a385c62c802c9000754f62efbd23bd22542ace77f68b8064661201f441b40234475a005d9f67b50f0aea435636a0a851225 diff --git a/voms-api-java.spec b/voms-api-java.spec index c0d7c16..cfb6141 100644 --- a/voms-api-java.spec +++ b/voms-api-java.spec @@ -1,6 +1,6 @@ Name: voms-api-java -Version: 3.3.6 -Release: 2%{?dist} +Version: 3.3.7 +Release: 1%{?dist} Summary: Virtual Organization Membership Service Java API License: Apache-2.0 @@ -83,6 +83,9 @@ popd %license LICENSE %changelog +* Sat Dec 20 2025 Mattias Ellert - 3.3.7-1 +- Update to version 3.3.7 + * Mon Sep 08 2025 Mattias Ellert - 3.3.6-2 - Include upstream's scripts for generating test certificates - Enable tests again From 77a3fe9b48da53f543dee78ebcf8009d64546905 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:02:51 +0000 Subject: [PATCH 49/51] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- voms-api-java.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/voms-api-java.spec b/voms-api-java.spec index cfb6141..2d14fed 100644 --- a/voms-api-java.spec +++ b/voms-api-java.spec @@ -1,6 +1,6 @@ Name: voms-api-java Version: 3.3.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Virtual Organization Membership Service Java API License: Apache-2.0 @@ -83,6 +83,9 @@ popd %license LICENSE %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 3.3.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Sat Dec 20 2025 Mattias Ellert - 3.3.7-1 - Update to version 3.3.7 From dbd483693b9a1ed953805579d151c1dc5002d7e5 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Fri, 12 Jun 2026 20:03:33 -0400 Subject: [PATCH 50/51] Rebuilt for openssl 4.0 --- voms-api-java.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/voms-api-java.spec b/voms-api-java.spec index 2d14fed..1809199 100644 --- a/voms-api-java.spec +++ b/voms-api-java.spec @@ -1,6 +1,6 @@ Name: voms-api-java Version: 3.3.7 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Virtual Organization Membership Service Java API License: Apache-2.0 @@ -83,6 +83,9 @@ popd %license LICENSE %changelog +* Sat Jun 13 2026 Yaakov Selkowitz - 3.3.7-3 +- Rebuilt for openssl 4.0 + * Sat Jan 17 2026 Fedora Release Engineering - 3.3.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 93c852ee908501cbb1dafac945f388d4756249cd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:36:58 +0000 Subject: [PATCH 51/51] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- voms-api-java.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/voms-api-java.spec b/voms-api-java.spec index 1809199..2b354af 100644 --- a/voms-api-java.spec +++ b/voms-api-java.spec @@ -1,6 +1,6 @@ Name: voms-api-java Version: 3.3.7 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Virtual Organization Membership Service Java API License: Apache-2.0 @@ -83,6 +83,9 @@ popd %license LICENSE %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 3.3.7-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Sat Jun 13 2026 Yaakov Selkowitz - 3.3.7-3 - Rebuilt for openssl 4.0