From e15df532339b33fb331b45f17e3939b6b7797333 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Mar 2021 05:21:58 +0000 Subject: [PATCH 1/2] Bump maven-shared-utils from 3.1.0 to 3.3.3 Bumps [maven-shared-utils](https://github.com/apache/maven-shared-utils) from 3.1.0 to 3.3.3. - [Release notes](https://github.com/apache/maven-shared-utils/releases) - [Commits](https://github.com/apache/maven-shared-utils/compare/maven-shared-utils-3.1.0...maven-shared-utils-3.3.3) Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e98d743d..aa22a47f 100644 --- a/pom.xml +++ b/pom.xml @@ -115,7 +115,7 @@ org.apache.maven.shared maven-shared-utils - 3.1.0 + 3.3.3 org.bouncycastle From d0f46316efe1d71c4f4f12aa1b7acabaa17a78a1 Mon Sep 17 00:00:00 2001 From: Slawomir Jaranowski Date: Mon, 29 Mar 2021 22:13:53 +0200 Subject: [PATCH 2/2] fix after maven-shared-utils update --- src/it/sigOkKeysMapWithPluginDependencies/keysmap.list | 1 + src/main/java/org/simplify4u/plugins/PGPShowMojo.java | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/it/sigOkKeysMapWithPluginDependencies/keysmap.list b/src/it/sigOkKeysMapWithPluginDependencies/keysmap.list index 483cb586..35b215fc 100644 --- a/src/it/sigOkKeysMapWithPluginDependencies/keysmap.list +++ b/src/it/sigOkKeysMapWithPluginDependencies/keysmap.list @@ -232,6 +232,7 @@ org.apache.maven.shared = \ 0x849FB4F1AF3D17CDE4DE5E710704ADDF1D821345, \ 0xAE9E53FC28FF2AB1012273D0BF1518E0160788A2, \ 0xB02137D875D833D9B23392ECAE5A7FB608A0221C, \ + 0xB920D295BF0E61CB4CF0896C33CD6733AF5EC452, \ 0xBA926F64CA647B6D853A38672E2010F8A7FF4A41, \ 0xF254B35617DC255D9344BCFA873A8E86B4372146 diff --git a/src/main/java/org/simplify4u/plugins/PGPShowMojo.java b/src/main/java/org/simplify4u/plugins/PGPShowMojo.java index 90ac6824..b4c30b0a 100644 --- a/src/main/java/org/simplify4u/plugins/PGPShowMojo.java +++ b/src/main/java/org/simplify4u/plugins/PGPShowMojo.java @@ -121,7 +121,7 @@ private void processArtifact(Artifact artifact, Artifact artifactAsc) { classifier -> messageBuilder.a("\tclassifier: ").strong(classifier).newline()); messageBuilder.a("\tversion: ").strong(artifactInfo.getVersion()).newline(); if (signatureInfo.getStatus() == SignatureStatus.ARTIFACT_NOT_RESOLVED) { - messageBuilder.a("\t").error("artifact was not resolved - try mvn -U ...").newline(); + messageBuilder.a("\t").failure("artifact was not resolved - try mvn -U ...").newline(); } messageBuilder.newline(); @@ -140,12 +140,12 @@ private void processArtifact(Artifact artifact, Artifact artifactAsc) { if (signatureInfo.getStatus() == SignatureStatus.SIGNATURE_VALID) { messageBuilder.success("valid"); } else { - messageBuilder.error("invalid"); + messageBuilder.failure("invalid"); } messageBuilder.newline(); } else if (signatureInfo.getStatus() == SignatureStatus.SIGNATURE_NOT_RESOLVED) { messageBuilder.a("\t") - .error("PGP signature was not resolved - try mvn -U ...").newline(); + .failure("PGP signature was not resolved - try mvn -U ...").newline(); } messageBuilder.newline(); @@ -168,7 +168,7 @@ private void processArtifact(Artifact artifact, Artifact artifactAsc) { messageBuilder.newline(); Optional.ofNullable(signatureInfo.getErrorMessage()).ifPresent(errorMessage -> - messageBuilder.error(errorMessage).newline()); + messageBuilder.failure(errorMessage).newline()); LOGGER.info(messageBuilder.toString());