From bf54c920ba667bebbf8deae79dc4e298929876cf Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 10 Jul 2026 01:07:05 +0000
Subject: [PATCH 1/3] Update dependency org.jenkins-ci.plugins:plugin to
 v6.2208.vb_6798604237e

Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index fc063b544d..288bef0ea7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>6.2189.v695a_c41f5249</version>
+    <version>6.2208.vb_6798604237e</version>
     <relativePath />
   </parent>
 

From c694d3ae5c5831c50a9bfe56719ce839054d5d14 Mon Sep 17 00:00:00 2001
From: Mark Waite <mark.earl.waite@gmail.com>
Date: Sat, 11 Jul 2026 14:10:19 -0600
Subject: [PATCH 2/3] Limit visibility of overridden methods to silence
 spotbugs

---
 .../gitclient/verifier/AcceptFirstConnectionVerifier.java       | 2 +-
 .../plugins/gitclient/verifier/KnownHostsFileVerifier.java      | 2 +-
 .../plugins/gitclient/verifier/ManuallyProvidedKeyVerifier.java | 2 +-
 .../jenkinsci/plugins/gitclient/verifier/NoHostKeyVerifier.java | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/jenkinsci/plugins/gitclient/verifier/AcceptFirstConnectionVerifier.java b/src/main/java/org/jenkinsci/plugins/gitclient/verifier/AcceptFirstConnectionVerifier.java
index e53750908a..38b4450321 100644
--- a/src/main/java/org/jenkinsci/plugins/gitclient/verifier/AcceptFirstConnectionVerifier.java
+++ b/src/main/java/org/jenkinsci/plugins/gitclient/verifier/AcceptFirstConnectionVerifier.java
@@ -35,7 +35,7 @@ protected boolean askAboutKnowHostFile() {
         }
 
         @Override
-        public ServerKeyDatabase.Configuration getServerKeyDatabaseConfiguration() {
+        protected ServerKeyDatabase.Configuration getServerKeyDatabaseConfiguration() {
             return new AbstractJGitHostKeyVerifier.DefaultConfiguration(
                     this.getHostKeyVerifierFactory(),
                     () -> ServerKeyDatabase.Configuration.StrictHostKeyChecking.ACCEPT_NEW);
diff --git a/src/main/java/org/jenkinsci/plugins/gitclient/verifier/KnownHostsFileVerifier.java b/src/main/java/org/jenkinsci/plugins/gitclient/verifier/KnownHostsFileVerifier.java
index 8842050ccd..042f1045e1 100644
--- a/src/main/java/org/jenkinsci/plugins/gitclient/verifier/KnownHostsFileVerifier.java
+++ b/src/main/java/org/jenkinsci/plugins/gitclient/verifier/KnownHostsFileVerifier.java
@@ -56,7 +56,7 @@ public KnownHostsFileJGitHostKeyVerifier(TaskListener listener, HostKeyVerifierF
         }
 
         @Override
-        public ServerKeyDatabase.Configuration getServerKeyDatabaseConfiguration() {
+        protected ServerKeyDatabase.Configuration getServerKeyDatabaseConfiguration() {
             return new AbstractJGitHostKeyVerifier.DefaultConfiguration(
                     this.getHostKeyVerifierFactory(),
                     () -> ServerKeyDatabase.Configuration.StrictHostKeyChecking.REQUIRE_MATCH);
diff --git a/src/main/java/org/jenkinsci/plugins/gitclient/verifier/ManuallyProvidedKeyVerifier.java b/src/main/java/org/jenkinsci/plugins/gitclient/verifier/ManuallyProvidedKeyVerifier.java
index 222550a377..552bfedfc0 100644
--- a/src/main/java/org/jenkinsci/plugins/gitclient/verifier/ManuallyProvidedKeyVerifier.java
+++ b/src/main/java/org/jenkinsci/plugins/gitclient/verifier/ManuallyProvidedKeyVerifier.java
@@ -78,7 +78,7 @@ public ManuallyProvidedKeyJGitHostKeyVerifier(
         }
 
         @Override
-        public ServerKeyDatabase.Configuration getServerKeyDatabaseConfiguration() {
+        protected ServerKeyDatabase.Configuration getServerKeyDatabaseConfiguration() {
             return new AbstractJGitHostKeyVerifier.DefaultConfiguration(
                     this.getHostKeyVerifierFactory(),
                     () -> ServerKeyDatabase.Configuration.StrictHostKeyChecking.REQUIRE_MATCH);
diff --git a/src/main/java/org/jenkinsci/plugins/gitclient/verifier/NoHostKeyVerifier.java b/src/main/java/org/jenkinsci/plugins/gitclient/verifier/NoHostKeyVerifier.java
index d849a1aea1..d8f85b9d36 100644
--- a/src/main/java/org/jenkinsci/plugins/gitclient/verifier/NoHostKeyVerifier.java
+++ b/src/main/java/org/jenkinsci/plugins/gitclient/verifier/NoHostKeyVerifier.java
@@ -42,7 +42,7 @@ public NoHostJGitKeyVerifier(TaskListener listener, HostKeyVerifierFactory hostK
         }
 
         @Override
-        public ServerKeyDatabase.Configuration getServerKeyDatabaseConfiguration() {
+        protected ServerKeyDatabase.Configuration getServerKeyDatabaseConfiguration() {
             return new AbstractJGitHostKeyVerifier.DefaultConfiguration(
                     this.getHostKeyVerifierFactory(),
                     () -> ServerKeyDatabase.Configuration.StrictHostKeyChecking.ACCEPT_ANY);

From 02ccd87eef96ca5db4160c2c7ed0449a60b6d92f Mon Sep 17 00:00:00 2001
From: Mark Waite <mark.earl.waite@gmail.com>
Date: Sat, 11 Jul 2026 14:21:10 -0600
Subject: [PATCH 3/3] Ignore USO_UNSAFE_METHOD_SYNCHRONIZATION in Netrc

---
 src/main/java/org/jenkinsci/plugins/gitclient/Netrc.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/java/org/jenkinsci/plugins/gitclient/Netrc.java b/src/main/java/org/jenkinsci/plugins/gitclient/Netrc.java
index 79dd9d0fc4..b9fad1d20b 100644
--- a/src/main/java/org/jenkinsci/plugins/gitclient/Netrc.java
+++ b/src/main/java/org/jenkinsci/plugins/gitclient/Netrc.java
@@ -1,6 +1,7 @@
 package org.jenkinsci.plugins.gitclient;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import hudson.plugins.git.GitException;
 import java.io.BufferedReader;
 import java.io.File;
@@ -79,6 +80,9 @@ private static File getDefaultFile() {
      * @param host a {@link java.lang.String} object.
      * @return a {@link org.apache.http.auth.Credentials} object.
      */
+    @SuppressFBWarnings(
+            value = "USO_UNSAFE_METHOD_SYNCHRONIZATION",
+            justification = "Using intrinsic lock is not an issue here")
     public synchronized Credentials getCredentials(String host) throws GitException {
         if (!this.netrc.exists()) {
             return null;