Merge pull request italiangrid#34 from italiangrid/develop

Release v3.3.3
ellert · Jul 31, 2024 · d83704a · d83704a
2 parents b33d6cf + 819edee
commit d83704a
Show file tree

Hide file tree

Showing 37 changed files with 1,613 additions and 688 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,10 @@
 language: java
+dist: trusty
 jdk:
-- openjdk6
-- openjdk7
-- oraclejdk7
 - oraclejdk8
+- openjdk8
+- oraclejdk11
+- openjdk11
 
 os:
 - linux
@@ -13,6 +14,6 @@ addons:
   # https://github.com/travis-ci/travis-ci/issues/5227
   hostname: localhost
 
-notifications:
-  slack:
-    secure: NEqqRKfphFroJt3420x+ojawfPQqQFk4mw17z4/RwpGxlR3kftW17s198TCFVyiBn0OF55BA6w7s/JL4PqG5BCH10B8/+ulbKrQh3LNSr3cQxvPs4AhI+BIq4pvK01sLS/wNxCzj0LI1mOg7L8BnJlioOJyHHBCeadqxdyPf5Uk=
+cache:
+  directories:
+  - "$HOME/.m2/repository"
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -0,0 +1,35 @@
+pipeline {
+
+  agent { label 'java11' }
+
+  options {
+    ansiColor('xterm')
+    buildDiscarder(logRotator(numToKeepStr: '5'))
+    timeout(time: 1, unit: 'HOURS')
+    timestamps()
+  }
+
+  triggers { cron('@daily') }
+
+  stages {
+
+    stage('license-check') {
+      steps {
+        sh 'mvn -B license:check'
+      }
+    }
+
+    stage('build') {
+      steps {
+        sh 'mvn -B clean compile'
+      }
+    }
+
+    stage('deploy') {
+      steps {
+        sh 'mvn -B deploy -DskipTests' 
+      }
+    }
+
+  }
+}
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 [![Build Status](https://travis-ci.org/italiangrid/voms-api-java.svg)](https://travis-ci.org/italiangrid/voms-api-java)
 
-Java binding for the Virtual Organization Membership Service (VOMS) API.
+Java client APIs for the Virtual Organization Membership Service (VOMS).
 
 The VOMS API can be used for 
 - validating attribute certifcates (ACs) inside a proxy and reading the attributes (VOSM FQANs or VOMS generic attributes)
@@ -248,7 +248,7 @@ validator.shutdown();
 
 More details on the new APIs can be found in the [Javadoc](http://italiangrid.github.com/voms-api-java/javadocs/3.x/index.html).
 
-## Licence
+## License
 
 Licensed under the Apache License, Version 2.0 (the "License"); you may not use
 this project except in compliance with the License. You may obtain a copy of

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>org.italiangrid</groupId>
   <artifactId>voms-api-java</artifactId>
-  <version>3.0.6</version>
+  <version>3.3.3</version>
   <packaging>jar</packaging>
 
   <name>voms-api-java</name>
@@ -42,10 +42,11 @@
 
     <junit.version>4.11</junit.version>
     <hamcrest.version>1.3</hamcrest.version>
-    <canl.version>1.3.3</canl.version>
-    <bcmail.version>1.46.3</bcmail.version>
+    <canl.version>2.6.0</canl.version>
     <mockito.version>1.9.5</mockito.version>
     <jcip.version>1.0</jcip.version>
+    <bc.version>1.58</bc.version>
+    <guava.version>33.1.0-jre</guava.version>
 
     <!-- properties -->
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -54,6 +55,7 @@
     <assembly.java.dir>/usr/share/java</assembly.java.dir>
     <assembly.doc.dir>/usr/share/doc/${project.name}</assembly.doc.dir>
     <assembly.javadoc.dir>/usr/share/javadoc/${project.name}</assembly.javadoc.dir>
+
   </properties>
 
   <developers>
@@ -94,8 +96,8 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>${plugin.compiler.version}</version>
         <configuration>
-          <source>1.5</source>
-          <target>1.5</target>
+          <source>1.8</source>
+          <target>1.8</target>
           <showDeprecation>true</showDeprecation>
           <showWarnings>true</showWarnings>
         </configuration>
@@ -137,6 +139,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>
@@ -171,6 +174,7 @@
         <configuration>
           <header>src/license/license.txt</header>
           <excludes>
+            <exclude>Jenkinsfile</exclude>
             <exclude>.travis.yml</exclude>
             <exclude>*.md</exclude>
             <exclude>Makefile</exclude>
@@ -248,9 +252,21 @@
     </dependency>
 
     <dependency>
-      <groupId>org.italiangrid</groupId>
-      <artifactId>bcmail</artifactId>
-      <version>${bcmail.version}</version>
+        <groupId>org.bouncycastle</groupId>
+        <artifactId>bcpkix-jdk15on</artifactId>
+        <version>${bc.version}</version>
+    </dependency>
+
+    <dependency>
+        <groupId>org.bouncycastle</groupId>
+        <artifactId>bcprov-jdk15on</artifactId>
+        <version>${bc.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <version>${guava.version}</version>
     </dependency>
 
     <dependency>
@@ -310,13 +326,13 @@
         <repository>
           <id>cnaf-releases</id>
           <name>CNAF releases</name>
-          <url>http://radiohead.cnaf.infn.it:8081/nexus/content/repositories/cnaf-releases/</url>
+          <url>https://repo.cloud.cnaf.infn.it/repository/cnaf-releases/</url>
         </repository>
 
         <snapshotRepository>
           <id>cnaf-snapshots</id>
           <name>CNAF snapshots</name>
-          <url>http://radiohead.cnaf.infn.it:8081/nexus/content/repositories/cnaf-snapshots/</url>
+          <url>https://repo.cloud.cnaf.infn.it/repository/cnaf-snapshots/</url>
         </snapshotRepository>
 
       </distributionManagement>

diff --git a/src/main/assembly/voms-api-java.xml b/src/main/assembly/voms-api-java.xml
@@ -16,10 +16,9 @@
     limitations under the License.
 
 -->
-<assembly
-  xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
   <id>main</id>
   <formats>
     <format>tar.gz</format>

diff --git a/src/main/java/org/italiangrid/voms/VOMSAttribute.java b/src/main/java/org/italiangrid/voms/VOMSAttribute.java
@@ -41,25 +41,25 @@ public interface VOMSAttribute {
   public String getVO();
 
   /**
-   * This method returns the host where the VOMS Attribute Authority (AA) 
-   * that signed these attribute lives
+   * This method returns the host where the VOMS Attribute Authority (AA) that
+   * signed these attribute lives
    * 
    * @return The name of the host where the VOMS AA that signed these attributes
    *         lives
    */
   public String getHost();
 
   /**
-   * This method returns the port on which the VOMS Attribute Authority (AA) 
-   * that signed these attributes listens for requests. 
+   * This method returns the port on which the VOMS Attribute Authority (AA)
+   * that signed these attributes listens for requests.
    * 
    * @return The port on which the VOMS AA that signed these attributes listens
    *         for requests
    */
   public int getPort();
 
   /**
-   * This method returns the subject (as an {@link X500Principal}) of the holder 
+   * This method returns the subject (as an {@link X500Principal}) of the holder
    * of these VOMS attributes
    * 
    * @return The subject of the holder of these VOMS attributes
@@ -74,8 +74,8 @@ public interface VOMSAttribute {
   public BigInteger getHolderSerialNumber();
 
   /**
-   * This method returns the subject of the VOMS Attribute Authority that
-   * signed these attributes.
+   * This method returns the subject of the VOMS Attribute Authority that signed
+   * these attributes.
    * 
    * @return The subject of the VOMS AA that signed these attributes
    */
@@ -96,47 +96,47 @@ public interface VOMSAttribute {
   public Date getNotAfter();
 
   /**
-   * This method returns the list of signed 
-   * Fully Qualified Attribute Names (FQANs) in this {@link VOMSAttribute}.
+   * This method returns the list of signed Fully Qualified Attribute Names
+   * (FQANs) in this {@link VOMSAttribute}.
    * 
    * @return The {@link List} of VOMS fully qualified attribute names
    */
   public List<String> getFQANs();
 
   /**
-   * This method returns the primary FQAN (the first in the list 
-   * returned by {@link #getFQANs()}) in this {@link VOMSAttribute}.
+   * This method returns the primary FQAN (the first in the list returned by
+   * {@link #getFQANs()}) in this {@link VOMSAttribute}.
    * 
    * @return The primary VOMS fully qualified attribute name
    */
   public String getPrimaryFQAN();
 
   /**
-   * This method returns the signature on the VOMS attribute certificate as
-   * a byte array.
+   * This method returns the signature on the VOMS attribute certificate as a
+   * byte array.
    * 
    * @return The signature of this VOMS attributes
    */
   public byte[] getSignature();
 
   /**
-   * This method returns the list of VOMS Generic attributes in this 
+   * This method returns the list of VOMS Generic attributes in this
    * {@link VOMSAttribute}.
    * 
    * @return The VOMS generic attributes
    */
   public List<VOMSGenericAttribute> getGenericAttributes();
 
   /**
-   * This method returns the list of targets defined for this 
+   * This method returns the list of targets defined for this
    * {@link VOMSAttribute}.
    * 
    * @return The targets for this VOMS attributes
    */
   public List<String> getTargets();
 
   /**
-   * This method returns the certificate chain of the VOMS Attribute Authority 
+   * This method returns the certificate chain of the VOMS Attribute Authority
    * (AA) that signed this {@link VOMSAttribute}.
    * 
    * @return The VOMS AA certificate chain

diff --git a/src/main/java/org/italiangrid/voms/ac/ValidationResultListener.java b/src/main/java/org/italiangrid/voms/ac/ValidationResultListener.java
@@ -27,7 +27,7 @@
 public interface ValidationResultListener {
 
   /**
-   * Informs of the result of the validation of a set of {@link VOMSAttribute}.
+   * Informs of the result of the validation of a set of {@link VOMSAttribute}
    * 
    * @param result
    *          the validation result