Compare commits
No commits in common. "rawhide" and "f40" have entirely different histories.
3 changed files with 14 additions and 84 deletions
3
sources
3
sources
|
|
@ -1,2 +1 @@
|
|||
SHA512 (voms-api-java-3.3.7.tar.gz) = b623480b972742625e0c7cd95bfefee36a580f743240434d5591a9f35a19977a4d7d3abc90b598666e86f8e6d3a40a6c6ca66e19309a1ea8d2be979af57aaa58
|
||||
SHA512 (helper-scripts-master.tar.gz) = 8704b5bdbee360c0db70e6ece2781a385c62c802c9000754f62efbd23bd22542ace77f68b8064661201f441b40234475a005d9f67b50f0aea435636a0a851225
|
||||
SHA512 (voms-api-java-3.3.5.tar.gz) = 722d509565cf5a071932d22f1fa2c2a9bdd6734df546a227175fa87a7eeab212d47243b7c46a079b0980dbd3e873486b0f8e74c076d1809c5c9f2c3b45fc184e
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
|
|
@ -1,30 +1,17 @@
|
|||
Name: voms-api-java
|
||||
Version: 3.3.7
|
||||
Release: 4%{?dist}
|
||||
Version: 3.3.5
|
||||
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
|
||||
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
|
||||
|
||||
%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(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
|
||||
|
|
@ -44,8 +31,7 @@ Summary: Virtual Organization Membership Service Java API Documentation
|
|||
Virtual Organization Membership Service (VOMS) Java API Documentation.
|
||||
|
||||
%prep
|
||||
%setup -q -a 1
|
||||
%patch -P0 -p1
|
||||
%setup -q
|
||||
|
||||
# Remove unused dependency
|
||||
%pom_remove_dep net.jcip:jcip-annotations
|
||||
|
|
@ -57,20 +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
|
||||
|
||||
# Do not enforce requirements
|
||||
%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
|
||||
%endif
|
||||
|
||||
# Generate test certificates
|
||||
export PATH=$PWD/helper-scripts-master/x509-scripts/scripts:$PATH
|
||||
pushd src/test/resources
|
||||
./setup.sh
|
||||
popd
|
||||
|
||||
%build
|
||||
%mvn_build
|
||||
%mvn_build -f
|
||||
|
||||
%install
|
||||
%mvn_install
|
||||
|
|
@ -83,34 +70,6 @@ popd
|
|||
%license LICENSE
|
||||
|
||||
%changelog
|
||||
* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.7-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
|
||||
|
||||
* Sat Jun 13 2026 Yaakov Selkowitz <yselkowi@redhat.com> - 3.3.7-3
|
||||
- Rebuilt for openssl 4.0
|
||||
|
||||
* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.7-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
|
||||
|
||||
* Sat Dec 20 2025 Mattias Ellert <mattias.ellert@physics.uu.se> - 3.3.7-1
|
||||
- Update to version 3.3.7
|
||||
|
||||
* Mon Sep 08 2025 Mattias Ellert <mattias.ellert@physics.uu.se> - 3.3.6-2
|
||||
- Include upstream's scripts for generating test certificates
|
||||
- Enable tests again
|
||||
|
||||
* Tue Aug 05 2025 Mattias Ellert <mattias.ellert@physics.uu.se> - 3.3.6-1
|
||||
- Update to version 3.3.6
|
||||
|
||||
* Tue Jul 29 2025 jiri vanek <jvanek@redhat.com> - 3.3.5-4
|
||||
- Rebuilt for java-25-openjdk as preffered jdk
|
||||
|
||||
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.5-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||
|
||||
* Tue Apr 22 2025 Mattias Ellert <mattias.ellert@physics.uu.se> - 3.3.5-2
|
||||
- Update URL tag
|
||||
|
||||
* Thu Apr 17 2025 Mattias Ellert <mattias.ellert@physics.uu.se> - 3.3.5-1
|
||||
- Update to version 3.3.5
|
||||
- Do not run tests
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue