From bca13093cfb324d48db0ea24b57b66060771f101 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Sat, 6 Jan 2018 17:11:24 +0100
Subject: [PATCH 1/6] Create EPEL 6 package using the maven ant plugin

---
 build.xml              |  23 ++++
 maven-build.properties |  34 +++++
 maven-build.xml        | 305 +++++++++++++++++++++++++++++++++++++++++
 voms-clients-java.spec |  60 +++++---
 4 files changed, 402 insertions(+), 20 deletions(-)
 create mode 100644 build.xml
 create mode 100644 maven-build.properties
 create mode 100644 maven-build.xml

diff --git a/build.xml b/build.xml
new file mode 100644
index 0000000..0f92cc0
--- /dev/null
+++ b/build.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
+<!-- ====================================================================== -->
+
+<project name="voms-clients" default="package" basedir=".">
+
+  <!-- ====================================================================== -->
+  <!-- Import maven-build.xml into the current project                        -->
+  <!-- ====================================================================== -->
+
+  <import file="maven-build.xml"/>
+  
+  <!-- ====================================================================== -->
+  <!-- Help target                                                            -->
+  <!-- ====================================================================== -->
+
+  <target name="help">
+    <echo message="Please run: $ant -projecthelp"/>
+  </target>
+
+</project>
diff --git a/maven-build.properties b/maven-build.properties
new file mode 100644
index 0000000..0243911
--- /dev/null
+++ b/maven-build.properties
@@ -0,0 +1,34 @@
+#Generated by Maven Ant Plugin - DO NOT EDIT THIS FILE!
+#Fri Jan 05 18:12:39 CET 2018
+maven.settings.offline=true
+voms-api-java.version=3.0.6
+maven.build.finalName=voms-clients-3.0.7
+commons-cli.version=1.2
+plugin.license.version=1.9.0
+maven.build.resourceDir.0=src/main/resources
+maven.build.testOutputDir=${maven.build.dir}/test-classes
+maven.build.testResourceDir.0=src/test/resources
+maven.reporting.outputDirectory=${maven.build.dir}/site
+plugin.compiler.version=3.1
+commons-io.version=2.0.1
+plugin.javadoc.version=2.9.1
+project.build.sourceEncoding=UTF-8
+maven.build.srcDir.0=src/main/java
+plugin.assembly.version=2.4.1
+junit.version=4.10
+project.build.directory=${maven.build.dir}
+maven.test.reports=${maven.build.dir}/test-reports
+maven.build.dir=target
+plugin.jar.version=2.5
+project.build.outputDirectory=${maven.build.outputDir}
+plugin.nexus-staging.version=1.6.3
+plugin.source.version=2.2.1
+plugin.release.version=2.2.2
+project.reporting.outputEncoding=UTF-8
+voms-clients.libs=
+maven.build.testDir.0=src/test/java
+maven.settings.interactiveMode=true
+plugin.gpg.version=1.5
+maven.repo.local=${user.home}/.m2/repository
+plugin.deploy.version=2.8.2
+maven.build.outputDir=${maven.build.dir}/classes
diff --git a/maven-build.xml b/maven-build.xml
new file mode 100644
index 0000000..5fca40a
--- /dev/null
+++ b/maven-build.xml
@@ -0,0 +1,305 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
+<!-- ====================================================================== -->
+
+<!-- ====================================================================== -->
+<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
+<!-- ====================================================================== -->
+<!--                                                                        -->
+<!-- Any modifications will be overwritten.                                 -->
+<!--                                                                        -->
+<!-- Generated by Maven Ant Plugin on 1/5/18 6:12 PM                        -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="voms-clients-from-maven" default="package" basedir=".">
+
+  <!-- ====================================================================== -->
+  <!-- Build environment properties                                           -->
+  <!-- ====================================================================== -->
+
+  <property file="${user.home}/.m2/maven.properties"/>
+  <property file="maven-build.properties"/>
+
+  <property name="maven.build.finalName" value="voms-clients-3.0.7"/>
+  <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"/>
+  <property name="maven.build.resourceDir.0" value="src/main/resources"/>
+  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
+  <property name="maven.build.testDir.0" value="src/test/java"/>
+  <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
+  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
+  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
+
+  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
+  <property name="maven.settings.offline" value="false"/>
+  <property name="maven.settings.interactiveMode" value="true"/>
+
+  <!-- ====================================================================== -->
+  <!-- Defining classpaths                                                    -->
+  <!-- ====================================================================== -->
+
+  <path id="build.classpath">
+    <pathelement location="${maven.repo.local}/commons-cli/commons-cli/1.2/commons-cli-1.2.jar"/>
+    <pathelement location="${maven.repo.local}/commons-io/commons-io/2.0.1/commons-io-2.0.1.jar"/>
+    <pathelement location="${maven.repo.local}/org/italiangrid/voms-api-java/3.0.6/voms-api-java-3.0.6.jar"/>
+    <pathelement location="${maven.repo.local}/eu/eu-emi/security/canl/1.3.3/canl-1.3.3.jar"/>
+    <pathelement location="${maven.repo.local}/org/bouncycastle/bcprov-jdk16/1.46/bcprov-jdk16-1.46.jar"/>
+    <pathelement location="${maven.repo.local}/org/italiangrid/bcmail/1.46.3/bcmail-1.46.3.jar"/>
+    <pathelement location="${maven.repo.local}/javax/mail/mail/1.4/mail-1.4.jar"/>
+    <pathelement location="${maven.repo.local}/javax/activation/activation/1.1/activation-1.1.jar"/>
+  </path>
+  <path id="build.test.classpath">
+    <pathelement location="${maven.repo.local}/junit/junit/4.10/junit-4.10.jar"/>
+    <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/>
+    <pathelement location="${maven.repo.local}/commons-cli/commons-cli/1.2/commons-cli-1.2.jar"/>
+    <pathelement location="${maven.repo.local}/commons-io/commons-io/2.0.1/commons-io-2.0.1.jar"/>
+    <pathelement location="${maven.repo.local}/org/italiangrid/voms-api-java/3.0.6/voms-api-java-3.0.6.jar"/>
+    <pathelement location="${maven.repo.local}/eu/eu-emi/security/canl/1.3.3/canl-1.3.3.jar"/>
+    <pathelement location="${maven.repo.local}/org/bouncycastle/bcprov-jdk16/1.46/bcprov-jdk16-1.46.jar"/>
+    <pathelement location="${maven.repo.local}/org/italiangrid/bcmail/1.46.3/bcmail-1.46.3.jar"/>
+    <pathelement location="${maven.repo.local}/javax/mail/mail/1.4/mail-1.4.jar"/>
+    <pathelement location="${maven.repo.local}/javax/activation/activation/1.1/activation-1.1.jar"/>
+  </path>
+
+  <!-- ====================================================================== -->
+  <!-- Cleaning up target                                                     -->
+  <!-- ====================================================================== -->
+
+  <target name="clean" description="Clean the output directory">
+    <delete dir="${maven.build.dir}"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Compilation target                                                     -->
+  <!-- ====================================================================== -->
+
+  <target name="compile" depends="get-deps" description="Compile the code">
+    <mkdir dir="${maven.build.outputDir}"/>
+    <javac destdir="${maven.build.outputDir}" 
+           nowarn="false" 
+           debug="true" 
+           optimize="false" 
+           deprecation="true" 
+           target="1.6" 
+           verbose="false" 
+           fork="false" 
+           source="1.6">
+      <src>
+        <pathelement location="${maven.build.srcDir.0}"/>
+      </src>
+      <classpath refid="build.classpath"/>
+    </javac>
+    <copy todir="${maven.build.outputDir}">
+      <fileset dir="${maven.build.resourceDir.0}"/>
+    </copy>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Test-compilation target                                                -->
+  <!-- ====================================================================== -->
+
+  <target name="compile-tests" 
+          depends="compile" 
+          description="Compile the test code" 
+          unless="maven.test.skip">
+    <mkdir dir="${maven.build.testOutputDir}"/>
+    <javac destdir="${maven.build.testOutputDir}" 
+           nowarn="false" 
+           debug="true" 
+           optimize="false" 
+           deprecation="true" 
+           target="1.6" 
+           verbose="false" 
+           fork="false" 
+           source="1.6">
+      <src>
+        <pathelement location="${maven.build.testDir.0}"/>
+      </src>
+      <classpath>
+        <path refid="build.test.classpath"/>
+        <pathelement location="${maven.build.outputDir}"/>
+      </classpath>
+    </javac>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Run all tests                                                          -->
+  <!-- ====================================================================== -->
+
+  <target name="test" 
+          depends="compile-tests, junit-missing" 
+          unless="junit.skipped" 
+          description="Run the test cases">
+    <mkdir dir="${maven.test.reports}"/>
+    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
+      <sysproperty key="basedir" value="."/>
+      <formatter type="xml"/>
+      <formatter type="plain" usefile="false"/>
+      <classpath>
+        <path refid="build.test.classpath"/>
+        <pathelement location="${maven.build.outputDir}"/>
+        <pathelement location="${maven.build.testOutputDir}"/>
+      </classpath>
+      <batchtest todir="${maven.test.reports}" unless="test">
+        <fileset dir="${maven.build.testDir.0}">
+          <include name="**/Test*.java"/>
+          <include name="**/*Test.java"/>
+          <include name="**/*TestCase.java"/>
+          <exclude name="**/*Abstract*Test.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>
+  </target>
+
+  <target name="test-junit-present">
+    <available classname="junit.framework.Test" property="junit.present" classpathref="build.test.classpath"/>
+  </target>
+
+  <target name="test-junit-status" 
+          depends="test-junit-present">
+    <condition property="junit.missing">
+      <and>
+        <isfalse value="${junit.present}"/>
+        <isfalse value="${maven.test.skip}"/>
+      </and>
+    </condition>
+    <condition property="junit.skipped">
+      <or>
+        <isfalse value="${junit.present}"/>
+        <istrue value="${maven.test.skip}"/>
+      </or>
+    </condition>
+  </target>
+
+  <target name="junit-missing" 
+          depends="test-junit-status" 
+          if="junit.missing">
+    <echo>=================================== WARNING ===================================</echo>
+    <echo> JUnit is not present in the test classpath or your $ANT_HOME/lib directory. Tests not executed.</echo>
+    <echo>===============================================================================</echo>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Javadoc target                                                         -->
+  <!-- ====================================================================== -->
+
+  <target name="javadoc" description="Generates the Javadoc of the application">
+    <javadoc sourcepath="${maven.build.srcDir.0}" 
+             packagenames="*" 
+             destdir="${maven.reporting.outputDirectory}/apidocs" 
+             access="protected" 
+             old="false" 
+             verbose="false" 
+             version="true" 
+             use="true" 
+             author="true" 
+             splitindex="false" 
+             nodeprecated="false" 
+             nodeprecatedlist="false" 
+             notree="false" 
+             noindex="false" 
+             nohelp="false" 
+             nonavbar="false" 
+             serialwarn="false" 
+             charset="UTF-8" 
+             linksource="false" 
+             breakiterator="false"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Package target                                                         -->
+  <!-- ====================================================================== -->
+
+  <target name="package" depends="compile,test" description="Package the application">
+    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
+         compress="true" 
+         index="false" 
+         basedir="${maven.build.outputDir}" 
+         excludes="**/package.html"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- A dummy target for the package named after the type it creates         -->
+  <!-- ====================================================================== -->
+
+  <target name="jar" depends="package" description="Builds the jar for the application"/>
+
+  <!-- ====================================================================== -->
+  <!-- Download dependencies target                                           -->
+  <!-- ====================================================================== -->
+
+  <target name="test-offline">
+    <condition property="maven.mode.offline">
+      <equals arg1="${maven.settings.offline}" arg2="true"/>
+    </condition>
+  </target>
+
+  <target name="get-deps" 
+          depends="test-offline" 
+          description="Download all dependencies" 
+          unless="maven.mode.offline">
+    <mkdir dir="${maven.repo.local}"/>
+    <mkdir dir="${maven.repo.local}/junit/junit/4.10"/>
+    <get src="https://repo.maven.apache.org/maven2/junit/junit/4.10/junit-4.10.jar" 
+         dest="${maven.repo.local}/junit/junit/4.10/junit-4.10.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/org/hamcrest/hamcrest-core/1.1"/>
+    <get src="https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar" 
+         dest="${maven.repo.local}/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/commons-cli/commons-cli/1.2"/>
+    <get src="https://repo.maven.apache.org/maven2/commons-cli/commons-cli/1.2/commons-cli-1.2.jar" 
+         dest="${maven.repo.local}/commons-cli/commons-cli/1.2/commons-cli-1.2.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/commons-io/commons-io/2.0.1"/>
+    <get src="https://repo.maven.apache.org/maven2/commons-io/commons-io/2.0.1/commons-io-2.0.1.jar" 
+         dest="${maven.repo.local}/commons-io/commons-io/2.0.1/commons-io-2.0.1.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/org/italiangrid/voms-api-java/3.0.6"/>
+    <get src="https://repo.maven.apache.org/maven2/org/italiangrid/voms-api-java/3.0.6/voms-api-java-3.0.6.jar" 
+         dest="${maven.repo.local}/org/italiangrid/voms-api-java/3.0.6/voms-api-java-3.0.6.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/eu/eu-emi/security/canl/1.3.3"/>
+    <get src="https://repo.maven.apache.org/maven2/eu/eu-emi/security/canl/1.3.3/canl-1.3.3.jar" 
+         dest="${maven.repo.local}/eu/eu-emi/security/canl/1.3.3/canl-1.3.3.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/org/bouncycastle/bcprov-jdk16/1.46"/>
+    <get src="https://repo.maven.apache.org/maven2/org/bouncycastle/bcprov-jdk16/1.46/bcprov-jdk16-1.46.jar" 
+         dest="${maven.repo.local}/org/bouncycastle/bcprov-jdk16/1.46/bcprov-jdk16-1.46.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/org/italiangrid/bcmail/1.46.3"/>
+    <get src="https://repo.maven.apache.org/maven2/org/italiangrid/bcmail/1.46.3/bcmail-1.46.3.jar" 
+         dest="${maven.repo.local}/org/italiangrid/bcmail/1.46.3/bcmail-1.46.3.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/javax/mail/mail/1.4"/>
+    <get src="https://repo.maven.apache.org/maven2/javax/mail/mail/1.4/mail-1.4.jar" 
+         dest="${maven.repo.local}/javax/mail/mail/1.4/mail-1.4.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/javax/activation/activation/1.1"/>
+    <get src="https://repo.maven.apache.org/maven2/javax/activation/activation/1.1/activation-1.1.jar" 
+         dest="${maven.repo.local}/javax/activation/activation/1.1/activation-1.1.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+  </target>
+
+</project>
diff --git a/voms-clients-java.spec b/voms-clients-java.spec
index 67f5435..9aa0021 100644
--- a/voms-clients-java.spec
+++ b/voms-clients-java.spec
@@ -6,17 +6,31 @@ Summary:	Virtual Organization Membership Service Java clients
 License:	ASL 2.0
 URL:		https://wiki.italiangrid.it/VOMS
 Source0:	https://github.com/italiangrid/voms-clients/archive/v%{version}.tar.gz
