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/23 21:32:11 UTC
[maven-dist-tool] branch master updated: display PGP keys ids only
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 6c4b9e9 display PGP keys ids only
6c4b9e9 is described below
commit 6c4b9e987ce70682e9cd816d830233a698ff418c
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Wed Feb 23 22:32:05 2022 +0100
display PGP keys ids only
---
.../maven/dist/tools/pgp/CheckPgpKeysReport.java | 47 ++++++++++++++++++++--
1 file changed, 43 insertions(+), 4 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 4885bd7..893780b 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
@@ -28,6 +28,7 @@ import java.io.PrintWriter;
import java.io.Reader;
import java.io.StringWriter;
import java.net.URL;
+import java.util.Iterator;
import java.util.Locale;
import org.apache.commons.io.IOUtils;
@@ -115,7 +116,7 @@ public class CheckPgpKeysReport
sink.link_();
sink.listItem_();
sink.listItem();
- sink.rawText( "intermediate one in Maven Subvefrsion tree " );
+ sink.rawText( "intermediate one in Maven Subversion tree " );
sink.link( PROJECT_KEYS_URL );
sink.rawText( PROJECT_KEYS_URL );
sink.link_();
@@ -132,9 +133,19 @@ public class CheckPgpKeysReport
iconError( sink );
}
sink.paragraph_();
- sink.verbatim( true );
- sink.rawText( distKeys );
- sink.verbatim_();
+
+ sink.numberedList( 0 );
+ KeysIterator distIterator = new KeysIterator( distKeys );
+ while ( distIterator.hasNext() )
+ {
+ sink.numberedListItem();
+ sink.verbatim( true );
+ sink.rawText( distIterator.next() );
+ sink.verbatim_();
+ sink.numberedListItem_();
+ }
+ sink.numberedList_();
+
sink.section1_();
sink.body_();
sink.close();
@@ -161,4 +172,32 @@ public class CheckPgpKeysReport
throw new MavenReportException( "cannot fetch " + url, ioe );
}
}
+
+ private static class KeysIterator
+ implements Iterator<String>
+ {
+ private static final String BEGIN = "-----BEGIN PGP PUBLIC KEY BLOCK-----";
+ private static final String END = "-----END PGP PUBLIC KEY BLOCK-----";
+
+ private String content;
+
+ KeysIterator( String content )
+ {
+ this.content = content.substring( content.indexOf( "---" ) + 3 );
+ }
+
+ @Override
+ public boolean hasNext()
+ {
+ return content.length() > 0;
+ }
+
+ @Override
+ public String next()
+ {
+ String id = content.substring( 0, content.indexOf( BEGIN ) ).trim();
+ content = content.substring( content.indexOf( END ) + END.length() ).trim();
+ return id;
+ }
+ }
}