Skip to content
Permalink
Browse files
Merge pull request #8 from silpion/bugfix/JENKINS-29567_default-packa…
…ging

Bugfix JENKINS-29567: Invalid artifact URL when packaging is not specified
  • Loading branch information
marcrohlfs committed Sep 22, 2015
2 parents 783b38d + 35d8239 commit e40394130fa3de1daff0858988951cac52578af9
Showing with 4 additions and 4 deletions.
  1. +4 −4 src/main/lombok/eu/markov/jenkins/plugin/mvnmeta/MavenMetadataParameterDefinition.java
@@ -144,16 +144,16 @@ public Pattern getVersionFilterPattern() {
return versionFilterPattern;
}

public String readPackaging() {
public String getPackaging() {
if (StringUtils.isNotBlank(this.packaging)) {
return this.packaging;
}
return "jar";
}

private ParameterValue createValue(String version) {
return new MavenMetadataParameterValue(getName(), getDescription(), getGroupId(), getArtifactId(), version, readPackaging(),
getFullArtifactUrl(getGroupId(), getArtifactId(), version, readPackaging()));
return new MavenMetadataParameterValue(getName(), getDescription(), getGroupId(), getArtifactId(), version, getPackaging(),
getFullArtifactUrl(getGroupId(), getArtifactId(), version, getPackaging()));
}

// Create a parameter value from the string given in the CLI.
@@ -212,7 +212,7 @@ public ParameterValue getDefaultParameterValue() {
}

return new MavenMetadataParameterValue(getName(), getDescription(), getGroupId(), getArtifactId(), defaultVersion,
readPackaging(), getFullArtifactUrl(getGroupId(), getArtifactId(), defaultVersion, readPackaging()));
getPackaging(), getFullArtifactUrl(getGroupId(), getArtifactId(), defaultVersion, getPackaging()));
}

@Override

0 comments on commit e403941

Please sign in to comment.