Compare commits

..

27 commits

Author SHA1 Message Date
ced207382c
Add test for certifying with revoked key 2025-04-10 15:26:00 +02:00
4325bfb2ee
Document update key 2025-04-10 14:36:49 +02:00
6796ec95e7
SOP update-key: Rename --no-new-mechanisms option to --no-added-capabilities 2025-04-10 14:36:28 +02:00
a705bb4c3d
Improve test 2025-04-10 14:17:38 +02:00
051499974d
Add basic test for certify-userid and validate-userid subcommands 2025-04-10 13:50:57 +02:00
cbdcfe54cb
reuse: convert dep5 file to toml file 2025-04-10 13:50:35 +02:00
f7e6de4aaa
Add new Exception types 2025-04-10 12:47:00 +02:00
a906028ce7
Fix formatting 2025-04-10 12:46:50 +02:00
3700c60fde
MergeCertsCmd: Fix default value of armor 2025-04-10 12:26:29 +02:00
1084cf6128
validate-userid: Add --validate-at option 2025-04-08 17:08:06 +02:00
7ee856f9b9
Remove call to explicitly set bundle to fix native image 2025-04-08 13:13:15 +02:00
b42b966866
Fix documentation of merge-certs command 2025-04-08 12:44:35 +02:00
0b68d9f04e
Bump version 2025-04-08 12:44:34 +02:00
db315e9ed2
Document endOfOptionsDelimiter 2025-04-08 12:44:19 +02:00
966ea3c3a6
Fix nullability of sop commands 2025-04-08 12:44:19 +02:00
f6d7af2dab
Add first test for new commands 2025-04-08 12:44:19 +02:00
3367450f94
Show endOfOptions delimiter in help 2025-04-08 12:44:19 +02:00
54782d2a22
Implement external variants of new subcommands 2025-04-08 12:44:19 +02:00
83eafd8817
Checkstyle 2025-04-08 12:44:19 +02:00
6c7fcfccce
Implement validate-userid command 2025-04-08 12:44:18 +02:00
04f7a5d30d
Update msg files with input/output information 2025-04-08 12:44:18 +02:00
88d3301daa
Checkstyle and exception handling improvements 2025-04-08 12:44:18 +02:00
6fc849bb6a
Implement certify-userid command 2025-04-08 12:44:18 +02:00
5bebdb779a
Add support for rendering help info for input and output 2025-04-08 12:44:17 +02:00
3e6e47ed50
Add implementation of merge-certs command 2025-04-08 12:41:08 +02:00
023b4ea45b
Add implementation of update-key command 2025-04-08 12:41:08 +02:00
dd07d10350
Add new exceptions 2025-04-08 12:41:07 +02:00
4 changed files with 18 additions and 21 deletions

View file

@ -68,6 +68,8 @@ allprojects {
description = "Stateless OpenPGP Protocol API for Java"
version = shortVersion
sourceCompatibility = javaSourceCompatibility
repositories {
mavenCentral()
}
@ -76,13 +78,6 @@ allprojects {
tasks.withType(AbstractArchiveTask) {
preserveFileTimestamps = false
reproducibleFileOrder = true
dirMode = 0755
fileMode = 0644
}
kotlin {
jvmToolchain(javaSourceCompatibility)
}
// Compatibility of default implementations in kotlin interfaces with Java implementations.
@ -117,7 +112,7 @@ allprojects {
}
jacoco {
toolVersion = "0.8.8"
toolVersion = "0.8.7"
}
jacocoTestReport {
@ -125,7 +120,7 @@ allprojects {
sourceDirectories.setFrom(project.files(sourceSets.main.allSource.srcDirs))
classDirectories.setFrom(project.files(sourceSets.main.output))
reports {
xml.required = true
xml.enabled true
}
}
@ -143,15 +138,15 @@ subprojects {
apply plugin: 'signing'
task sourcesJar(type: Jar, dependsOn: classes) {
archiveClassifier = 'sources'
classifier = 'sources'
from sourceSets.main.allSource
}
task javadocJar(type: Jar, dependsOn: javadoc) {
archiveClassifier = 'javadoc'
classifier = 'javadoc'
from javadoc.destinationDir
}
task testsJar(type: Jar, dependsOn: testClasses) {
archiveClassifier = 'tests'
classifier = 'tests'
from sourceSets.test.output
}
@ -248,7 +243,7 @@ task jacocoRootReport(type: JacocoReport) {
classDirectories.setFrom(files(subprojects.sourceSets.main.output))
executionData.setFrom(files(subprojects.jacocoTestReport.executionData))
reports {
xml.required = true
xml.enabled true
xml.destination file("${buildDir}/reports/jacoco/test/jacocoTestReport.xml")
}
// We could remove the following setOnlyIf line, but then
@ -259,6 +254,10 @@ task jacocoRootReport(type: JacocoReport) {
}
task javadocAll(type: Javadoc) {
def currentJavaVersion = JavaVersion.current()
if (currentJavaVersion.compareTo(JavaVersion.VERSION_1_9) >= 0) {
options.addStringOption("-release", "8");
}
source subprojects.collect {project ->
project.sourceSets.main.allJava }
destinationDir = new File(buildDir, 'javadoc')

View file

@ -21,9 +21,7 @@ class UpdateKeyExternal(binary: String, environment: Properties) : UpdateKey {
override fun signingOnly(): UpdateKey = apply { commandList.add("--signing-only") }
override fun noAddedCapabilities(): UpdateKey = apply {
commandList.add("--no-added-capabilities")
}
override fun noAddedCapabilities(): UpdateKey = apply { commandList.add("--no-added-capabilities") }
override fun withKeyPassword(password: ByteArray): UpdateKey = apply {
commandList.add("--with-key-password=@ENV:KEY_PASSWORD_$argCount")

View file

@ -20,14 +20,14 @@ interface UpdateKey {
fun noArmor(): UpdateKey
/**
* Allow key to be used for signing only. If this option is not present, the operation may add a
* new, encryption-capable component key.
* Allow key to be used for signing only.
* If this option is not present, the operation may add a new, encryption-capable component key.
*/
@Throws(SOPGPException.UnsupportedOption::class) fun signingOnly(): UpdateKey
/**
* Do not allow adding new capabilities to the key. If this option is not present, the operation
* may add support for new capabilities to the key.
* Do not allow adding new capabilities to the key.
* If this option is not present, the operation may add support for new capabilities to the key.
*/
@Throws(SOPGPException.UnsupportedOption::class) fun noAddedCapabilities(): UpdateKey

View file

@ -7,7 +7,7 @@ allprojects {
shortVersion = '11.0.0'
isSnapshot = true
minAndroidSdk = 10
javaSourceCompatibility = 11
javaSourceCompatibility = 1.8
gsonVersion = '2.10.1'
jsrVersion = '3.0.2'
junitVersion = '5.8.2'