Skip to content

Commit 0fa0b84

Browse files
committed
WIP
1 parent 167d68a commit 0fa0b84

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

core/src/main/java/eu/maveniverse/maven/njord/shared/impl/publisher/basic/ArtifactChecksumValidator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ protected void validateArtifact(
9494
}
9595
}
9696
if (!algOk.isEmpty()) {
97-
chkCollector.addInfo("OK: " + String.join(", ", algOk));
97+
chkCollector.addInfo("VALID: " + String.join(", ", algOk));
9898
}
9999
if (mandatory && !algMissing.isEmpty()) {
100100
chkCollector.addError("MISSING: " + String.join(", ", algMissing));

core/src/main/java/eu/maveniverse/maven/njord/shared/impl/publisher/signature/ArtifactSignatureValidator.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,13 +74,15 @@ private void validateSignature(
7474
}
7575
if (signatureValidator.verifySignature(
7676
artifactStore.artifactContent(artifact).orElseThrow(), signatureContent)) {
77-
chkCollector.addInfo("Signature " + signatureValidator.name() + " VERIFIED");
77+
chkCollector.addInfo("VALID " + signatureValidator.name());
7878
} else {
79-
chkCollector.addError("Signature " + signatureValidator.name() + " FAILED");
79+
chkCollector.addError("MISMATCH " + signatureValidator.name());
8080
}
8181
} else {
8282
if (mandatory) {
83-
chkCollector.addError("Mandatory signature " + signatureValidator.name() + " MISSING");
83+
chkCollector.addError("MISSING " + signatureValidator.name());
84+
} else {
85+
chkCollector.addInfo("MISSING " + signatureValidator.name());
8486
}
8587
}
8688
}

plugin/src/main/java/eu/maveniverse/maven/njord/plugin3/ValidateMojo.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,19 +69,16 @@ protected void doExecute(NjordSession ns) throws IOException, MojoFailureExcepti
6969
private void dumpValidationResult(String prefix, ArtifactStoreValidator.ValidationResult vr) {
7070
logger.info("{} {}", prefix, vr.name());
7171
if (!vr.error().isEmpty()) {
72-
logger.error("{} Errors:", prefix);
7372
for (String msg : vr.error()) {
7473
logger.error("{} {}", prefix, msg);
7574
}
7675
}
7776
if (!vr.warning().isEmpty()) {
78-
logger.warn("{} Warnings:", prefix);
7977
for (String msg : vr.warning()) {
8078
logger.warn("{} {}", prefix, msg);
8179
}
8280
}
8381
if (!vr.info().isEmpty()) {
84-
logger.info("{} Info:", prefix);
8582
for (String msg : vr.info()) {
8683
logger.info("{} {}", prefix, msg);
8784
}

0 commit comments

Comments
 (0)