From cb56554d95693c810483b1c16b26282f82f2eb59 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 20:39:01 +0000 Subject: [PATCH 01/31] - 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 02/31] 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 03/31] - 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 04/31] 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 05/31] 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 06/31] 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 07/31] 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 08/31] 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 09/31] 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 10/31] 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 11/31] 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 12/31] 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 13/31] 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 14/31] 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 15/31] 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 16/31] 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 17/31] 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 18/31] 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 19/31] 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 20/31] 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 21/31] 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 22/31] 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 23/31] 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 24/31] 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 25/31] 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 26/31] 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 27/31] 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 28/31] 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 29/31] 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 30/31] 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 31/31] 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