diff --git a/voms-api-java-javadoc.patch b/voms-api-java-javadoc.patch new file mode 100644 index 0000000..237cb85 --- /dev/null +++ b/voms-api-java-javadoc.patch @@ -0,0 +1,509 @@ +diff -ur voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/ac/VOMSACLookupStrategy.java voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/ac/VOMSACLookupStrategy.java +--- voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/ac/VOMSACLookupStrategy.java 2014-12-09 10:55:31.000000000 +0100 ++++ voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/ac/VOMSACLookupStrategy.java 2015-07-11 22:03:24.435478016 +0200 +@@ -32,6 +32,7 @@ + * This method defines how a set of VOMS Attribute Certificates is looked for + * in a certificate chain. + * ++ * @param certChain certificate chain + * @return a {@link List} of {@link ACParsingContext} that describes the + * lookup outcome + */ +diff -ur voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/ac/VOMSACValidator.java voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/ac/VOMSACValidator.java +--- voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/ac/VOMSACValidator.java 2014-12-09 10:55:31.000000000 +0100 ++++ voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/ac/VOMSACValidator.java 2015-07-11 22:04:13.910971096 +0200 +@@ -63,7 +63,7 @@ + * about validation without relying on the registration of a + * {@link ValidationResultListener}. + * +- * @param validatedChain ++ * @param validatedChain validated chain + * @return a possibly empty list of {@link VOMSValidationResult} object + * providing access to validation results and related attributes + */ +diff -ur voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/ac/VOMSAttributesNormalizationStrategy.java voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/ac/VOMSAttributesNormalizationStrategy.java +--- voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/ac/VOMSAttributesNormalizationStrategy.java 2014-12-09 10:55:31.000000000 +0100 ++++ voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/ac/VOMSAttributesNormalizationStrategy.java 2015-07-11 22:06:19.019217943 +0200 +@@ -35,7 +35,7 @@ + * Returns the normalized view of VOMS Authorization information starting from + * a list of VOMS Attribute certificates. + * +- * @param acs ++ * @param acs a list of VOMS Attribute certificates + * @return a possibly empty list {@link VOMSAttribute} object + */ + public List normalizeAttributes(List acs); +diff -ur voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/ac/VOMSValidationResult.java voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/ac/VOMSValidationResult.java +--- voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/ac/VOMSValidationResult.java 2014-12-09 10:55:31.000000000 +0100 ++++ voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/ac/VOMSValidationResult.java 2015-07-11 23:17:04.240921381 +0200 +@@ -43,7 +43,7 @@ + * Default constructor. + * + * @param attributes +- * the attributes this validation result refer to ++ * the attributes this validation result refers to + * @param valid + * true in case of validation success, + * false otherwise +@@ -56,6 +56,8 @@ + /** + * This constructor is used to pass in a list of validation errors as well. + * ++ * @param attributes ++ * the attributes this validation result refers to + * @param valid + * true in case of validation success, + * false otherwise +diff -ur voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/asn1/VOMSACUtils.java voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/asn1/VOMSACUtils.java +--- voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/asn1/VOMSACUtils.java 2014-12-09 10:55:31.000000000 +0100 ++++ voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/asn1/VOMSACUtils.java 2015-07-11 21:52:38.473040258 +0200 +@@ -82,10 +82,10 @@ + * Deserializes the VOMS Attribute certificates in a given certificate + * extension + * +- * @param vomsExtension ++ * @param vomsExtension VOMS extension + * @return the possybly empty {@link List} of {@link AttributeCertificate} + * extracted from a given extension +- * @throws IOException ++ * @throws IOException IO exception + */ + public static List getACsFromVOMSExtension( + byte[] vomsExtension) throws IOException { +@@ -141,7 +141,7 @@ + * the {@link X509Certificate} where the ACs will be searched + * @return the possibly empty {@link List} of {@link AttributeCertificate} + * objects extracted from the VOMS extension +- * @throws IOException ++ * @throws IOException IO exception + */ + public static List getACsFromCertificate( + X509Certificate cert) throws IOException { +diff -ur voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/credential/LoadCredentialsEventListener.java voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/credential/LoadCredentialsEventListener.java +--- voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/credential/LoadCredentialsEventListener.java 2014-12-09 10:55:31.000000000 +0100 ++++ voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/credential/LoadCredentialsEventListener.java 2015-07-11 21:59:55.389394631 +0200 +@@ -25,10 +25,11 @@ + public interface LoadCredentialsEventListener { + + /** +- * Informs that credentials are been looked for in the locations passed as ++ * Informs that credentials have been looked for in the locations passed as + * argument. + * + * @param locations ++ * the locations where the credentials have been looked for + */ + public void notifyCredentialLookup(String... locations); + +@@ -37,6 +38,7 @@ + * passed as argument. + * + * @param locations ++ * the locations where the credentials have been loaded from + */ + public void notifyLoadCredentialSuccess(String... locations); + +@@ -48,7 +50,7 @@ + * the {@link Throwable} that caused the credential load operation to + * fail + * @param locations +- * the locations where the credentials where loaded from ++ * the locations where the credentials were loaded from + */ + public void notifyLoadCredentialFailure(Throwable error, String... locations); + } +diff -ur voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/examples/ValidationExample.java voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/examples/ValidationExample.java +--- voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/examples/ValidationExample.java 2014-12-09 10:55:31.000000000 +0100 ++++ voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/examples/ValidationExample.java 2015-07-11 22:02:03.237668786 +0200 +@@ -58,11 +58,11 @@ + } + + /** +- * @param args +- * @throws IOException +- * @throws FileNotFoundException +- * @throws CertificateException +- * @throws KeyStoreException ++ * @param args arguments ++ * @throws KeyStoreException key store exception ++ * @throws CertificateException certificate exception ++ * @throws FileNotFoundException file not found exception ++ * @throws IOException IO exception + */ + public static void main(String[] args) throws KeyStoreException, + CertificateException, FileNotFoundException, IOException { +diff -ur voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/request/impl/AbstractVOMSProtocol.java voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/request/impl/AbstractVOMSProtocol.java +--- voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/request/impl/AbstractVOMSProtocol.java 2014-12-09 10:55:31.000000000 +0100 ++++ voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/request/impl/AbstractVOMSProtocol.java 2015-07-11 22:36:27.944060573 +0200 +@@ -164,7 +164,7 @@ + /** + * Sets whether this protocol will skip SSL hostname checks + * +- * @param skipHostnameChecks ++ * @param skipHostnameChecks skip hostname checks + */ + public void setSkipHostnameChecks(boolean skipHostnameChecks) { + +diff -ur voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/request/impl/DefaultVOMSACService.java voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/request/impl/DefaultVOMSACService.java +--- voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/request/impl/DefaultVOMSACService.java 2014-12-09 10:55:31.000000000 +0100 ++++ voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/request/impl/DefaultVOMSACService.java 2015-07-11 22:58:43.620615468 +0200 +@@ -513,7 +513,7 @@ + * Sets the http protocol implementation + * + * @param httpProtocol +- * the http protocol implementatino ++ * the http protocol implementatioh + * @return this {@link Builder} instance + */ + public Builder httpProtocol(VOMSProtocol httpProtocol) { +@@ -524,6 +524,10 @@ + + /** + * Sets the legacy protocol implementation ++ * ++ * @param legacyProtocol ++ * the legacy protocol implementatioh ++ * @return this {@link Builder} instance + */ + public Builder legacyProtocol(VOMSProtocol legacyProtocol) { + +diff -ur voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/request/impl/LegacyRequestSender.java voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/request/impl/LegacyRequestSender.java +--- voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/request/impl/LegacyRequestSender.java 2014-12-09 10:55:31.000000000 +0100 ++++ voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/request/impl/LegacyRequestSender.java 2015-07-11 23:01:29.503319467 +0200 +@@ -97,6 +97,8 @@ + * + * @param acRequest + * the AC request parameters. See {@link VOMSACRequest}. ++ * @param endpoint ++ * VOMS server endpoint + * @param stream + * an output stream. + */ +diff -ur voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/request/impl/LegacyVOMSResponse.java voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/request/impl/LegacyVOMSResponse.java +--- voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/request/impl/LegacyVOMSResponse.java 2014-12-09 10:55:31.000000000 +0100 ++++ voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/request/impl/LegacyVOMSResponse.java 2015-07-11 23:04:31.083184711 +0200 +@@ -37,7 +37,7 @@ + * Builds a VOMSResponse starting from a DOM an XML document (see + * {@link Document}). + * +- * @param res ++ * @param res XML response + */ + public LegacyVOMSResponse(Document res) { + +diff -ur voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/store/impl/DefaultVOMSTrustStore.java voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/store/impl/DefaultVOMSTrustStore.java +--- voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/store/impl/DefaultVOMSTrustStore.java 2014-12-09 10:55:31.000000000 +0100 ++++ voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/store/impl/DefaultVOMSTrustStore.java 2015-07-11 23:12:10.653905564 +0200 +@@ -106,6 +106,8 @@ + /** + * Builds a list of trusted directories containing only + * {@link #DEFAULT_VOMS_DIR}. ++ * ++ * @return list of trusted directories + **/ + protected static List buildDefaultTrustedDirs() { + +@@ -118,6 +120,8 @@ + * + * @param localTrustDirs + * a non-null list of local trust directories ++ * @param listener ++ * trust store status listener + * @throws IllegalArgumentException + * when the list passed as argument is null + */ +diff -ur voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/store/impl/VOMSThread.java voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/store/impl/VOMSThread.java +--- voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/store/impl/VOMSThread.java 2014-12-09 10:55:31.000000000 +0100 ++++ voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/store/impl/VOMSThread.java 2015-07-11 23:13:36.831790810 +0200 +@@ -32,6 +32,8 @@ + * the object whose run method is called. + * @param name + * the name of the new thread. ++ * @param handler ++ * uncaught exception handler + */ + public VOMSThread(Runnable target, String name, + UncaughtExceptionHandler handler) { +diff -ur voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/store/LSCInfo.java voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/store/LSCInfo.java +--- voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/store/LSCInfo.java 2014-12-09 10:55:31.000000000 +0100 ++++ voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/store/LSCInfo.java 2015-07-11 23:49:42.371477209 +0200 +@@ -60,8 +60,8 @@ + * and hostname. + * + * The certificate chain description is a list of X.500 distinguished names +- * encoded as strings according to the OpenSSL slash-separated format, as in: +- * /C=IT/O=INFN/CN=INFN CA ++ * encoded as strings according to the OpenSSL slash-separated format, as ++ * in: @verbatim /C=IT/O=INFN/CN=INFN CA @endverbatim + * + * The first element in the description is the leaf certificate, while the + * last is the CA certificate. +@@ -75,7 +75,7 @@ + * Checks if the certificate chain description maintained in the LSC + * information matches the certificate chain passed as argument. + * +- * @param certChain ++ * @param certChain certificate chain + * @return true if the description matches, false + * otherwise + */ +diff -ur voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/util/CachingCertificateValidator.java voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/util/CachingCertificateValidator.java +--- voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/util/CachingCertificateValidator.java 2014-12-09 10:55:31.000000000 +0100 ++++ voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/util/CachingCertificateValidator.java 2015-07-11 22:19:44.450154294 +0200 +@@ -132,7 +132,7 @@ + * Validates a certificate chain using the wrapped validator, caching the + * result for future validation calls. + * +- * @param certChain ++ * @param certChain certificate chain + * @return a possibly cached {@link ValidationResult} + * @see eu.emi.security.authn.x509.X509CertChainValidator#validate(java.security.cert.X509Certificate[]) + */ +@@ -187,7 +187,7 @@ + } + + /** +- * @param certPath ++ * @param certPath certificate path + * @return the {@link ValidationResult} + * @see eu.emi.security.authn.x509.X509CertChainValidator#validate(java.security.cert.CertPath) + */ +@@ -215,7 +215,7 @@ + } + + /** +- * @param listener ++ * @param listener validation listener + * @see eu.emi.security.authn.x509.X509CertChainValidator#addValidationListener(eu.emi.security.authn.x509.ValidationErrorListener) + */ + public void addValidationListener(ValidationErrorListener listener) { +@@ -224,7 +224,7 @@ + } + + /** +- * @param listener ++ * @param listener validation listener + * @see eu.emi.security.authn.x509.X509CertChainValidator#removeValidationListener(eu.emi.security.authn.x509.ValidationErrorListener) + */ + public void removeValidationListener(ValidationErrorListener listener) { +@@ -233,7 +233,7 @@ + } + + /** +- * @param listener ++ * @param listener validation listener + * @see eu.emi.security.authn.x509.X509CertChainValidator#addUpdateListener(eu.emi.security.authn.x509.StoreUpdateListener) + */ + public void addUpdateListener(StoreUpdateListener listener) { +@@ -242,7 +242,7 @@ + } + + /** +- * @param listener ++ * @param listener validation listener + * @see eu.emi.security.authn.x509.X509CertChainValidator#removeUpdateListener(eu.emi.security.authn.x509.StoreUpdateListener) + */ + public void removeUpdateListener(StoreUpdateListener listener) { +diff -ur voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/util/CertificateValidatorBuilder.java voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/util/CertificateValidatorBuilder.java +--- voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/util/CertificateValidatorBuilder.java 2014-12-09 10:55:31.000000000 +0100 ++++ voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/util/CertificateValidatorBuilder.java 2015-07-11 22:23:13.028201344 +0200 +@@ -142,7 +142,7 @@ + /** + * Sets whether the created validator will be lazy in loading anchors + * +- * @param lazyness ++ * @param lazyness lazyness + * @return the builder object + */ + public CertificateValidatorBuilder lazyAnchorsLoading(boolean lazyness) { +@@ -227,6 +227,9 @@ + * @param validationErrorListener + * the listener that will receive notification about validation + * errors ++ * @param storeUpdateListener ++ * the listener that will receive notification about trust ++ * anchor store updates + * @param updateInterval + * the trust anchor store update interval + * @param namespaceChecks +@@ -259,6 +262,9 @@ + * @param validationErrorListener + * the listener that will receive notification about validation + * errors ++ * @param storeUpdateListener ++ * the listener that will receive notification about trust ++ * anchor store updates + * @param updateInterval + * the trust anchor store update interval + * @param namespaceChecks +diff -ur voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/util/CredentialsUtils.java voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/util/CredentialsUtils.java +--- voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/util/CredentialsUtils.java 2014-12-09 10:55:31.000000000 +0100 ++++ voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/util/CredentialsUtils.java 2015-07-11 22:34:03.331626827 +0200 +@@ -62,11 +62,11 @@ + /** + * Serializes a private key to an output stream according to an encoding. + * +- * @param os +- * @param key +- * @param encoding +- * @throws IllegalArgumentException +- * @throws IOException ++ * @param os output stream ++ * @param key private key ++ * @param encoding private key encoding ++ * @throws IllegalArgumentException illegal argument exception ++ * @throws IOException IO exception + */ + public static void savePrivateKey(OutputStream os, PrivateKey key, + PrivateKeyEncoding encoding) throws IllegalArgumentException, IOException { +@@ -90,10 +90,10 @@ + * This method just delegates to canl, but provides a much more understandable + * signature. + * +- * @param os +- * @param key +- * @throws IllegalArgumentException +- * @throws IOException ++ * @param os output stream ++ * @param key private key ++ * @throws IllegalArgumentException illegal argument exception ++ * @throws IOException IO exception + */ + private static void savePrivateKeyPKCS8(OutputStream os, PrivateKey key) + throws IllegalArgumentException, IOException { +@@ -108,10 +108,10 @@ + * This method just delegates to canl, but provides a much more understandable + * signature. + * +- * @param os +- * @param key +- * @throws IllegalArgumentException +- * @throws IOException ++ * @param os output stream ++ * @param key provate key ++ * @throws IllegalArgumentException illegal argument exception ++ * @throws IOException IO exception + */ + private static void savePrivateKeyPKCS1(OutputStream os, PrivateKey key) + throws IllegalArgumentException, IOException { +@@ -125,16 +125,16 @@ + * Saves user credentials as a plain text PEM data.
+ * Writes the user certificate chain first, then the user key. + * +- * @param os +- * @param uc +- * @param encoding +- * @throws UnrecoverableKeyException +- * @throws KeyStoreException +- * @throws IllegalArgumentException +- * @throws NoSuchAlgorithmException +- * @throws IOException +- * @throws NoSuchProviderException +- * @throws CertificateException ++ * @param os output stream ++ * @param uc user credential ++ * @param encoding private key encoding ++ * @throws UnrecoverableKeyException unrecoverable key exception ++ * @throws KeyStoreException key store exception ++ * @throws IllegalArgumentException illegal argument exception ++ * @throws NoSuchAlgorithmException no such algorithm exception ++ * @throws IOException IO exception ++ * @throws NoSuchProviderException no such provider exception ++ * @throws CertificateException certificate exception + */ + public static void saveProxyCredentials(OutputStream os, X509Credential uc, + PrivateKeyEncoding encoding) throws UnrecoverableKeyException, +@@ -174,15 +174,15 @@ + * Writes the user certificate chain first, then the user key, using the + * default encoding specified in {@link #DEFAULT_ENCONDING}. + * +- * @param os +- * @param uc +- * @throws UnrecoverableKeyException +- * @throws KeyStoreException +- * @throws IllegalArgumentException +- * @throws NoSuchAlgorithmException +- * @throws IOException +- * @throws NoSuchProviderException +- * @throws CertificateException ++ * @param os output stream ++ * @param uc user credendial ++ * @throws UnrecoverableKeyException unrecoverable key exception ++ * @throws KeyStoreException key store exception ++ * @throws IllegalArgumentException illegal argument exception ++ * @throws NoSuchAlgorithmException no such algorithm exception ++ * @throws IOException IO exception ++ * @throws NoSuchProviderException no such provider exception ++ * @throws CertificateException certificate exception + */ + public static void saveProxyCredentials(OutputStream os, X509Credential uc) + throws UnrecoverableKeyException, KeyStoreException, +@@ -202,13 +202,13 @@ + * the credential to be saved + * @param encoding + * the private key encoding +- * @throws IOException +- * @throws UnrecoverableKeyException +- * @throws KeyStoreException +- * @throws IllegalArgumentException +- * @throws NoSuchAlgorithmException +- * @throws NoSuchProviderException +- * @throws CertificateException ++ * @throws IOException IOException ++ * @throws UnrecoverableKeyException unrecoverable key exception ++ * @throws KeyStoreException key store exception ++ * @throws IllegalArgumentException illegal argument exception ++ * @throws NoSuchAlgorithmException no such algorithm exception ++ * @throws NoSuchProviderException no such provider exception ++ * @throws CertificateException certificate exception + */ + public static void saveProxyCredentials(String proxyFileName, + X509Credential uc, PrivateKeyEncoding encoding) throws IOException, +@@ -238,14 +238,16 @@ + * encoding specified in {@link #DEFAULT_ENCONDING}. + * + * @param proxyFileName ++ * the file where the proxy will be saved + * @param uc +- * @throws UnrecoverableKeyException +- * @throws KeyStoreException +- * @throws IllegalArgumentException +- * @throws NoSuchAlgorithmException +- * @throws NoSuchProviderException +- * @throws CertificateException +- * @throws IOException ++ * the credential to be saved ++ * @throws UnrecoverableKeyException unrecoverable key exception ++ * @throws KeyStoreException key store exception ++ * @throws IllegalArgumentException illegal argument exception ++ * @throws NoSuchAlgorithmException no such algorithm exception ++ * @throws NoSuchProviderException no such provider exception ++ * @throws CertificateException certificate exception ++ * @throws IOException IOException + */ + public static void saveProxyCredentials(String proxyFileName, + X509Credential uc) throws UnrecoverableKeyException, KeyStoreException, +diff -ur voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/util/VOMSFQANNamingScheme.java voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/util/VOMSFQANNamingScheme.java +--- voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/util/VOMSFQANNamingScheme.java 2014-12-09 10:55:31.000000000 +0100 ++++ voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/util/VOMSFQANNamingScheme.java 2015-07-11 22:35:15.189339253 +0200 +@@ -96,7 +96,7 @@ + * syntax used by voms to identify roles. + * + * +- * @param roleName ++ * @param roleName role name + * @throws VOMSError + * If the string passed as argument doens not comply with the voms + * sytax. +diff -ur voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/VOMSAttribute.java voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/VOMSAttribute.java +--- voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/VOMSAttribute.java 2014-12-09 10:55:31.000000000 +0100 ++++ voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/VOMSAttribute.java 2015-07-11 21:53:57.511827971 +0200 +@@ -117,7 +117,7 @@ + * This method checks whether the attributes are valid in a given time passed + * as argument. No validation is performed on the attributes. + * +- * @param time ++ * @param time time + * @return true if valid, false otherwise + */ + public boolean validAt(Date time); diff --git a/voms-api-java.spec b/voms-api-java.spec index 9f0d619..dc4acbc 100644 --- a/voms-api-java.spec +++ b/voms-api-java.spec @@ -1,6 +1,6 @@ Name: voms-api-java Version: 3.0.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Virtual Organization Membership Service Java API Group: Development/Libraries @@ -11,6 +11,8 @@ Source0: https://github.com/italiangrid/%{name}/archive/v%{version}.tar.gz Patch0: %{name}-bc147.patch # Disable tests using non-local network interface Patch1: %{name}-no-local.patch +# Fix javadoc warnings/errors +Patch2: %{name}-javadoc.patch BuildArch: noarch BuildRequires: maven-local @@ -18,20 +20,13 @@ BuildRequires: mvn(org.apache.maven.plugins:maven-assembly-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-compiler-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-javadoc-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-release-plugin) - BuildRequires: mvn(eu.eu-emi.security:canl) -%if %{?fedora}%{!?fedora:0} >= 21 || %{?rhel}%{!?rhel:0} >= 7 BuildRequires: mvn(org.bouncycastle:bcpkix-jdk15on) -%else -BuildRequires: mvn(org.bouncycastle:bcmail-jdk16) -%endif - BuildRequires: mvn(junit:junit) -%if %{?fedora}%{!?fedora:0} -# Missing stuff in EPEL (mostly test frameworks) -BuildRequires: mvn(com.mycila.maven-license-plugin:maven-license-plugin) -BuildRequires: mvn(org.codehaus.mojo:cobertura-maven-plugin) BuildRequires: mvn(org.mockito:mockito-core) +%if %{?fedora}%{!?fedora:0} +# Missing in EPEL +BuildRequires: mvn(com.mycila.maven-license-plugin:maven-license-plugin) BuildRequires: mvn(net.jcip:jcip-annotations) %endif @@ -54,47 +49,48 @@ Virtual Organization Membership Service (VOMS) Java API Documentation. %prep %setup -q - -%if %{?fedora}%{!?fedora:0} >= 21 || %{?rhel}%{!?rhel:0} >= 7 %patch0 -p1 -%pom_xpath_replace "pom:project/pom:dependencies/pom:dependency[pom:artifactId='bcmail']/pom:groupId/text()" "org.bouncycastle" -%pom_xpath_replace "pom:project/pom:dependencies/pom:dependency[pom:artifactId='bcmail']/pom:artifactId/text()" "bcpkix-jdk15on" -%else -%pom_xpath_replace "pom:project/pom:dependencies/pom:dependency[pom:artifactId='bcmail']/pom:groupId/text()" "org.bouncycastle" -%pom_xpath_replace "pom:project/pom:dependencies/pom:dependency[pom:artifactId='bcmail']/pom:artifactId/text()" "bcmail-jdk16" -%endif %patch1 -p1 +%patch2 -p1 + +%pom_xpath_set "pom:project/pom:dependencies/pom:dependency[pom:artifactId='bcmail']/pom:groupId" "org.bouncycastle" +%pom_xpath_set "pom:project/pom:dependencies/pom:dependency[pom:artifactId='bcmail']/pom:artifactId" "bcpkix-jdk15on" + +%pom_remove_plugin org.codehaus.mojo:cobertura-maven-plugin %if %{?fedora}%{!?fedora:0} %pom_xpath_inject "pom:project/pom:build/pom:plugins/pom:plugin[pom:groupId='com.mycila.maven-license-plugin']/pom:configuration/pom:excludes" ".xmvn/**" %pom_xpath_remove "pom:project/pom:build/pom:plugins/pom:plugin[pom:groupId='com.mycila.maven-license-plugin']/pom:configuration/pom:strictCheck" %else -# Missing stuff in EPEL (mostly test frameworks) +# Missing in EPEL %pom_remove_plugin com.mycila.maven-license-plugin:maven-license-plugin -%pom_remove_plugin org.codehaus.mojo:cobertura-maven-plugin %pom_remove_dep net.jcip:jcip-annotations -%pom_remove_dep org.mockito:mockito-core %endif %build -%if %{?fedora}%{!?fedora:0} %mvn_build -%else -# Can not run tests in EPEL due to missing test frameworks -%mvn_build -f -%endif %install %mvn_install -J target/site/javadoc/apidocs %files -f .mfiles %dir %{_javadir}/%{name} -%doc AUTHORS LICENSE README.md +%if %{?fedora}%{!?fedora:0} >= 21 || %{?rhel}%{!?rhel:0} >= 8 +%dir %{_mavenpomdir}/%{name} +%endif +%doc AUTHORS README.md +%license LICENSE %files javadoc -f .mfiles-javadoc -%doc LICENSE +%license LICENSE %changelog +* Sat Jul 11 2015 Mattias Ellert - 3.0.5-3 +- Remove build-dependency on cobertura-maven-plugin + (cobertura was removed from Fedora due to licensing issues) +- Enable tests in EPEL 7 +- Implement new license packaging guidelines + * Fri Jun 19 2015 Fedora Release Engineering - 3.0.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild