Bump dependencies

Bump Bouncy Castle to 1.75
Bump sop-java to 6.1.0
Bump pgpainless to 1.5.6
Bump wkd-java to 0.1.2
Bump vks-java to 0.1.3
Bump cert-d-pgpainless to 0.2.2
This commit is contained in:
Paul Schaub 2023-07-07 13:04:14 +02:00
parent f960521aab
commit a6e96f92d3
Signed by: vanitasvitae
GPG key ID: 62BEE9264BF17311
3 changed files with 26 additions and 12 deletions

View file

@ -19,7 +19,11 @@ dependencies {
// CLI // CLI
implementation "info.picocli:picocli:$picocliVersion" implementation "info.picocli:picocli:$picocliVersion"
implementation "org.pgpainless:pgpainless-cli:$pgpainlessVersion" implementation ("org.pgpainless:pgpainless-cli:$pgpainlessVersion") {
exclude group:'rg.slf4j', module:'slf4j-nop'
exclude group:'ch.qos.logback', module:'logback-core'
exclude group:'ch.qos.logback', module:'logback-classic'
}
implementation "org.pgpainless:sop-java-picocli:$sopJavaVersion" implementation "org.pgpainless:sop-java-picocli:$sopJavaVersion"
implementation ("org.pgpainless:wkd-java-cli:$wkdVersion") { implementation ("org.pgpainless:wkd-java-cli:$wkdVersion") {
exclude group:'rg.slf4j', module:'slf4j-nop' exclude group:'rg.slf4j', module:'slf4j-nop'

View file

@ -1,9 +1,7 @@
package org.pgpainless.pgpeasy; package org.pgpainless.pgpeasy;
import org.pgpainless.cli.PGPainlessCLI;
import org.pgpainless.pgpeasy.commands.Packet; import org.pgpainless.pgpeasy.commands.Packet;
import org.pgpainless.pgpeasy.commands.WOT; import org.pgpainless.pgpeasy.commands.WOT;
import org.pgpainless.sop.SOPImpl;
import pgp.cert_d.cli.PGPCertDCli; import pgp.cert_d.cli.PGPCertDCli;
import pgp.vks.client.cli.VKSCLI; import pgp.vks.client.cli.VKSCLI;
import pgp.wkd.cli.WKDCLI; import pgp.wkd.cli.WKDCLI;
@ -13,10 +11,12 @@ import sop.cli.picocli.SopCLI;
import sop.cli.picocli.commands.ArmorCmd; import sop.cli.picocli.commands.ArmorCmd;
import sop.cli.picocli.commands.DearmorCmd; import sop.cli.picocli.commands.DearmorCmd;
import sop.cli.picocli.commands.DecryptCmd; import sop.cli.picocli.commands.DecryptCmd;
import sop.cli.picocli.commands.DetachInbandSignatureAndMessageCmd;
import sop.cli.picocli.commands.EncryptCmd; import sop.cli.picocli.commands.EncryptCmd;
import sop.cli.picocli.commands.ExtractCertCmd; import sop.cli.picocli.commands.ExtractCertCmd;
import sop.cli.picocli.commands.GenerateKeyCmd; import sop.cli.picocli.commands.GenerateKeyCmd;
import sop.cli.picocli.commands.InlineDetachCmd;
import sop.cli.picocli.commands.InlineSignCmd;
import sop.cli.picocli.commands.InlineVerifyCmd;
import sop.cli.picocli.commands.SignCmd; import sop.cli.picocli.commands.SignCmd;
import sop.cli.picocli.commands.VerifyCmd; import sop.cli.picocli.commands.VerifyCmd;
@ -26,12 +26,14 @@ import sop.cli.picocli.commands.VerifyCmd;
EncryptCmd.class, EncryptCmd.class,
DecryptCmd.class, DecryptCmd.class,
SignCmd.class, SignCmd.class,
InlineSignCmd.class,
VerifyCmd.class, VerifyCmd.class,
InlineVerifyCmd.class,
ArmorCmd.class, ArmorCmd.class,
DearmorCmd.class, DearmorCmd.class,
ExtractCertCmd.class, ExtractCertCmd.class,
GenerateKeyCmd.class, GenerateKeyCmd.class,
DetachInbandSignatureAndMessageCmd.class, InlineDetachCmd.class,
// SOP as subcommand // SOP as subcommand
SopCLI.class, SopCLI.class,
@ -56,8 +58,16 @@ import sop.cli.picocli.commands.VerifyCmd;
) )
public class PGPeasy { public class PGPeasy {
static {
// Call static block of PGPainlessCLI
try {
Class.forName("org.pgpainless.cli.PGPainlessCLI");
} catch (ClassNotFoundException e) {
throw new RuntimeException(e);
}
}
public static void main(String[] args) { public static void main(String[] args) {
SopCLI.setSopInstance(new SOPImpl());
int exitCode = execute(args); int exitCode = execute(args);
if (exitCode != 0) { if (exitCode != 0) {
System.exit(exitCode); System.exit(exitCode);

View file

@ -1,14 +1,14 @@
allprojects { allprojects {
ext { ext {
bouncyCastleVersion = '1.71' bouncyCastleVersion = '1.75'
slf4jVersion = '1.7.36' slf4jVersion = '1.7.36'
logbackVersion = '1.2.11' logbackVersion = '1.2.11'
junitVersion = '5.8.2' junitVersion = '5.8.2'
sopJavaVersion = '1.2.3' sopJavaVersion = '6.1.0'
picocliVersion = '4.6.3' picocliVersion = '4.6.3'
pgpainlessVersion = '1.2.1' pgpainlessVersion = '1.5.6'
wkdVersion = '0.1.1' wkdVersion = '0.1.2'
vksVersion = '0.1.2' vksVersion = '0.1.3'
certDPgpainlessVersion = '0.1.2' certDPgpainlessVersion = '0.2.2'
} }
} }