+#		These are build instructions for ant generated from the maven
+#		build instructions using the maven ant plugin.
+#		These are used for building on EPEL 6 since there is no maven
+#		available there.
+Source1:	build.xml
+Source2:	maven-build.xml
+Source3:	maven-build.properties
 #		Uncaught exception (backport from upstream)
 Patch0:		%{name}-except.patch
 #		Adapt to canl-java 2.5
 Patch1:		%{name}-canl-2.5.patch
 BuildArch:	noarch
 
-BuildRequires:	maven-local
-BuildRequires:	mvn(commons-cli:commons-cli)
-BuildRequires:	mvn(commons-io:commons-io)
-BuildRequires:	mvn(org.italiangrid:voms-api-java)
+BuildRequires:	java-devel >= 1:1.6
+BuildRequires:	jpackage-utils
+BuildRequires:	ant
+BuildRequires:	ant-junit
+BuildRequires:	jakarta-commons-cli
+BuildRequires:	jakarta-commons-io
+BuildRequires:	junit4
 BuildRequires:	voms-api-java >= 3.2.0-5
+Requires:	java >= 1:1.6
+Requires:	jpackage-utils
+Requires:	jakarta-commons-cli
+Requires:	jakarta-commons-io
 Requires:	voms-api-java >= 3.2.0-5
 
 Requires(post):		%{_sbindir}/update-alternatives
@@ -42,42 +56,43 @@ voms-proxy-init, voms-proxy-destroy and voms-proxy-info.
 %setup -q -n voms-clients-%{version}
 %patch0 -p1
 %patch1 -p1
-
-# Do not create source jars
-%pom_remove_plugin org.apache.maven.plugins:maven-source-plugin
-
-# Don't do assembly
-%pom_remove_plugin :maven-assembly-plugin
-
-# Remove license plugin
-%pom_remove_plugin com.mycila.maven-license-plugin:maven-license-plugin
+cp -p %{SOURCE1} .
+cp -p %{SOURCE2} .
+cp -p %{SOURCE3} .
 
 %build
-%mvn_build -j
+export CLASSPATH=$(build-classpath voms-api-java canl bcpkix bcprov commons-cli commons-io junit4)
+%ant -Dbuild.sysclasspath=last package
 
 %install
-%mvn_install
+mkdir -p %{buildroot}%{_javadir}
+install -m 644 target/voms-clients-%{version}.jar \
+    %{buildroot}%{_javadir}/voms-clients.jar
+
+mkdir -p %{buildroot}%{_mavenpomdir}
+install -p -m 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-voms-clients.pom
+%add_to_maven_depmap org.italiangrid voms-clients %{version} JPP voms-clients
 
 mkdir -p %{buildroot}%{_bindir}
 
 cat > %{buildroot}%{_bindir}/voms-proxy-init3 << EOF
 #!/bin/sh
 VOMS_CLIENTS_JAVA_OPTIONS=\${VOMS_CLIENTS_JAVA_OPTIONS:-"-XX:+UseSerialGC -Xmx16m"}
