Update to version 3.3.2 - matches canl-java 2.6.x
Drop patch voms-api-java-no-local.patch
This commit is contained in:
Mattias Ellert
parent
dd32df4992
commit
f0bdaffe90
5 changed files with 23 additions and 50 deletions
|
|
@ -1,9 +1,9 @@
|
|||
#Generated by Maven Ant Plugin - DO NOT EDIT THIS FILE!
|
||||
#Thu Feb 08 17:57:52 CET 2018
|
||||
#Wed Oct 14 10:08:57 CEST 2020
|
||||
maven.build.testDir.0=src/test/java
|
||||
plugin.nexus-staging.version=1.6.3
|
||||
bc.version=1.58
|
||||
canl.version=2.5.0
|
||||
canl.version=2.6.0
|
||||
maven.settings.offline=true
|
||||
plugin.assembly.version=2.4.1
|
||||
junit.version=4.11
|
||||
|
|
@ -16,7 +16,7 @@ maven.build.testOutputDir=${maven.build.dir}/test-classes
|
|||
plugin.release.version=2.2.2
|
||||
jcip.version=1.0
|
||||
plugin.cobertura.version=2.5.2
|
||||
maven.build.finalName=voms-api-java-3.3.0
|
||||
maven.build.finalName=voms-api-java-3.3.2
|
||||
mockito.version=1.9.5
|
||||
maven.test.reports=${maven.build.dir}/test-reports
|
||||
plugin.source.version=2.2.1
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
<!-- -->
|
||||
<!-- Any modifications will be overwritten. -->
|
||||
<!-- -->
|
||||
<!-- Generated by Maven Ant Plugin on 2/8/18 5:57 PM -->
|
||||
<!-- Generated by Maven Ant Plugin on 10/14/20 10:08 AM -->
|
||||
<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/ -->
|
||||
<!-- -->
|
||||
<!-- ====================================================================== -->
|
||||
|
|
@ -24,7 +24,7 @@
|
|||
<property file="${user.home}/.m2/maven.properties"/>
|
||||
<property file="maven-build.properties"/>
|
||||
|
||||
<property name="maven.build.finalName" value="voms-api-java-3.3.0"/>
|
||||
<property name="maven.build.finalName" value="voms-api-java-3.3.2"/>
|
||||
<property name="maven.build.dir" value="target"/>
|
||||
<property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
|
||||
<property name="maven.build.srcDir.0" value="src/main/java"/>
|
||||
|
|
@ -44,21 +44,19 @@
|
|||
<!-- ====================================================================== -->
|
||||
|
||||
<path id="build.classpath">
|
||||
<pathelement location="${maven.repo.local}/eu/eu-emi/security/canl/2.5.0/canl-2.5.0.jar"/>
|
||||
<pathelement location="${maven.repo.local}/commons-io/commons-io/2.4/commons-io-2.4.jar"/>
|
||||
<pathelement location="${maven.repo.local}/eu/eu-emi/security/canl/2.6.0/canl-2.6.0.jar"/>
|
||||
<pathelement location="${maven.repo.local}/commons-io/commons-io/2.6/commons-io-2.6.jar"/>
|
||||
<pathelement location="${maven.repo.local}/org/bouncycastle/bcpkix-jdk15on/1.58/bcpkix-jdk15on-1.58.jar"/>
|
||||
<pathelement location="${maven.repo.local}/org/bouncycastle/bcprov-jdk15on/1.58/bcprov-jdk15on-1.58.jar"/>
|
||||
<pathelement location="${maven.repo.local}/net/jcip/jcip-annotations/1.0/jcip-annotations-1.0.jar"/>
|
||||
</path>
|
||||
<path id="build.test.classpath">
|
||||
<pathelement location="${maven.repo.local}/junit/junit/4.11/junit-4.11.jar"/>
|
||||
<pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"/>
|
||||
<pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-library/1.3/hamcrest-library-1.3.jar"/>
|
||||
<pathelement location="${maven.repo.local}/eu/eu-emi/security/canl/2.5.0/canl-2.5.0.jar"/>
|
||||
<pathelement location="${maven.repo.local}/commons-io/commons-io/2.4/commons-io-2.4.jar"/>
|
||||
<pathelement location="${maven.repo.local}/eu/eu-emi/security/canl/2.6.0/canl-2.6.0.jar"/>
|
||||
<pathelement location="${maven.repo.local}/commons-io/commons-io/2.6/commons-io-2.6.jar"/>
|
||||
<pathelement location="${maven.repo.local}/org/bouncycastle/bcpkix-jdk15on/1.58/bcpkix-jdk15on-1.58.jar"/>
|
||||
<pathelement location="${maven.repo.local}/org/bouncycastle/bcprov-jdk15on/1.58/bcprov-jdk15on-1.58.jar"/>
|
||||
<pathelement location="${maven.repo.local}/net/jcip/jcip-annotations/1.0/jcip-annotations-1.0.jar"/>
|
||||
<pathelement location="${maven.repo.local}/org/mockito/mockito-core/1.9.5/mockito-core-1.9.5.jar"/>
|
||||
<pathelement location="${maven.repo.local}/org/objenesis/objenesis/1.0/objenesis-1.0.jar"/>
|
||||
</path>
|
||||
|
|
@ -265,14 +263,14 @@
|
|||
dest="${maven.repo.local}/org/hamcrest/hamcrest-library/1.3/hamcrest-library-1.3.jar"
|
||||
usetimestamp="false"
|
||||
ignoreerrors="true"/>
|
||||
<mkdir dir="${maven.repo.local}/eu/eu-emi/security/canl/2.5.0"/>
|
||||
<get src="https://repo.maven.apache.org/maven2/eu/eu-emi/security/canl/2.5.0/canl-2.5.0.jar"
|
||||
dest="${maven.repo.local}/eu/eu-emi/security/canl/2.5.0/canl-2.5.0.jar"
|
||||
<mkdir dir="${maven.repo.local}/eu/eu-emi/security/canl/2.6.0"/>
|
||||
<get src="https://repo.maven.apache.org/maven2/eu/eu-emi/security/canl/2.6.0/canl-2.6.0.jar"
|
||||
dest="${maven.repo.local}/eu/eu-emi/security/canl/2.6.0/canl-2.6.0.jar"
|
||||
usetimestamp="false"
|
||||
ignoreerrors="true"/>
|
||||
<mkdir dir="${maven.repo.local}/commons-io/commons-io/2.4"/>
|
||||
<get src="https://repo.maven.apache.org/maven2/commons-io/commons-io/2.4/commons-io-2.4.jar"
|
||||
dest="${maven.repo.local}/commons-io/commons-io/2.4/commons-io-2.4.jar"
|
||||
<mkdir dir="${maven.repo.local}/commons-io/commons-io/2.6"/>
|
||||
<get src="https://repo.maven.apache.org/maven2/commons-io/commons-io/2.6/commons-io-2.6.jar"
|
||||
dest="${maven.repo.local}/commons-io/commons-io/2.6/commons-io-2.6.jar"
|
||||
usetimestamp="false"
|
||||
ignoreerrors="true"/>
|
||||
<mkdir dir="${maven.repo.local}/org/bouncycastle/bcpkix-jdk15on/1.58"/>
|
||||
|
|
@ -285,11 +283,6 @@
|
|||
dest="${maven.repo.local}/org/bouncycastle/bcprov-jdk15on/1.58/bcprov-jdk15on-1.58.jar"
|
||||
usetimestamp="false"
|
||||
ignoreerrors="true"/>
|
||||
<mkdir dir="${maven.repo.local}/net/jcip/jcip-annotations/1.0"/>
|
||||
<get src="https://repo.maven.apache.org/maven2/net/jcip/jcip-annotations/1.0/jcip-annotations-1.0.jar"
|
||||
dest="${maven.repo.local}/net/jcip/jcip-annotations/1.0/jcip-annotations-1.0.jar"
|
||||
usetimestamp="false"
|
||||
ignoreerrors="true"/>
|
||||
<mkdir dir="${maven.repo.local}/org/mockito/mockito-core/1.9.5"/>
|
||||
<get src="https://repo.maven.apache.org/maven2/org/mockito/mockito-core/1.9.5/mockito-core-1.9.5.jar"
|
||||
dest="${maven.repo.local}/org/mockito/mockito-core/1.9.5/mockito-core-1.9.5.jar"
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (voms-api-java-3.3.0.tar.gz) = 10994bf7bdffb6896f6b6d3cb3dcb5ee8c05183553f96288107d1ba8223b35c3b998536e6753c41b1989c40e58f98efdbe9410235f1d4f3e5a25a8f450b3a958
|
||||
SHA512 (voms-api-java-3.3.2.tar.gz) = 7de09abd3e1605a7596c29bb0f16553945d6c13098c667451580ed4e22a671814db254355b56ec12696fce011854487510fb9e627e4f13474fbfedec6db1c422
|
||||
|
|
|
|||
|
|
@ -1,21 +0,0 @@
|
|||
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();
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
Name: voms-api-java
|
||||
Version: 3.3.0
|
||||
Version: 3.3.2
|
||||
Release: 1%{?dist}
|
||||
Summary: Virtual Organization Membership Service Java API
|
||||
|
||||
|
|
@ -13,8 +13,6 @@ Source0: https://github.com/italiangrid/%{name}/archive/v%{version}/%{name}-%{ve
|
|||
Source1: build.xml
|
||||
Source2: maven-build.xml
|
||||
Source3: maven-build.properties
|
||||
# Disable tests using non-local network interface
|
||||
Patch0: %{name}-no-local.patch
|
||||
BuildArch: noarch
|
||||
# There is no jakarta-commons-io for ppc64 in EPEL6
|
||||
ExcludeArch: ppc64
|
||||
|
|
@ -22,10 +20,10 @@ ExcludeArch: ppc64
|
|||
BuildRequires: java-1.8.0-openjdk-devel
|
||||
BuildRequires: jpackage-utils
|
||||
BuildRequires: ant
|
||||
BuildRequires: canl-java >= 2.5
|
||||
BuildRequires: canl-java >= 2.6
|
||||
Requires: java >= 1:1.8
|
||||
Requires: jpackage-utils
|
||||
Requires: canl-java >= 2.5
|
||||
Requires: canl-java >= 2.6
|
||||
Provides: voms-api-java3 = %{version}-%{release}
|
||||
Obsoletes: voms-api-java3 < 3.1
|
||||
|
||||
|
|
@ -50,7 +48,6 @@ Virtual Organization Membership Service (VOMS) Java API Documentation.
|
|||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
cp -p %{SOURCE1} .
|
||||
cp -p %{SOURCE2} .
|
||||
cp -p %{SOURCE3} .
|
||||
|
|
@ -90,6 +87,10 @@ cp -pr target/site/apidocs %{buildroot}%{_javadocdir}/%{name}
|
|||
%license LICENSE
|
||||
|
||||
%changelog
|
||||
* Wed Oct 14 2020 Mattias Ellert <mattias.ellert@physics.uu.se> - 3.3.2-1
|
||||
- Update to version 3.3.2 - matches canl-java 2.6.x
|
||||
- Drop patch voms-api-java-no-local.patch
|
||||
|
||||
* Thu Feb 08 2018 Mattias Ellert <mattias.ellert@physics.uu.se> - 3.3.0-1
|
||||
- Build against bouncycastle1.58
|
||||
- Update to version 3.3.0 - matches canl-java 2.5.x
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue