From e4da0a1d308bd7c024f1e5645b828882b7d2ec9b Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Tue, 22 Apr 2025 22:39:09 +0200 Subject: [PATCH 1/9] 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 2/9] 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 3/9] 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 4/9] 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 5/9] 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 6/9] 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 7/9] 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 8/9] 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 9/9] 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