failOnError = true
maxMemory = "1024M"
javadocTool = javaToolchains.javadocToolFor {
- languageVersion = JavaLanguageVersion.of(11)
+ languageVersion = JavaLanguageVersion.of(Math.max(11,jdkVersion))
}
doFirst {
import java.util.Map;
import java.util.TimeZone;
+import javax.security.auth.x500.X500Principal;
import javax.xml.XMLConstants;
import javax.xml.crypto.XMLStructure;
import javax.xml.crypto.dom.DOMStructure;
protected static void setCertID
(CertIDType certId, SignatureConfig signatureConfig, boolean issuerNameNoReverseOrder, X509Certificate certificate) {
X509IssuerSerialType issuerSerial = certId.addNewIssuerSerial();
+ X500Principal issuerPrincipal = certificate.getIssuerX500Principal();
String issuerName;
if (issuerNameNoReverseOrder) {
/*
* XXX: not correct according to RFC 4514.
*/
// TODO: check if issuerName is different on getTBSCertificate
- // issuerName = PrincipalUtil.getIssuerX509Principal(certificate).getName().replace(",", ", ");
- issuerName = certificate.getIssuerDN().getName().replace(",", ", ");
+ issuerName = issuerPrincipal.getName().replace(",", ", ");
} else {
- issuerName = certificate.getIssuerX500Principal().toString();
+ issuerName = issuerPrincipal.toString();
}
issuerSerial.setX509IssuerName(issuerName);
issuerSerial.setX509SerialNumber(certificate.getSerialNumber());