You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2022/02/24 11:12:45 UTC
[maven-dist-tool] branch master updated: improve message if key id is different
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-dist-tool.git
The following commit(s) were added to refs/heads/master by this push:
new a7fdf2c improve message if key id is different
a7fdf2c is described below
commit a7fdf2ce50c170be4fb5dd5bfd22028351acd629
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Thu Feb 24 12:12:38 2022 +0100
improve message if key id is different
---
.../apache/maven/dist/tools/pgp/CheckPgpKeysReport.java | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/apache/maven/dist/tools/pgp/CheckPgpKeysReport.java b/src/main/java/org/apache/maven/dist/tools/pgp/CheckPgpKeysReport.java
index 893780b..576083b 100644
--- a/src/main/java/org/apache/maven/dist/tools/pgp/CheckPgpKeysReport.java
+++ b/src/main/java/org/apache/maven/dist/tools/pgp/CheckPgpKeysReport.java
@@ -136,12 +136,23 @@ public class CheckPgpKeysReport
sink.numberedList( 0 );
KeysIterator distIterator = new KeysIterator( distKeys );
- while ( distIterator.hasNext() )
+ KeysIterator projectIterator = new KeysIterator( projectKeys );
+ while ( distIterator.hasNext() || projectIterator.hasNext() )
{
+ String distKey = distIterator.hasNext() ? distIterator.next() : "";
+ String projectKey = projectIterator.hasNext() ? projectIterator.next() : "";
+
sink.numberedListItem();
sink.verbatim( true );
- sink.rawText( distIterator.next() );
+ sink.rawText( distKey );
sink.verbatim_();
+ if ( !projectKey.equals( distKey ) )
+ {
+ iconError( sink );
+ sink.verbatim( true );
+ sink.rawText( projectKey );
+ sink.verbatim_();
+ }
sink.numberedListItem_();
}
sink.numberedList_();