Update to version 3.3.3

sources

@@ -1 +1 @@
-SHA512 (voms-api-java-3.3.2.tar.gz) = 7de09abd3e1605a7596c29bb0f16553945d6c13098c667451580ed4e22a671814db254355b56ec12696fce011854487510fb9e627e4f13474fbfedec6db1c422
+SHA512 (voms-api-java-3.3.3.tar.gz) = c66d412a4516634581685a3f7b4de42f922366ce30e994c36f7877a67c1545063030b58550e9d5ea691811cffa05c41396001b7be7ad2f034d20539f280b35d1

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 <mattias.ellert@physics.uu.se> - 3.3.3-1
+- Update to version 3.3.3
+
 * Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.2-18
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild