Merge branch 'master' into nextnext

* master: (497 commits)
  Prepare 7.3.0-SNAPSHOT builds
  Prepare 7.2.1-SNAPSHOT builds
  JGit v7.2.0.202503040940-r
  JGit v7.2.0.202503040805-r
  CacheRegion: fix non translatable text warnings
  Ensure access to autoRefresh is thread-safe
  FileReftableStack: use FileSnapshot to detect modification
  FileReftableDatabase: consider ref updates by another process
  BlameRegionMerger: report invalid regions with checked exception.
  Prepare 7.2.0-SNAPSHOT builds
  [ssh known_hosts] Handle unknown keys better
  [releng] Remove unused target platform definitions
  JGit v7.2.0.202502261823-rc1
  [ssh known_hosts] Handle host certificates
  [ssh known_hosts] Improve updating modified keys
  [ssh known_hosts] Add tests and fix problems
  [ssh, releng] Remove net.i2p.crypto.eddsa
  AddCommand: Use parenthesis to make the operator precedence explicit
  AddCommand: implement --all/--no-all
  Do not load bitmap indexes during directory scans
  ...

Change-Id: I619c89071f5f7a05bcd0218840f7f47bd19b779d

1 files changed, 5 insertions, 19 deletions

diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Log.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Log.java
index 852a4b377b..958e566986 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Log.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Log.java
@@ -32,13 +32,12 @@ import org.eclipse.jgit.errors.LargeObjectException;
 import org.eclipse.jgit.lib.AnyObjectId;
 import org.eclipse.jgit.lib.Constants;
 import org.eclipse.jgit.lib.GpgConfig;
-import org.eclipse.jgit.lib.GpgSignatureVerifier;
-import org.eclipse.jgit.lib.GpgSignatureVerifier.SignatureVerification;
-import org.eclipse.jgit.lib.GpgSignatureVerifierFactory;
+import org.eclipse.jgit.lib.SignatureVerifier.SignatureVerification;
 import org.eclipse.jgit.lib.ObjectId;
 import org.eclipse.jgit.lib.PersonIdent;
 import org.eclipse.jgit.lib.Ref;
 import org.eclipse.jgit.lib.Repository;
+import org.eclipse.jgit.lib.SignatureVerifiers;
 import org.eclipse.jgit.notes.NoteMap;
 import org.eclipse.jgit.pgm.internal.CLIText;
 import org.eclipse.jgit.pgm.internal.VerificationUtils;
@@ -174,8 +173,6 @@ class Log extends RevWalkTextBuiltin {
 	// END -- Options shared with Diff
 
 
-	private GpgSignatureVerifier verifier;
-
 	private GpgConfig config;
 
 	Log() {
@@ -227,9 +224,6 @@ class Log extends RevWalkTextBuiltin {
 			throw die(e.getMessage(), e);
 		} finally {
 			diffFmt.close();
-			if (verifier != null) {
-				verifier.clear();
-			}
 		}
 	}
 
@@ -293,21 +287,13 @@ class Log extends RevWalkTextBuiltin {
 		if (c.getRawGpgSignature() == null) {
 			return;
 		}
-		if (verifier == null) {
-			GpgSignatureVerifierFactory factory = GpgSignatureVerifierFactory
-					.getDefault();
-			if (factory == null) {
-				throw die(CLIText.get().logNoSignatureVerifier, null);
-			}
-			verifier = factory.getVerifier();
-		}
-		SignatureVerification verification = verifier.verifySignature(c,
-				config);
+		SignatureVerification verification = SignatureVerifiers.verify(db,
+				config, c);
 		if (verification == null) {
 			return;
 		}
 		VerificationUtils.writeVerification(outw, verification,
-				verifier.getName(), c.getCommitterIdent());
+				verification.verifierName(), c.getCommitterIdent());
 	}
 
 	/**