-java \$VOMS_CLIENTS_JAVA_OPTIONS -cp \$(build-classpath voms-clients-java voms-api-java canl-java bcpkix bcprov commons-cli commons-io) org.italiangrid.voms.clients.VomsProxyInit "\$@"
+java \$VOMS_CLIENTS_JAVA_OPTIONS -cp \$(build-classpath voms-clients voms-api-java canl bcpkix bcprov commons-cli commons-io) org.italiangrid.voms.clients.VomsProxyInit "\$@"
 EOF
 chmod 755 %{buildroot}%{_bindir}/voms-proxy-init3
 
 cat > %{buildroot}%{_bindir}/voms-proxy-info3 << EOF
 #!/bin/sh
 VOMS_CLIENTS_JAVA_OPTIONS=\${VOMS_CLIENTS_JAVA_OPTIONS:-"-XX:+UseSerialGC -Xmx16m"}
-java \$VOMS_CLIENTS_JAVA_OPTIONS -cp \$(build-classpath voms-clients-java voms-api-java canl-java bcpkix bcprov commons-cli commons-io) org.italiangrid.voms.clients.VomsProxyInfo "\$@"
+java \$VOMS_CLIENTS_JAVA_OPTIONS -cp \$(build-classpath voms-clients voms-api-java canl bcpkix bcprov commons-cli commons-io) org.italiangrid.voms.clients.VomsProxyInfo "\$@"
 EOF
 chmod 755 %{buildroot}%{_bindir}/voms-proxy-info3
 
 cat > %{buildroot}%{_bindir}/voms-proxy-destroy3 << EOF
 #!/bin/sh
 VOMS_CLIENTS_JAVA_OPTIONS=\${VOMS_CLIENTS_JAVA_OPTIONS:-"-XX:+UseSerialGC -Xmx16m"}
-java \$VOMS_CLIENTS_JAVA_OPTIONS -cp \$(build-classpath voms-clients-java voms-api-java canl-java bcpkix bcprov commons-cli commons-io) org.italiangrid.voms.clients.VomsProxyDestroy "\$@"
+java \$VOMS_CLIENTS_JAVA_OPTIONS -cp \$(build-classpath voms-clients voms-api-java canl bcpkix bcprov commons-cli commons-io) org.italiangrid.voms.clients.VomsProxyDestroy "\$@"
 EOF
 chmod 755 %{buildroot}%{_bindir}/voms-proxy-destroy3
 
@@ -105,6 +120,7 @@ install -p -m 644 man/vomsdir.5 %{buildroot}%{_mandir}/man5/vomsdir.5
 install -p -m 644 man/vomses.5 %{buildroot}%{_mandir}/man5/vomses.5
 
 %post
+%update_maven_depmap
 %{_sbindir}/update-alternatives --install %{_bindir}/voms-proxy-init \
     voms-proxy-init %{_bindir}/voms-proxy-init3 90 \
     --slave %{_mandir}/man1/voms-proxy-init.1.gz voms-proxy-init-man \
@@ -119,6 +135,7 @@ install -p -m 644 man/vomses.5 %{buildroot}%{_mandir}/man5/vomses.5
     %{_mandir}/man1/voms-proxy-destroy3.1.gz
 
 %postun
+%update_maven_depmap
 if [ $1 -eq 0 ] ; then
     %{_sbindir}/update-alternatives --remove voms-proxy-init \
     %{_bindir}/voms-proxy-init3
@@ -128,8 +145,10 @@ if [ $1 -eq 0 ] ; then
     %{_bindir}/voms-proxy-destroy3
 fi
 
-%files -f .mfiles
-%dir %{_javadir}/%{name}
+%files
+%{_javadir}/voms-clients.jar
+%{_mavenpomdir}/JPP-voms-clients.pom
+%{_mavendepmapfragdir}/%{name}
 %{_bindir}/voms-proxy-destroy3
 %{_bindir}/voms-proxy-info3
 %{_bindir}/voms-proxy-init3
@@ -150,6 +169,7 @@ fi
 %changelog
 * Fri Jan 05 2018 Mattias Ellert <mattias.ellert@physics.uu.se> - 3.0.7-5
 - Adapt to canl-java 2.5
+- Create EPEL 6 package using the maven ant plugin
 
 * Tue Aug 08 2017 Mattias Ellert <mattias.ellert@physics.uu.se> - 3.0.7-4
 - Don't do assembly

From 389a3a385a5121b90ddaa971dda4bb47d243f751 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Thu, 11 Jan 2018 10:00:31 +0100
Subject: [PATCH 2/6] Add Provides/Obsoletes voms-clients3

---
 voms-clients-java.spec | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/voms-clients-java.spec b/voms-clients-java.spec
index 9aa0021..23de61d 100644
--- a/voms-clients-java.spec
+++ b/voms-clients-java.spec
@@ -1,6 +1,6 @@
 Name:		voms-clients-java
 Version:	3.0.7
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Virtual Organization Membership Service Java clients
 
 License:	ASL 2.0
@@ -40,6 +40,8 @@ Requires(postun):	%{_sbindir}/update-alternatives
 Conflicts:	voms-clients < 2.0.12
 
 Provides:	voms-clients = %{version}-%{release}
+Provides:	voms-clients3 = %{version}-%{release}
+Obsoletes:	voms-clients3 < %{version}-%{release}
 
 %description
 The Virtual Organization Membership Service (VOMS) is an attribute authority
@@ -167,6 +169,9 @@ fi
 %license LICENSE
 
 %changelog
+* Thu Jan 11 2018 Mattias Ellert <mattias.ellert@physics.uu.se> - 3.0.7-6
+- Add Provides/Obsoletes voms-clients3
+
 * Fri Jan 05 2018 Mattias Ellert <mattias.ellert@physics.uu.se> - 3.0.7-5
 - Adapt to canl-java 2.5
 - Create EPEL 6 package using the maven ant plugin

From 9295b4a6f22e1858d5fd8bb4abf3a88e8a581aba Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Thu, 8 Feb 2018 18:41:35 +0100
Subject: [PATCH 3/6] Build against bouncycastle1.58 Update to version 3.3.0
 Drop patches voms-clients-java-except.patch and -canl-2.5.patch

---
 maven-build.properties           |   6 +-
 maven-build.xml                  |  66 ++++++---------
 sources                          |   2 +-
 voms-clients-java-canl-2.5.patch | 141 -------------------------------
 voms-clients-java-except.patch   |  20 -----
 voms-clients-java.spec           |  39 ++++-----
 6 files changed, 50 insertions(+), 224 deletions(-)
 delete mode 100644 voms-clients-java-canl-2.5.patch
 delete mode 100644 voms-clients-java-except.patch

diff --git a/maven-build.properties b/maven-build.properties
index 0243911..6cc998a 100644
--- a/maven-build.properties
+++ b/maven-build.properties
@@ -1,8 +1,8 @@
 #Generated by Maven Ant Plugin - DO NOT EDIT THIS FILE!
-#Fri Jan 05 18:12:39 CET 2018
+#Thu Feb 08 18:18:47 CET 2018
 maven.settings.offline=true
-voms-api-java.version=3.0.6
-maven.build.finalName=voms-clients-3.0.7
+voms-api-java.version=3.3.0
+maven.build.finalName=voms-clients-3.3.0
 commons-cli.version=1.2
 plugin.license.version=1.9.0
 maven.build.resourceDir.0=src/main/resources
diff --git a/maven-build.xml b/maven-build.xml
index 5fca40a..ade8119 100644
--- a/maven-build.xml
+++ b/maven-build.xml
@@ -10,7 +10,7 @@
 <!--                                                                        -->
 <!-- Any modifications will be overwritten.                                 -->
 <!--                                                                        -->
-<!-- Generated by Maven Ant Plugin on 1/5/18 6:12 PM                        -->
+<!-- Generated by Maven Ant Plugin on 2/8/18 6:18 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-clients-3.0.7"/>
+  <property name="maven.build.finalName" value="voms-clients-3.3.0"/>
   <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"/>
@@ -46,24 +46,20 @@
   <path id="build.classpath">
     <pathelement location="${maven.repo.local}/commons-cli/commons-cli/1.2/commons-cli-1.2.jar"/>
     <pathelement location="${maven.repo.local}/commons-io/commons-io/2.0.1/commons-io-2.0.1.jar"/>
-    <pathelement location="${maven.repo.local}/org/italiangrid/voms-api-java/3.0.6/voms-api-java-3.0.6.jar"/>
-    <pathelement location="${maven.repo.local}/eu/eu-emi/security/canl/1.3.3/canl-1.3.3.jar"/>
-    <pathelement location="${maven.repo.local}/org/bouncycastle/bcprov-jdk16/1.46/bcprov-jdk16-1.46.jar"/>
-    <pathelement location="${maven.repo.local}/org/italiangrid/bcmail/1.46.3/bcmail-1.46.3.jar"/>
-    <pathelement location="${maven.repo.local}/javax/mail/mail/1.4/mail-1.4.jar"/>
-    <pathelement location="${maven.repo.local}/javax/activation/activation/1.1/activation-1.1.jar"/>
+    <pathelement location="${maven.repo.local}/org/italiangrid/voms-api-java/3.3.0/voms-api-java-3.3.0.jar"/>
+    <pathelement location="${maven.repo.local}/eu/eu-emi/security/canl/2.5.0/canl-2.5.0.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"/>
   </path>
   <path id="build.test.classpath">
     <pathelement location="${maven.repo.local}/junit/junit/4.10/junit-4.10.jar"/>
     <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/>
     <pathelement location="${maven.repo.local}/commons-cli/commons-cli/1.2/commons-cli-1.2.jar"/>
     <pathelement location="${maven.repo.local}/commons-io/commons-io/2.0.1/commons-io-2.0.1.jar"/>
