Update to version 2.0.10

maven-build.properties

@@ -1,8 +1,8 @@
 #Generated by Maven Ant Plugin - DO NOT EDIT THIS FILE!
-#Thu Nov 29 13:22:48 CET 2012
+#Mon Feb 11 23:31:38 CET 2013
 bouncycastle.version=1.46
 maven.settings.offline=true
-maven.build.finalName=voms-api-java-2.0.9
+maven.build.finalName=voms-api-java-2.0.10
 maven.build.resourceDir.0=src/main/resources
 maven.build.testOutputDir=${maven.build.dir}/test-classes
 maven.build.testResourceDir.0=src/test/resources
@@ -14,7 +14,7 @@ maven.test.reports=${maven.build.dir}/test-reports
 maven.build.dir=target
 project.build.outputDirectory=${maven.build.outputDir}
 assembly.javadoc.dir=/usr/share/javadoc/voms-api-java
-assembly.doc.dir=/usr/share/doc/voms-api-java-2.0.9
+assembly.doc.dir=/usr/share/doc/voms-api-java-2.0.10
 project.reporting.outputEncoding=UTF-8
 maven.build.testDir.0=src/test/java
 maven.settings.interactiveMode=true

maven-build.xml

@@ -10,7 +10,7 @@
 <!--                                                                        -->
 <!-- Any modifications will be overwritten.                                 -->
 <!--                                                                        -->
-<!-- Generated by Maven Ant Plugin on 11/29/12 1:22 PM                      -->
+<!-- Generated by Maven Ant Plugin on 2/11/13 11:31 PM                      -->
 <!-- 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-2.0.9"/>
+  <property name="maven.build.finalName" value="voms-api-java-2.0.10"/>
   <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"/>
@@ -143,14 +143,14 @@
           <include name="**/Test*.java"/>
           <include name="**/*Test.java"/>
           <include name="**/*TestCase.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
           <exclude name="**/TestFixture.java"/>
+          <exclude name="**/LoadTest.java"/>
+          <exclude name="**/TestCerts.java"/>
         </fileset>
       </batchtest>
       <batchtest todir="${maven.test.reports}" if="test">
         <fileset dir="${maven.build.testDir.0}">
           <include name="**/${test}.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
         </fileset>
       </batchtest>
     </junit>

sources

@@ -1 +1 @@
-4152447c620a33d32920d8c10941f410  voms-api-java-2.0.9.tar.gz
+c2b017434cfba3e31b88b28920695cd4  2_0_10.tar.gz

voms-api-java-test.patch

@@ -0,0 +1,12 @@
+diff -ur voms-api-java-2_0_10.orig/pom.xml voms-api-java-2_0_10/pom.xml
+--- voms-api-java-2_0_10.orig/pom.xml	2013-01-11 16:15:57.000000000 +0100
++++ voms-api-java-2_0_10/pom.xml	2013-02-11 23:26:58.928257785 +0100
+@@ -17,7 +17,7 @@
+ 		<assembly.doc.dir>/usr/share/doc/${project.name}-${project.version}</assembly.doc.dir>
+ 		<assembly.javadoc.dir>/usr/share/javadoc/${project.name}</assembly.javadoc.dir>
+ 		<bouncycastle.version>1.45</bouncycastle.version>
+-		<excludedTests>**/LoadTest.java</excludedTests>
++		<excludedTests>**/LoadTest.java,**/TestCerts.java</excludedTests>
+ 	</properties>
+ 
+ 	<profiles>

voms-api-java.spec

@@ -6,19 +6,15 @@
 %endif
 
 Name:		voms-api-java
-Version:	2.0.9
-Release:	3%{?dist}
+Version:	2.0.10
+%global tagver %(tr . _ <<< %{version})
+Release:	1%{?dist}
 Summary:	Virtual Organization Membership Service Java API
 
 Group:		Development/Libraries
 License:	ASL 2.0
 URL:		https://wiki.italiangrid.it/VOMS
-#		This source tarball is created from a git checkout:
-#		git clone git://github.com/italiangrid/voms-api-java.git
-#		cd voms-api-java
-#		git archive --format tar.gz --prefix voms-api-java-2.0.9/ \
-#		  2_0_9 > ../voms-api-java-2.0.9.tar.gz
-Source0:	%{name}-%{version}.tar.gz
+Source0:	https://github.com/italiangrid/%{name}/archive/%{tagver}.tar.gz
 #		These are build instructions for ant generated from the maven
 #		build instrutions using the maven ant plugin.
 #		These are used for building on EPEL since there is no maven
@@ -26,6 +22,7 @@ Source0:	%{name}-%{version}.tar.gz
 Source1:	build.xml
 Source2:	maven-build.xml
 Source3:	maven-build.properties
+Patch0:		%{name}-test.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 
@@ -104,7 +101,8 @@ Obsoletes:	vomsjapi-javadoc < 2.0.7
 Virtual Organization Membership Service (VOMS) Java API Documentation.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{tagver}
+%patch0 -p1
 install -m 644 %SOURCE1 .
 install -m 644 %SOURCE2 .
 install -m 644 %SOURCE3 .
@@ -156,6 +154,9 @@ rm -rf %{buildroot}
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Mon Feb 11 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 2.0.10-1
+- Update to version 2.0.10
+
 * Wed Feb 06 2013 Java SIG <java-devel@lists.fedoraproject.org> - 2.0.9-3
 - Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild
 - Replace maven BuildRequires with maven-local