Update to version 3.3.2 - matches canl-java 2.6.x

Drop patch voms-api-java-javadoc-source.patch

debian/changelog

+voms-api-java (3.3.2-1) unstable; urgency=medium
+
+  * Update to version 3.3.2 - matches canl-java 2.6.x
+  * Drop patch voms-api-java-javadoc-source.patch
+
+ -- Mattias Ellert <mattias.ellert@physics.uu.se>  Wed, 14 Oct 2020 05:44:33 +0200
+
 voms-api-java (3.3.0-2) unstable; urgency=medium
 
   * Add source version to javadoc configuration

debian/compat

-9
+10

debian/control

 Source: voms-api-java
 Priority: optional
 Maintainer: Mattias Ellert <mattias.ellert@physics.uu.se>
-Build-Depends: debhelper (>> 9), maven-debian-helper (>= 2.2), libmaven-javadoc-plugin-java, libjcip-annotations-java, junit4, libhamcrest-java, libmockito-java, libcanl-java (>= 2.5.0)
-Standards-Version: 4.3.0
+Build-Depends:
+ debhelper (>> 10),
+ maven-debian-helper (>= 2.2),
+ libmaven-javadoc-plugin-java,
+ junit4,
+ libhamcrest-java,
+ libmockito-java,
+ libcanl-java (>= 2.6.0)
+Standards-Version: 4.5.0
 Section: java
 Vcs-Browser: https://salsa.debian.org/ellert/voms-api-java
 Vcs-Git: https://salsa.debian.org/ellert/voms-api-java.git
@@ -11,8 +18,11 @@ Homepage: https://wiki.italiangrid.it/VOMS
 Package: libvoms-api-java-java
 Section: java
 Architecture: all
-Depends: ${misc:Depends}, ${maven:Depends}
-Breaks: voms-clients-java (<< 3.3.0)
+Depends:
+ ${misc:Depends},
+ ${maven:Depends}
+Breaks:
+ voms-clients-java (<< 3.3.0)
 Description: Virtual Organization Membership Service Java API
  The Virtual Organization Membership Service (VOMS) is an attribute authority
  which serves as central repository for VO user authorization information,
@@ -26,6 +36,8 @@ Description: Virtual Organization Membership Service Java API
 Package: libvoms-api-java-java-doc
 Section: doc
 Architecture: all
-Depends: ${misc:Depends}, ${maven:DocDepends}
+Depends:
+ ${misc:Depends},
+ ${maven:DocDepends}
 Description: Virtual Organization Membership Service Java API Documentation
  Virtual Organization Membership Service (VOMS) Java API Documentation.

debian/copyright

@@ -4,7 +4,7 @@ Upstream-Contact:
  Andrea Ceccanti <andrea.ceccanti@cnaf.infn.it>
  Valerio Venturi <valerio.venturi@cnaf.infn.it>
  Daniele Andreotti <daniele.andreotti@cnaf.infn.it>
-Source: https://github.com/italiangrid/voms-api-java/archive/v3.3.0.tar.gz
+Source: https://github.com/italiangrid/voms-api-java/archive/v3.3.2.tar.gz
 
 Files: *
 Copyright:
@@ -19,7 +19,7 @@ License: Apache-2.0
 
 Files: debian/*
 Copyright:
- 2012-2019, Mattias Ellert <mattias.ellert@physics.uu.se>
+ 2012-2020, Mattias Ellert <mattias.ellert@physics.uu.se>
 License: Apache-2.0
 
 License: Apache-2.0

debian/maven.ignoreRules

 com.mycila.maven-license-plugin maven-license-plugin
+net.jcip                        jcip-annotations
+org.apache.maven.plugins        maven-assembly-plugin
 org.apache.maven.plugins        maven-source-plugin
+org.codehaus.mojo               cobertura-maven-plugin

debian/patches/series

 # Disable tests using non-local network interface
 voms-api-java-no-local.patch
-
-# Add source version to javadoc configuration
-# https://github.com/italiangrid/voms-api-java/pull/24
-voms-api-java-javadoc-source.patch

debian/patches/voms-api-java-javadoc-source.patch

-From f0fd4e08e94d70630d7948da2a8e2acf2a337697 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Tue, 19 Feb 2019 18:50:10 +0100
-Subject: [PATCH] Add source version to javadoc configuration
-
----
- pom.xml | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/pom.xml b/pom.xml
-index 82005e5..8ce8467 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -138,6 +138,7 @@
-         <artifactId>maven-javadoc-plugin</artifactId>
-         <version>${plugin.javadoc.version}</version>
-         <configuration>
-+          <source>1.8</source>
-           <outputDirectory>${project.build.directory}/javadoc</outputDirectory>
-           <reportOutputDirectory>${project.reporting.outputDirectory}/javadoc</reportOutputDirectory>
-         </configuration>
--- 
-2.20.1
-

debian/patches/voms-api-java-no-local.patch

-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());
+diff -ur voms-api-java-3.3.2.orig/src/test/java/org/italiangrid/voms/test/ac/TestACValidator.java voms-api-java-3.3.2/src/test/java/org/italiangrid/voms/test/ac/TestACValidator.java
+--- voms-api-java-3.3.2.orig/src/test/java/org/italiangrid/voms/test/ac/TestACValidator.java	2020-10-08 17:57:55.000000000 +0200
++++ voms-api-java-3.3.2/src/test/java/org/italiangrid/voms/test/ac/TestACValidator.java	2020-10-14 07:49:04.716000000 +0200
+@@ -329,7 +329,7 @@
+         r.getValidationErrors().get(0).getMessage());
    }
  
 -  @Test
@@ -10,7 +10,7 @@ diff -ur voms-api-java-3.0.5.orig/src/test/java/org/italiangrid/voms/test/ac/Tes
    public void testTargetValidationSuccess() throws Exception {
  
      VOMSAA aa = Utils.getVOMSAA();
-@@ -379,7 +379,7 @@
+@@ -355,7 +355,7 @@
      Assert.assertTrue(r.isValid());
    }