-    <pathelement location="${maven.repo.local}/org/italiangrid/voms-api-java/3.0.6/voms-api-java-3.0.6.jar"/>
-    <pathelement location="${maven.repo.local}/eu/eu-emi/security/canl/1.3.3/canl-1.3.3.jar"/>
-    <pathelement location="${maven.repo.local}/org/bouncycastle/bcprov-jdk16/1.46/bcprov-jdk16-1.46.jar"/>
-    <pathelement location="${maven.repo.local}/org/italiangrid/bcmail/1.46.3/bcmail-1.46.3.jar"/>
-    <pathelement location="${maven.repo.local}/javax/mail/mail/1.4/mail-1.4.jar"/>
-    <pathelement location="${maven.repo.local}/javax/activation/activation/1.1/activation-1.1.jar"/>
+    <pathelement location="${maven.repo.local}/org/italiangrid/voms-api-java/3.3.0/voms-api-java-3.3.0.jar"/>
+    <pathelement location="${maven.repo.local}/eu/eu-emi/security/canl/2.5.0/canl-2.5.0.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"/>
   </path>
 
   <!-- ====================================================================== -->
@@ -85,10 +81,10 @@
            debug="true" 
            optimize="false" 
            deprecation="true" 
-           target="1.6" 
+           target="1.8" 
            verbose="false" 
            fork="false" 
-           source="1.6">
+           source="1.8">
       <src>
         <pathelement location="${maven.build.srcDir.0}"/>
       </src>
@@ -113,10 +109,10 @@
            debug="true" 
            optimize="false" 
            deprecation="true" 
-           target="1.6" 
+           target="1.8" 
            verbose="false" 
            fork="false" 
-           source="1.6">
+           source="1.8">
       <src>
         <pathelement location="${maven.build.testDir.0}"/>
       </src>
@@ -270,34 +266,24 @@
          dest="${maven.repo.local}/commons-io/commons-io/2.0.1/commons-io-2.0.1.jar" 
          usetimestamp="false" 
          ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/org/italiangrid/voms-api-java/3.0.6"/>
-    <get src="https://repo.maven.apache.org/maven2/org/italiangrid/voms-api-java/3.0.6/voms-api-java-3.0.6.jar" 
-         dest="${maven.repo.local}/org/italiangrid/voms-api-java/3.0.6/voms-api-java-3.0.6.jar" 
+    <mkdir dir="${maven.repo.local}/org/italiangrid/voms-api-java/3.3.0"/>
+    <get src="https://repo.maven.apache.org/maven2/org/italiangrid/voms-api-java/3.3.0/voms-api-java-3.3.0.jar" 
+         dest="${maven.repo.local}/org/italiangrid/voms-api-java/3.3.0/voms-api-java-3.3.0.jar" 
          usetimestamp="false" 
          ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/eu/eu-emi/security/canl/1.3.3"/>
-    <get src="https://repo.maven.apache.org/maven2/eu/eu-emi/security/canl/1.3.3/canl-1.3.3.jar" 
-         dest="${maven.repo.local}/eu/eu-emi/security/canl/1.3.3/canl-1.3.3.jar" 
+    <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" 
          usetimestamp="false" 
          ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/org/bouncycastle/bcprov-jdk16/1.46"/>
-    <get src="https://repo.maven.apache.org/maven2/org/bouncycastle/bcprov-jdk16/1.46/bcprov-jdk16-1.46.jar" 
-         dest="${maven.repo.local}/org/bouncycastle/bcprov-jdk16/1.46/bcprov-jdk16-1.46.jar" 
+    <mkdir dir="${maven.repo.local}/org/bouncycastle/bcpkix-jdk15on/1.58"/>
+    <get src="https://repo.maven.apache.org/maven2/org/bouncycastle/bcpkix-jdk15on/1.58/bcpkix-jdk15on-1.58.jar" 
+         dest="${maven.repo.local}/org/bouncycastle/bcpkix-jdk15on/1.58/bcpkix-jdk15on-1.58.jar" 
          usetimestamp="false" 
          ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/org/italiangrid/bcmail/1.46.3"/>
-    <get src="https://repo.maven.apache.org/maven2/org/italiangrid/bcmail/1.46.3/bcmail-1.46.3.jar" 
-         dest="${maven.repo.local}/org/italiangrid/bcmail/1.46.3/bcmail-1.46.3.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/javax/mail/mail/1.4"/>
-    <get src="https://repo.maven.apache.org/maven2/javax/mail/mail/1.4/mail-1.4.jar" 
-         dest="${maven.repo.local}/javax/mail/mail/1.4/mail-1.4.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/javax/activation/activation/1.1"/>
-    <get src="https://repo.maven.apache.org/maven2/javax/activation/activation/1.1/activation-1.1.jar" 
-         dest="${maven.repo.local}/javax/activation/activation/1.1/activation-1.1.jar" 
+    <mkdir dir="${maven.repo.local}/org/bouncycastle/bcprov-jdk15on/1.58"/>
+    <get src="https://repo.maven.apache.org/maven2/org/bouncycastle/bcprov-jdk15on/1.58/bcprov-jdk15on-1.58.jar" 
+         dest="${maven.repo.local}/org/bouncycastle/bcprov-jdk15on/1.58/bcprov-jdk15on-1.58.jar" 
          usetimestamp="false" 
          ignoreerrors="true"/>
   </target>
