diff --git a/pom.xml b/pom.xml index d981dfc..5276d7d 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ de.dentrassi.maven rpm - 1.8.1-SNAPSHOT + 1.9.0-SNAPSHOT maven-plugin @@ -42,7 +42,7 @@ 3.3.9 1.70 - 0.18.0 + 0.19.0 diff --git a/src/main/java/de/dentrassi/rpm/builder/RpmMojo.java b/src/main/java/de/dentrassi/rpm/builder/RpmMojo.java index 785e325..29ff55f 100644 --- a/src/main/java/de/dentrassi/rpm/builder/RpmMojo.java +++ b/src/main/java/de/dentrassi/rpm/builder/RpmMojo.java @@ -69,6 +69,7 @@ import org.eclipse.packager.rpm.build.RpmFileNameProvider; import org.eclipse.packager.rpm.deps.RpmDependencyFlags; import org.eclipse.packager.rpm.signature.RsaHeaderSignatureProcessor; +import org.eclipse.packager.rpm.signature.RsaSignatureProcessor; import org.eclipse.packager.rpm.signature.SignatureProcessor; import com.google.common.base.Strings; @@ -794,9 +795,11 @@ public void execute() throws MojoExecutionException, MojoFailureException { } if (!this.skipSigning && this.signature != null) { - final SignatureProcessor signer = makeRsaSigner(this.signature); - if (signer != null) { - builder.addSignatureProcessor(signer); + final SignatureProcessor[] signers = makeRsaSigners(this.signature); + if (signers != null) { + for (SignatureProcessor signer : signers ) { + builder.addSignatureProcessor(signer); + } } } @@ -875,12 +878,15 @@ private void testLeadFlags() { } - private SignatureProcessor makeRsaSigner(final Signature signature) throws MojoExecutionException, MojoFailureException { + private SignatureProcessor[] makeRsaSigners(final Signature signature) throws MojoExecutionException, MojoFailureException { final PGPPrivateKey privateKey = SigningHelper.loadKey(signature, this.logger); if (privateKey == null) { return null; } - return new RsaHeaderSignatureProcessor(privateKey, HashAlgorithm.from(signature.getHashAlgorithm())); + return new SignatureProcessor[]{ + new RsaHeaderSignatureProcessor(privateKey, HashAlgorithm.from(signature.getHashAlgorithm())), + new RsaSignatureProcessor(privateKey, HashAlgorithm.from(signature.getHashAlgorithm())) + }; } @FunctionalInterface