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