diff --git a/sources b/sources
index 60ca32b..9e9ee9f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2f490ab2686722659049cf18a89b7355  v3.0.7.tar.gz
+SHA512 (voms-clients-java-3.3.0.tar.gz) = 854c38c43d7220da3bfed370a98f74864b78c486e87ef2083e0c278d7ed94f2eb3ffc2557027790a4f69905b757dfcc047c1dcc428933a859bbb6657dfcc17b3
diff --git a/voms-clients-java-canl-2.5.patch b/voms-clients-java-canl-2.5.patch
deleted file mode 100644
index 0a9b788..0000000
--- a/voms-clients-java-canl-2.5.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-diff -ur voms-clients-3.0.7.orig/src/main/java/org/italiangrid/voms/clients/impl/DefaultVOMSProxyInitBehaviour.java voms-clients-3.0.7/src/main/java/org/italiangrid/voms/clients/impl/DefaultVOMSProxyInitBehaviour.java
---- voms-clients-3.0.7.orig/src/main/java/org/italiangrid/voms/clients/impl/DefaultVOMSProxyInitBehaviour.java	2016-09-09 12:06:42.000000000 +0200
-+++ voms-clients-3.0.7/src/main/java/org/italiangrid/voms/clients/impl/DefaultVOMSProxyInitBehaviour.java	2018-01-05 16:06:00.586887063 +0100
-@@ -31,7 +31,7 @@
- import java.util.concurrent.TimeUnit;
- 
- import org.bouncycastle.asn1.x509.AttributeCertificate;
--import org.bouncycastle.openssl.PasswordFinder;
-+import eu.emi.security.authn.x509.helpers.PasswordSupplier;
- import org.italiangrid.voms.VOMSError;
- import org.italiangrid.voms.VOMSValidators;
- import org.italiangrid.voms.ac.VOMSACValidator;
-@@ -590,7 +590,7 @@
- 
-   private X509Credential lookupCredential(ProxyInitParams params) {
- 
--    PasswordFinder pf = null;
-+    PasswordSupplier pf = null;
- 
-     if (params.isReadPasswordFromStdin())
-       pf = PasswordFinders.getNoPromptInputStreamPasswordFinder(System.in,
-diff -ur voms-clients-3.0.7.orig/src/main/java/org/italiangrid/voms/clients/impl/LoadProxyCredential.java voms-clients-3.0.7/src/main/java/org/italiangrid/voms/clients/impl/LoadProxyCredential.java
---- voms-clients-3.0.7.orig/src/main/java/org/italiangrid/voms/clients/impl/LoadProxyCredential.java	2016-09-09 12:06:42.000000000 +0200
-+++ voms-clients-3.0.7/src/main/java/org/italiangrid/voms/clients/impl/LoadProxyCredential.java	2018-01-05 16:06:00.587887052 +0100
-@@ -15,7 +15,7 @@
-  */
- package org.italiangrid.voms.clients.impl;
- 
--import org.bouncycastle.openssl.PasswordFinder;
-+import eu.emi.security.authn.x509.helpers.PasswordSupplier;
- import org.italiangrid.voms.clients.util.VOMSProxyPathBuilder;
- import org.italiangrid.voms.credential.LoadCredentialsEventListener;
- import org.italiangrid.voms.credential.impl.AbstractLoadCredentialsStrategy;
-@@ -39,7 +39,7 @@
-   }
- 
-   @Override
--  public X509Credential loadCredentials(PasswordFinder passwordFinder) {
-+  public X509Credential loadCredentials(PasswordSupplier passwordFinder) {
- 
-     if (proxyFile == null) {
-       String envProxyPath = System.getenv(X509_USER_PROXY);
-diff -ur voms-clients-3.0.7.orig/src/main/java/org/italiangrid/voms/clients/impl/LoadUserCredential.java voms-clients-3.0.7/src/main/java/org/italiangrid/voms/clients/impl/LoadUserCredential.java
---- voms-clients-3.0.7.orig/src/main/java/org/italiangrid/voms/clients/impl/LoadUserCredential.java	2016-09-09 12:06:42.000000000 +0200
-+++ voms-clients-3.0.7/src/main/java/org/italiangrid/voms/clients/impl/LoadUserCredential.java	2018-01-05 16:06:00.587887052 +0100
-@@ -15,7 +15,7 @@
-  */
- package org.italiangrid.voms.clients.impl;
- 
--import org.bouncycastle.openssl.PasswordFinder;
-+import eu.emi.security.authn.x509.helpers.PasswordSupplier;
- import org.italiangrid.voms.credential.LoadCredentialsEventListener;
- import org.italiangrid.voms.credential.impl.AbstractLoadCredentialsStrategy;
- 
-@@ -44,7 +44,7 @@
-   }
- 
-   @Override
--  public X509Credential loadCredentials(PasswordFinder passwordFinder) {
-+  public X509Credential loadCredentials(PasswordSupplier passwordFinder) {
- 
-     if (pkcs12File != null)
-       return loadPKCS12Credential(pkcs12File, passwordFinder);
-diff -ur voms-clients-3.0.7.orig/src/main/java/org/italiangrid/voms/clients/util/ConsolePasswordFinder.java voms-clients-3.0.7/src/main/java/org/italiangrid/voms/clients/util/ConsolePasswordFinder.java
---- voms-clients-3.0.7.orig/src/main/java/org/italiangrid/voms/clients/util/ConsolePasswordFinder.java	2016-09-09 12:06:42.000000000 +0200
-+++ voms-clients-3.0.7/src/main/java/org/italiangrid/voms/clients/util/ConsolePasswordFinder.java	2018-01-05 16:06:00.583887096 +0100
-@@ -17,7 +17,7 @@
- 
- import java.io.Console;
- 
--import org.bouncycastle.openssl.PasswordFinder;
-+import eu.emi.security.authn.x509.helpers.PasswordSupplier;
- import org.italiangrid.voms.VOMSError;
- 
- /**
-@@ -25,7 +25,7 @@
-  * @author andreaceccanti
-  * 
-  */
--public class ConsolePasswordFinder implements PasswordFinder {
-+public class ConsolePasswordFinder implements PasswordSupplier {
- 
-   private String promptMessage;
- 
-diff -ur voms-clients-3.0.7.orig/src/main/java/org/italiangrid/voms/clients/util/InputStreamPasswordFinder.java voms-clients-3.0.7/src/main/java/org/italiangrid/voms/clients/util/InputStreamPasswordFinder.java
---- voms-clients-3.0.7.orig/src/main/java/org/italiangrid/voms/clients/util/InputStreamPasswordFinder.java	2016-09-09 12:06:42.000000000 +0200
-+++ voms-clients-3.0.7/src/main/java/org/italiangrid/voms/clients/util/InputStreamPasswordFinder.java	2018-01-05 16:06:00.584887085 +0100
-@@ -22,10 +22,10 @@
- import java.io.OutputStream;
- import java.io.PrintStream;
- 
--import org.bouncycastle.openssl.PasswordFinder;
-+import eu.emi.security.authn.x509.helpers.PasswordSupplier;
- import org.italiangrid.voms.VOMSError;
- 
--public class InputStreamPasswordFinder implements PasswordFinder {
-+public class InputStreamPasswordFinder implements PasswordSupplier {
- 
-   InputStream is;
-   PrintStream os;
-diff -ur voms-clients-3.0.7.orig/src/main/java/org/italiangrid/voms/clients/util/PasswordFinders.java voms-clients-3.0.7/src/main/java/org/italiangrid/voms/clients/util/PasswordFinders.java
---- voms-clients-3.0.7.orig/src/main/java/org/italiangrid/voms/clients/util/PasswordFinders.java	2016-09-09 12:06:42.000000000 +0200
-+++ voms-clients-3.0.7/src/main/java/org/italiangrid/voms/clients/util/PasswordFinders.java	2018-01-05 16:06:00.584887085 +0100
-@@ -18,13 +18,13 @@
- import java.io.InputStream;
- import java.io.OutputStream;
- 
--import org.bouncycastle.openssl.PasswordFinder;
-+import eu.emi.security.authn.x509.helpers.PasswordSupplier;
- 
- public class PasswordFinders {
- 
-   public static final String PROMPT_MESSAGE = "Enter GRID pass phrase for this identity:";
- 
--  public static PasswordFinder getDefault() {
-+  public static PasswordSupplier getDefault() {
- 
-     if (System.console() != null)
-       return new ConsolePasswordFinder(PROMPT_MESSAGE);
-@@ -32,18 +32,18 @@
-     return new InputStreamPasswordFinder(PROMPT_MESSAGE, System.in, System.out);
-   }
- 
--  public static PasswordFinder getConsolePasswordFinder() {
-+  public static PasswordSupplier getConsolePasswordFinder() {
- 
-     return new ConsolePasswordFinder(PROMPT_MESSAGE);
-   }
- 
--  public static PasswordFinder getInputStreamPasswordFinder(InputStream is,
-+  public static PasswordSupplier getInputStreamPasswordFinder(InputStream is,
-     OutputStream os) {
- 
-     return new InputStreamPasswordFinder(PROMPT_MESSAGE, is, os);
-   }
- 
--  public static PasswordFinder getNoPromptInputStreamPasswordFinder(
-+  public static PasswordSupplier getNoPromptInputStreamPasswordFinder(
-     InputStream is, OutputStream os) {
- 
-     return new InputStreamPasswordFinder(null, is, os);
diff --git a/voms-clients-java-except.patch b/voms-clients-java-except.patch
deleted file mode 100644
index 3de0d93..0000000
--- a/voms-clients-java-except.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -ur voms-clients-3.0.7.orig/src/main/java/org/italiangrid/voms/clients/impl/DefaultVOMSProxyInitBehaviour.java voms-clients-3.0.7/src/main/java/org/italiangrid/voms/clients/impl/DefaultVOMSProxyInitBehaviour.java
---- voms-clients-3.0.7.orig/src/main/java/org/italiangrid/voms/clients/impl/DefaultVOMSProxyInitBehaviour.java	2016-09-09 12:06:42.000000000 +0200
-+++ voms-clients-3.0.7/src/main/java/org/italiangrid/voms/clients/impl/DefaultVOMSProxyInitBehaviour.java	2018-01-05 16:34:10.919346599 +0100
-@@ -457,12 +457,12 @@
-     if (params.isLimited())
-       limitProxy(proxyOptions);
- 
--    if (acs != null && !acs.isEmpty())
--      proxyOptions.setAttributeCertificates(
--        acs.toArray(new AttributeCertificate[acs.size()]));
--
-     try {
- 
-+      if (acs != null && !acs.isEmpty())
-+        proxyOptions.setAttributeCertificates(
-+          acs.toArray(new AttributeCertificate[acs.size()]));
-+
-       ProxyCertificate proxy = ProxyGenerator.generate(proxyOptions,
-         credential.getKey());
- 
diff --git a/voms-clients-java.spec b/voms-clients-java.spec
index 23de61d..a47ae53 100644
--- a/voms-clients-java.spec
+++ b/voms-clients-java.spec
@@ -1,11 +1,11 @@
 Name:		voms-clients-java
-Version:	3.0.7
-Release:	6%{?dist}
+Version:	3.3.0
+Release:	1%{?dist}
 Summary:	Virtual Organization Membership Service Java clients
 
 License:	ASL 2.0
 URL:		https://wiki.italiangrid.it/VOMS
-Source0:	https://github.com/italiangrid/voms-clients/archive/v%{version}.tar.gz
+Source0:	https://github.com/italiangrid/voms-clients/archive/v%{version}/%{name}-%{version}.tar.gz
 #		These are build instructions for ant generated from the maven
 #		build instructions using the maven ant plugin.
 #		These are used for building on EPEL 6 since there is no maven
@@ -13,25 +13,23 @@ Source0:	https://github.com/italiangrid/voms-clients/archive/v%{version}.tar.gz
 Source1:	build.xml
 Source2:	maven-build.xml
 Source3:	maven-build.properties
-#		Uncaught exception (backport from upstream)
-Patch0:		%{name}-except.patch
-#		Adapt to canl-java 2.5
-Patch1:		%{name}-canl-2.5.patch
 BuildArch:	noarch
+#		There is no jakarta-commons-io for ppc64 in EPEL6
+ExcludeArch:	ppc64
 
-BuildRequires:	java-devel >= 1:1.6
+BuildRequires:	java-1.8.0-openjdk-devel
 BuildRequires:	jpackage-utils
 BuildRequires:	ant
 BuildRequires:	ant-junit
 BuildRequires:	jakarta-commons-cli
 BuildRequires:	jakarta-commons-io
 BuildRequires:	junit4
-BuildRequires:	voms-api-java >= 3.2.0-5
-Requires:	java >= 1:1.6
+BuildRequires:	voms-api-java >= 3.3.0
+Requires:	java >= 1:1.8
 Requires:	jpackage-utils
 Requires:	jakarta-commons-cli
 Requires:	jakarta-commons-io
-Requires:	voms-api-java >= 3.2.0-5
+Requires:	voms-api-java >= 3.3.0
 
 Requires(post):		%{_sbindir}/update-alternatives
 Requires(postun):	%{_sbindir}/update-alternatives
@@ -41,7 +39,7 @@ Conflicts:	voms-clients < 2.0.12
 
 Provides:	voms-clients = %{version}-%{release}
 Provides:	voms-clients3 = %{version}-%{release}
-Obsoletes:	voms-clients3 < %{version}-%{release}
+Obsoletes:	voms-clients3 < 3.1
 
 %description
 The Virtual Organization Membership Service (VOMS) is an attribute authority
@@ -56,14 +54,12 @@ voms-proxy-init, voms-proxy-destroy and voms-proxy-info.
 
 %prep
 %setup -q -n voms-clients-%{version}
-%patch0 -p1
-%patch1 -p1
 cp -p %{SOURCE1} .
 cp -p %{SOURCE2} .
 cp -p %{SOURCE3} .
 
 %build
-export CLASSPATH=$(build-classpath voms-api-java canl bcpkix bcprov commons-cli commons-io junit4)
+export CLASSPATH=$(build-classpath voms-api-java canl bcpkix-1.58 bcprov-1.58 commons-cli commons-io junit4)
 %ant -Dbuild.sysclasspath=last package
 
 %install
@@ -80,21 +76,21 @@ mkdir -p %{buildroot}%{_bindir}
 cat > %{buildroot}%{_bindir}/voms-proxy-init3 << EOF
 #!/bin/sh
 VOMS_CLIENTS_JAVA_OPTIONS=\${VOMS_CLIENTS_JAVA_OPTIONS:-"-XX:+UseSerialGC -Xmx16m"}
-java \$VOMS_CLIENTS_JAVA_OPTIONS -cp \$(build-classpath voms-clients voms-api-java canl bcpkix bcprov commons-cli commons-io) org.italiangrid.voms.clients.VomsProxyInit "\$@"
+java \$VOMS_CLIENTS_JAVA_OPTIONS -cp \$(build-classpath voms-clients voms-api-java canl bcpkix-1.58 bcprov-1.58 commons-cli commons-io) org.italiangrid.voms.clients.VomsProxyInit "\$@"
 EOF
 chmod 755 %{buildroot}%{_bindir}/voms-proxy-init3
 
 cat > %{buildroot}%{_bindir}/voms-proxy-info3 << EOF
 #!/bin/sh
 VOMS_CLIENTS_JAVA_OPTIONS=\${VOMS_CLIENTS_JAVA_OPTIONS:-"-XX:+UseSerialGC -Xmx16m"}
-java \$VOMS_CLIENTS_JAVA_OPTIONS -cp \$(build-classpath voms-clients voms-api-java canl bcpkix bcprov commons-cli commons-io) org.italiangrid.voms.clients.VomsProxyInfo "\$@"
+java \$VOMS_CLIENTS_JAVA_OPTIONS -cp \$(build-classpath voms-clients voms-api-java canl bcpkix-1.58 bcprov-1.58 commons-cli commons-io) org.italiangrid.voms.clients.VomsProxyInfo "\$@"
 EOF
 chmod 755 %{buildroot}%{_bindir}/voms-proxy-info3
 
 cat > %{buildroot}%{_bindir}/voms-proxy-destroy3 << EOF
 #!/bin/sh
 VOMS_CLIENTS_JAVA_OPTIONS=\${VOMS_CLIENTS_JAVA_OPTIONS:-"-XX:+UseSerialGC -Xmx16m"}
-java \$VOMS_CLIENTS_JAVA_OPTIONS -cp \$(build-classpath voms-clients voms-api-java canl bcpkix bcprov commons-cli commons-io) org.italiangrid.voms.clients.VomsProxyDestroy "\$@"
+java \$VOMS_CLIENTS_JAVA_OPTIONS -cp \$(build-classpath voms-clients voms-api-java canl bcpkix-1.58 bcprov-1.58 commons-cli commons-io) org.italiangrid.voms.clients.VomsProxyDestroy "\$@"
 EOF
 chmod 755 %{buildroot}%{_bindir}/voms-proxy-destroy3
 
@@ -150,7 +146,7 @@ fi
 %files
 %{_javadir}/voms-clients.jar
 %{_mavenpomdir}/JPP-voms-clients.pom
-%{_mavendepmapfragdir}/%{name}
+%config(noreplace) %{_mavendepmapfragdir}/%{name}
 %{_bindir}/voms-proxy-destroy3
 %{_bindir}/voms-proxy-info3
 %{_bindir}/voms-proxy-init3
@@ -169,6 +165,11 @@ fi
 %license LICENSE
 
 %changelog
+* 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
+- Drop patches voms-clients-java-except.patch and -canl-2.5.patch
+
 * Thu Jan 11 2018 Mattias Ellert <mattias.ellert@physics.uu.se> - 3.0.7-6
 - Add Provides/Obsoletes voms-clients3
 

From 41231430d73f9d5baafa2b8641c2ef23d5f6a07d Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Tue, 10 Apr 2018 15:02:09 +0200
Subject: [PATCH 4/6] Add trigger scriptlet to restore removed alternatives

---
 voms-clients-java.spec | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/voms-clients-java.spec b/voms-clients-java.spec
index a47ae53..855a933 100644
--- a/voms-clients-java.spec
+++ b/voms-clients-java.spec
@@ -1,6 +1,6 @@
 Name:		voms-clients-java
 Version:	3.3.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Virtual Organization Membership Service Java clients
 
 License:	ASL 2.0
@@ -143,6 +143,22 @@ if [ $1 -eq 0 ] ; then
     %{_bindir}/voms-proxy-destroy3
 fi
 
+%triggerpostun -- voms-clients3
+# Uninstalling the UMD voms-clients3 package will remove the alternatives
+# for voms-clients-java - put them back in this triggerpostun script
+%{_sbindir}/update-alternatives --install %{_bindir}/voms-proxy-init \
+    voms-proxy-init %{_bindir}/voms-proxy-init3 90 \
+    --slave %{_mandir}/man1/voms-proxy-init.1.gz voms-proxy-init-man \
+    %{_mandir}/man1/voms-proxy-init3.1.gz
+%{_sbindir}/update-alternatives --install %{_bindir}/voms-proxy-info \
+    voms-proxy-info %{_bindir}/voms-proxy-info3 90 \
+    --slave %{_mandir}/man1/voms-proxy-info.1.gz voms-proxy-info-man \
+    %{_mandir}/man1/voms-proxy-info3.1.gz
+%{_sbindir}/update-alternatives --install %{_bindir}/voms-proxy-destroy \
+    voms-proxy-destroy %{_bindir}/voms-proxy-destroy3 90 \
+    --slave %{_mandir}/man1/voms-proxy-destroy.1.gz voms-proxy-destroy-man \
+    %{_mandir}/man1/voms-proxy-destroy3.1.gz
+
 %files
 %{_javadir}/voms-clients.jar
 %{_mavenpomdir}/JPP-voms-clients.pom
@@ -165,6 +181,9 @@ fi
 %license LICENSE
 
 %changelog
+* Tue Apr 10 2018 Mattias Ellert <mattias.ellert@physics.uu.se> - 3.3.0-2
+- Add trigger scriptlet to restore removed alternatives
+
 * 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

From 32d19250a90345f6f6bd21e9938048ebc9295ef1 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Wed, 31 Oct 2018 17:01:04 +0100
Subject: [PATCH 5/6] Change default proxy cert key length to 2048 bits Use a
 more sensible timeout

---
 ...t-proxy-cert-key-length-to-2048-bits.patch | 48 +++++++++++++++++++
 ...nts-java-use-a-more-sensible-timeout.patch | 25 ++++++++++
 voms-clients-java.spec                        | 14 +++++-
 3 files changed, 86 insertions(+), 1 deletion(-)
 create mode 100644 voms-clients-java-change-default-proxy-cert-key-length-to-2048-bits.patch
 create mode 100644 voms-clients-java-use-a-more-sensible-timeout.patch

diff --git a/voms-clients-java-change-default-proxy-cert-key-length-to-2048-bits.patch b/voms-clients-java-change-default-proxy-cert-key-length-to-2048-bits.patch
new file mode 100644
index 0000000..c882966
--- /dev/null
+++ b/voms-clients-java-change-default-proxy-cert-key-length-to-2048-bits.patch
@@ -0,0 +1,48 @@
+From 2dcbb765d60078c2148f77a1a873895829c7e18e Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Wed, 31 Oct 2018 14:52:28 +0100
+Subject: [PATCH] Change default proxy cert key length to 2048 bits
+
+---
+ README.md                                                     | 4 ++--
+ .../java/org/italiangrid/voms/clients/ProxyInitParams.java    | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/README.md b/README.md
+index 85743f1..72fd068 100644
+--- a/README.md
++++ b/README.md
+@@ -108,7 +108,7 @@ subject   : /C=IT/O=INFN/OU=Personal Certificate/L=CNAF/CN=Andrea Ceccanti/CN=pr
+ issuer    : /C=IT/O=INFN/OU=Personal Certificate/L=CNAF/CN=Andrea Ceccanti
+ identity  : /C=IT/O=INFN/OU=Personal Certificate/L=CNAF/CN=Andrea Ceccanti
+ type      : proxy
+-strength  : 1024
++strength  : 2048
+ path      : /tmp/x509up_u501
+ timeleft  : 11:59:48
+ key usage : digitalSignature keyEncipherment dataEncipherment
+@@ -122,7 +122,7 @@ subject   : /C=IT/O=INFN/OU=Personal Certificate/L=CNAF/CN=Andrea Ceccanti/CN=pr
+ issuer    : /C=IT/O=INFN/OU=Personal Certificate/L=CNAF/CN=Andrea Ceccanti
+ identity  : /C=IT/O=INFN/OU=Personal Certificate/L=CNAF/CN=Andrea Ceccanti
+ type      : proxy
+-strength  : 1024
++strength  : 2048
+ path      : /tmp/x509up_u501
+ timeleft  : 12:04:48
+ key usage : digitalSignature keyEncipherment dataEncipherment 
+diff --git a/src/main/java/org/italiangrid/voms/clients/ProxyInitParams.java b/src/main/java/org/italiangrid/voms/clients/ProxyInitParams.java
+index 8982f72..ce292d7 100644
+--- a/src/main/java/org/italiangrid/voms/clients/ProxyInitParams.java
++++ b/src/main/java/org/italiangrid/voms/clients/ProxyInitParams.java
+@@ -34,7 +34,7 @@ public class ProxyInitParams {
+     .toSeconds(12);
+   public static final int DEFAULT_AC_LIFETIME = (int) TimeUnit.HOURS
+     .toSeconds(12);
+-  public static final int DEFAULT_KEY_SIZE = 1024;
++  public static final int DEFAULT_KEY_SIZE = 2048;
+ 
+   public static final int DEFAULT_CONNECT_TIMEOUT_IN_SECONDS = 10;
+ 
+-- 
+2.17.2
+
diff --git a/voms-clients-java-use-a-more-sensible-timeout.patch b/voms-clients-java-use-a-more-sensible-timeout.patch
new file mode 100644
index 0000000..4ce5cb7
--- /dev/null
+++ b/voms-clients-java-use-a-more-sensible-timeout.patch
@@ -0,0 +1,25 @@
+From 752b6566d246210fd690da102c53e329c01a09c2 Mon Sep 17 00:00:00 2001
+From: Andrea Ceccanti <andrea.ceccanti@gmail.com>
+Date: Thu, 28 Jun 2018 14:41:04 +0200
+Subject: [PATCH] Use a more sensible timeout
+
+---
+ src/main/java/org/italiangrid/voms/clients/ProxyInitParams.java | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/main/java/org/italiangrid/voms/clients/ProxyInitParams.java b/src/main/java/org/italiangrid/voms/clients/ProxyInitParams.java
+index 87d5cc6..8982f72 100644
+--- a/src/main/java/org/italiangrid/voms/clients/ProxyInitParams.java
++++ b/src/main/java/org/italiangrid/voms/clients/ProxyInitParams.java
+@@ -36,7 +36,7 @@ public class ProxyInitParams {
+     .toSeconds(12);
+   public static final int DEFAULT_KEY_SIZE = 1024;
+ 
+-  public static final int DEFAULT_CONNECT_TIMEOUT_IN_SECONDS = 2;
++  public static final int DEFAULT_CONNECT_TIMEOUT_IN_SECONDS = 10;
+ 
+   private String certFile;
+   private String keyFile;
+-- 
+2.17.2
+
diff --git a/voms-clients-java.spec b/voms-clients-java.spec
index 855a933..3153d91 100644
--- a/voms-clients-java.spec
+++ b/voms-clients-java.spec
@@ -1,6 +1,6 @@
 Name:		voms-clients-java
 Version:	3.3.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Virtual Organization Membership Service Java clients
 
 License:	ASL 2.0
@@ -13,6 +13,12 @@ Source0:	https://github.com/italiangrid/voms-clients/archive/v%{version}/%{name}
 Source1:	build.xml
 Source2:	maven-build.xml
 Source3:	maven-build.properties
+#		Use a more sensible timeout
+#		Backport from upstream git
+Patch0:		%{name}-use-a-more-sensible-timeout.patch
+#		Change default proxy cert key length to 2048 bits
+#		https://github.com/italiangrid/voms-clients/pull/20
+Patch1:		%{name}-change-default-proxy-cert-key-length-to-2048-bits.patch
 BuildArch:	noarch
 #		There is no jakarta-commons-io for ppc64 in EPEL6
 ExcludeArch:	ppc64
@@ -54,6 +60,8 @@ voms-proxy-init, voms-proxy-destroy and voms-proxy-info.
 
 %prep
 %setup -q -n voms-clients-%{version}
+%patch0 -p1
+%patch1 -p1
 cp -p %{SOURCE1} .
 cp -p %{SOURCE2} .
 cp -p %{SOURCE3} .
@@ -181,6 +189,10 @@ fi
 %license LICENSE
 
 %changelog
+* Wed Oct 31 2018 Mattias Ellert <mattias.ellert@physics.uu.se> - 3.3.0-3
+- Change default proxy cert key length to 2048 bits
+- Use a more sensible timeout
+
 * Tue Apr 10 2018 Mattias Ellert <mattias.ellert@physics.uu.se> - 3.3.0-2
 - Add trigger scriptlet to restore removed alternatives
 

From 8a84461d4a8dcb73ee0133268582e0d3fd10e040 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Wed, 14 Oct 2020 11:13:36 +0200
Subject: [PATCH 6/6] Update to version 3.3.2 Drop patches
 voms-clients-java-use-a-more-sensible-timeout.patch and  
 voms-clients-java-change-default-proxy-cert-key-length-to-2048-bits.patch

---
 maven-build.properties                        |  6 +--
 maven-build.xml                               | 24 +++++-----
 sources                                       |  2 +-
 ...t-proxy-cert-key-length-to-2048-bits.patch | 48 -------------------
 ...nts-java-use-a-more-sensible-timeout.patch | 25 ----------
 voms-clients-java.spec                        | 21 ++++----
 6 files changed, 25 insertions(+), 101 deletions(-)
 delete mode 100644 voms-clients-java-change-default-proxy-cert-key-length-to-2048-bits.patch
 delete mode 100644 voms-clients-java-use-a-more-sensible-timeout.patch

diff --git a/maven-build.properties b/maven-build.properties
index 6cc998a..bb8217c 100644
--- a/maven-build.properties
+++ b/maven-build.properties
@@ -1,8 +1,8 @@
 #Generated by Maven Ant Plugin - DO NOT EDIT THIS FILE!
-#Thu Feb 08 18:18:47 CET 2018
+#Wed Oct 14 10:51:05 CEST 2020
 maven.settings.offline=true
-voms-api-java.version=3.3.0
-maven.build.finalName=voms-clients-3.3.0
+voms-api-java.version=3.3.2
+maven.build.finalName=voms-clients-3.3.2
 commons-cli.version=1.2
 plugin.license.version=1.9.0
 maven.build.resourceDir.0=src/main/resources
diff --git a/maven-build.xml b/maven-build.xml
index ade8119..8b2f0d2 100644
--- a/maven-build.xml
+++ b/maven-build.xml
@@ -10,7 +10,7 @@
 <!--                                                                        -->
 <!-- Any modifications will be overwritten.                                 -->
 <!--                                                                        -->
-<!-- Generated by Maven Ant Plugin on 2/8/18 6:18 PM                        -->
+<!-- Generated by Maven Ant Plugin on 10/14/20 10:51 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-clients-3.3.0"/>
+  <property name="maven.build.finalName" value="voms-clients-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"/>
@@ -46,8 +46,8 @@
   <path id="build.classpath">
     <pathelement location="${maven.repo.local}/commons-cli/commons-cli/1.2/commons-cli-1.2.jar"/>
     <pathelement location="${maven.repo.local}/commons-io/commons-io/2.0.1/commons-io-2.0.1.jar"/>
-    <pathelement location="${maven.repo.local}/org/italiangrid/voms-api-java/3.3.0/voms-api-java-3.3.0.jar"/>
-    <pathelement location="${maven.repo.local}/eu/eu-emi/security/canl/2.5.0/canl-2.5.0.jar"/>
+    <pathelement location="${maven.repo.local}/org/italiangrid/voms-api-java/3.3.2/voms-api-java-3.3.2.jar"/>
+    <pathelement location="${maven.repo.local}/eu/eu-emi/security/canl/2.6.0/canl-2.6.0.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"/>
   </path>
@@ -56,8 +56,8 @@
     <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/>
     <pathelement location="${maven.repo.local}/commons-cli/commons-cli/1.2/commons-cli-1.2.jar"/>
     <pathelement location="${maven.repo.local}/commons-io/commons-io/2.0.1/commons-io-2.0.1.jar"/>
-    <pathelement location="${maven.repo.local}/org/italiangrid/voms-api-java/3.3.0/voms-api-java-3.3.0.jar"/>
-    <pathelement location="${maven.repo.local}/eu/eu-emi/security/canl/2.5.0/canl-2.5.0.jar"/>
+    <pathelement location="${maven.repo.local}/org/italiangrid/voms-api-java/3.3.2/voms-api-java-3.3.2.jar"/>
+    <pathelement location="${maven.repo.local}/eu/eu-emi/security/canl/2.6.0/canl-2.6.0.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"/>
   </path>
@@ -266,14 +266,14 @@
          dest="${maven.repo.local}/commons-io/commons-io/2.0.1/commons-io-2.0.1.jar" 
          usetimestamp="false" 
          ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/org/italiangrid/voms-api-java/3.3.0"/>
-    <get src="https://repo.maven.apache.org/maven2/org/italiangrid/voms-api-java/3.3.0/voms-api-java-3.3.0.jar" 
-         dest="${maven.repo.local}/org/italiangrid/voms-api-java/3.3.0/voms-api-java-3.3.0.jar" 
+    <mkdir dir="${maven.repo.local}/org/italiangrid/voms-api-java/3.3.2"/>
+    <get src="https://repo.maven.apache.org/maven2/org/italiangrid/voms-api-java/3.3.2/voms-api-java-3.3.2.jar" 
+         dest="${maven.repo.local}/org/italiangrid/voms-api-java/3.3.2/voms-api-java-3.3.2.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}/org/bouncycastle/bcpkix-jdk15on/1.58"/>
diff --git a/sources b/sources
index 9e9ee9f..7629928 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (voms-clients-java-3.3.0.tar.gz) = 854c38c43d7220da3bfed370a98f74864b78c486e87ef2083e0c278d7ed94f2eb3ffc2557027790a4f69905b757dfcc047c1dcc428933a859bbb6657dfcc17b3
+SHA512 (voms-clients-java-3.3.2.tar.gz) = 2228e1ee45aac029eaacc8ed859d42ec6668b1d885ab1a7dd2372dfa3fc28814be0edcbea8996f46152fcfed68390dbed8f1526e3d77935de18766748711d4c2
diff --git a/voms-clients-java-change-default-proxy-cert-key-length-to-2048-bits.patch b/voms-clients-java-change-default-proxy-cert-key-length-to-2048-bits.patch
deleted file mode 100644
index c882966..0000000
--- a/voms-clients-java-change-default-proxy-cert-key-length-to-2048-bits.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 2dcbb765d60078c2148f77a1a873895829c7e18e Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Wed, 31 Oct 2018 14:52:28 +0100
-Subject: [PATCH] Change default proxy cert key length to 2048 bits
-
----
- README.md                                                     | 4 ++--
- .../java/org/italiangrid/voms/clients/ProxyInitParams.java    | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/README.md b/README.md
-index 85743f1..72fd068 100644
---- a/README.md
-+++ b/README.md
-@@ -108,7 +108,7 @@ subject   : /C=IT/O=INFN/OU=Personal Certificate/L=CNAF/CN=Andrea Ceccanti/CN=pr
- issuer    : /C=IT/O=INFN/OU=Personal Certificate/L=CNAF/CN=Andrea Ceccanti
- identity  : /C=IT/O=INFN/OU=Personal Certificate/L=CNAF/CN=Andrea Ceccanti
- type      : proxy
--strength  : 1024
-+strength  : 2048
- path      : /tmp/x509up_u501
- timeleft  : 11:59:48
- key usage : digitalSignature keyEncipherment dataEncipherment
-@@ -122,7 +122,7 @@ subject   : /C=IT/O=INFN/OU=Personal Certificate/L=CNAF/CN=Andrea Ceccanti/CN=pr
- issuer    : /C=IT/O=INFN/OU=Personal Certificate/L=CNAF/CN=Andrea Ceccanti
- identity  : /C=IT/O=INFN/OU=Personal Certificate/L=CNAF/CN=Andrea Ceccanti
- type      : proxy
--strength  : 1024
-+strength  : 2048
- path      : /tmp/x509up_u501
- timeleft  : 12:04:48
- key usage : digitalSignature keyEncipherment dataEncipherment 
-diff --git a/src/main/java/org/italiangrid/voms/clients/ProxyInitParams.java b/src/main/java/org/italiangrid/voms/clients/ProxyInitParams.java
-index 8982f72..ce292d7 100644
---- a/src/main/java/org/italiangrid/voms/clients/ProxyInitParams.java
-+++ b/src/main/java/org/italiangrid/voms/clients/ProxyInitParams.java
-@@ -34,7 +34,7 @@ public class ProxyInitParams {
-     .toSeconds(12);
-   public static final int DEFAULT_AC_LIFETIME = (int) TimeUnit.HOURS
-     .toSeconds(12);
--  public static final int DEFAULT_KEY_SIZE = 1024;
-+  public static final int DEFAULT_KEY_SIZE = 2048;
- 
-   public static final int DEFAULT_CONNECT_TIMEOUT_IN_SECONDS = 10;
- 
--- 
-2.17.2
-
diff --git a/voms-clients-java-use-a-more-sensible-timeout.patch b/voms-clients-java-use-a-more-sensible-timeout.patch
deleted file mode 100644
index 4ce5cb7..0000000
--- a/voms-clients-java-use-a-more-sensible-timeout.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 752b6566d246210fd690da102c53e329c01a09c2 Mon Sep 17 00:00:00 2001
-From: Andrea Ceccanti <andrea.ceccanti@gmail.com>
-Date: Thu, 28 Jun 2018 14:41:04 +0200
-Subject: [PATCH] Use a more sensible timeout
-
----
- src/main/java/org/italiangrid/voms/clients/ProxyInitParams.java | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/main/java/org/italiangrid/voms/clients/ProxyInitParams.java b/src/main/java/org/italiangrid/voms/clients/ProxyInitParams.java
-index 87d5cc6..8982f72 100644
---- a/src/main/java/org/italiangrid/voms/clients/ProxyInitParams.java
-+++ b/src/main/java/org/italiangrid/voms/clients/ProxyInitParams.java
-@@ -36,7 +36,7 @@ public class ProxyInitParams {
-     .toSeconds(12);
-   public static final int DEFAULT_KEY_SIZE = 1024;
- 
--  public static final int DEFAULT_CONNECT_TIMEOUT_IN_SECONDS = 2;
-+  public static final int DEFAULT_CONNECT_TIMEOUT_IN_SECONDS = 10;
- 
-   private String certFile;
-   private String keyFile;
--- 
-2.17.2
-
diff --git a/voms-clients-java.spec b/voms-clients-java.spec
index 3153d91..285ed83 100644
--- a/voms-clients-java.spec
+++ b/voms-clients-java.spec
@@ -1,6 +1,6 @@
 Name:		voms-clients-java
-Version:	3.3.0
-Release:	3%{?dist}
+Version:	3.3.2
+Release:	1%{?dist}
 Summary:	Virtual Organization Membership Service Java clients
 
 License:	ASL 2.0
@@ -13,12 +13,6 @@ Source0:	https://github.com/italiangrid/voms-clients/archive/v%{version}/%{name}
 Source1:	build.xml
 Source2:	maven-build.xml
 Source3:	maven-build.properties
-#		Use a more sensible timeout
-#		Backport from upstream git
-Patch0:		%{name}-use-a-more-sensible-timeout.patch
-#		Change default proxy cert key length to 2048 bits
-#		https://github.com/italiangrid/voms-clients/pull/20
-Patch1:		%{name}-change-default-proxy-cert-key-length-to-2048-bits.patch
 BuildArch:	noarch
 #		There is no jakarta-commons-io for ppc64 in EPEL6
 ExcludeArch:	ppc64
@@ -30,12 +24,12 @@ BuildRequires:	ant-junit
 BuildRequires:	jakarta-commons-cli
 BuildRequires:	jakarta-commons-io
 BuildRequires:	junit4
-BuildRequires:	voms-api-java >= 3.3.0
+BuildRequires:	voms-api-java >= 3.3.2
 Requires:	java >= 1:1.8
 Requires:	jpackage-utils
 Requires:	jakarta-commons-cli
 Requires:	jakarta-commons-io
-Requires:	voms-api-java >= 3.3.0
+Requires:	voms-api-java >= 3.3.2
 
 Requires(post):		%{_sbindir}/update-alternatives
 Requires(postun):	%{_sbindir}/update-alternatives
@@ -60,8 +54,6 @@ voms-proxy-init, voms-proxy-destroy and voms-proxy-info.
 
 %prep
 %setup -q -n voms-clients-%{version}
-%patch0 -p1
-%patch1 -p1
 cp -p %{SOURCE1} .
 cp -p %{SOURCE2} .
 cp -p %{SOURCE3} .
@@ -189,6 +181,11 @@ fi
 %license LICENSE
 
 %changelog
+* Wed Oct 14 2020 Mattias Ellert <mattias.ellert@physics.uu.se> - 3.3.2-1
+- Update to version 3.3.2
+- Drop patches voms-clients-java-use-a-more-sensible-timeout.patch and
+  voms-clients-java-change-default-proxy-cert-key-length-to-2048-bits.patch
+
 * Wed Oct 31 2018 Mattias Ellert <mattias.ellert@physics.uu.se> - 3.3.0-3
 - Change default proxy cert key length to 2048 bits
 - Use a more sensible timeout