Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
4 changes: 4 additions & 0 deletions src/main/java/org/jenkinsci/plugins/gitclient/Netrc.java
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down