diff --git a/sources b/sources index 5df8bdb..aba9c66 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (voms-api-java-3.3.7.tar.gz) = b623480b972742625e0c7cd95bfefee36a580f743240434d5591a9f35a19977a4d7d3abc90b598666e86f8e6d3a40a6c6ca66e19309a1ea8d2be979af57aaa58 -SHA512 (helper-scripts-master.tar.gz) = 8704b5bdbee360c0db70e6ece2781a385c62c802c9000754f62efbd23bd22542ace77f68b8064661201f441b40234475a005d9f67b50f0aea435636a0a851225 +3076b30f06646d03706a944a6130dcc3 v3.1.0.tar.gz diff --git a/voms-api-java-no-local.patch b/voms-api-java-no-local.patch new file mode 100644 index 0000000..e63d618 --- /dev/null +++ b/voms-api-java-no-local.patch @@ -0,0 +1,21 @@ +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-test.patch b/voms-api-java-test.patch deleted file mode 100644 index b32fafc..0000000 --- a/voms-api-java-test.patch +++ /dev/null @@ -1,28 +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 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 2b354af..2cc0f4a 100644 --- a/voms-api-java.spec +++ b/voms-api-java.spec @@ -1,31 +1,25 @@ Name: voms-api-java -Version: 3.3.7 -Release: 4%{?dist} +Version: 3.1.0 +Release: 1%{?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 - +Group: Development/Libraries +License: ASL 2.0 +URL: https://wiki.italiangrid.it/VOMS +Source0: https://github.com/italiangrid/%{name}/archive/v%{version}.tar.gz +# Disable tests using non-local network interface +Patch0: %{name}-no-local.patch 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 +BuildRequires: mvn(eu.eu-emi.security:canl) 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 +%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 @@ -39,43 +33,37 @@ 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. %prep -%setup -q -a 1 -%patch -P0 -p1 +%setup -q +%patch0 -p1 -# Remove unused dependency +%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 - -# 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 - -# Do not create source jars -%pom_remove_plugin org.apache.maven.plugins:maven-source-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 %install -%mvn_install +%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 @@ -83,167 +71,10 @@ 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 - -* 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 - -* 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 - -* 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 - -* 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 - - 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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) - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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) - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - * 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 -* 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 - * 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)