SSH authentication causes nil pointer dereference

jfrog · Oct 8, 2017 · 797585e · 797585e
1 parent 9df5624
commit 797585e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/jfrog-cli/artifactory/commands/mvn.go b/jfrog-cli/artifactory/commands/mvn.go
@@ -101,7 +101,7 @@ func createMvnRunConfig(goals, configPath string, flags *utils.BuildConfigFlags,
 	}
 
 	if len(plexusClassworlds) != 1 {
-		return nil, errorutils.CheckError(errors.New("Couldn't find plexus-classworlds-x.x.x.jar in Maven installation path, please check M2_HOME environmetn variable."))
+		return nil, errorutils.CheckError(errors.New("couldn't find plexus-classworlds-x.x.x.jar in Maven installation path, please check M2_HOME environment variable"))
 	}
 
 	var currentWorkdir string

diff --git a/jfrog-cli/utils/cliutils/utils.go b/jfrog-cli/utils/cliutils/utils.go
@@ -137,7 +137,7 @@ func confirmAnswer(answer string) bool {
 }
 
 func GetVersion() string {
-	return "1.11.1"
+	return "1.11.2"
 }
 
 func GetConfigVersion() string {

diff --git a/jfrog-client/artifactory/configbuilder.go b/jfrog-client/artifactory/configbuilder.go
@@ -53,14 +53,14 @@ func (builder *ArtifactoryServicesConfigBuilder) SetDryRun(dryRun bool) *Artifac
 
 func (builder *ArtifactoryServicesConfigBuilder) Build() (ArtifactoryConfig, error) {
 	c := &artifactoryServicesConfig{}
+	c.ArtifactoryDetails = builder.ArtifactoryDetails
 	if builder.SshKeysPath != "" {
 		header, err := builder.ArtifactoryDetails.SshAuthentication()
 		if err != nil {
 			return nil, err
 		}
 		c.SshAuthHeaders = header
 	}
-	c.ArtifactoryDetails = builder.ArtifactoryDetails
 
 	if builder.threads == 0 {
 		c.threads = 3