mirror of
https://github.com/jlengrand/jreleaser.git
synced 2026-03-10 08:31:24 +00:00
[model] rename skipTagging to skipTag. Fixes #45
This commit is contained in:
@@ -61,7 +61,7 @@ public abstract class GitService implements Releaser, CommitAuthorProvider, Owne
|
||||
private String tagName;
|
||||
private String releaseName;
|
||||
private boolean sign;
|
||||
private boolean skipTagging;
|
||||
private boolean skipTag;
|
||||
private boolean overwrite;
|
||||
private boolean update;
|
||||
private String apiEndpoint;
|
||||
@@ -95,7 +95,7 @@ public abstract class GitService implements Releaser, CommitAuthorProvider, Owne
|
||||
this.tagName = service.tagName;
|
||||
this.releaseName = service.releaseName;
|
||||
this.sign = service.sign;
|
||||
this.skipTagging = service.skipTagging;
|
||||
this.skipTag = service.skipTag;
|
||||
this.overwrite = service.overwrite;
|
||||
this.update = service.update;
|
||||
this.apiEndpoint = service.apiEndpoint;
|
||||
@@ -349,12 +349,12 @@ public abstract class GitService implements Releaser, CommitAuthorProvider, Owne
|
||||
this.sign = sign;
|
||||
}
|
||||
|
||||
public boolean isSkipTagging() {
|
||||
return skipTagging;
|
||||
public boolean isSkipTag() {
|
||||
return skipTag;
|
||||
}
|
||||
|
||||
public void setSkipTagging(boolean skipTagging) {
|
||||
this.skipTagging = skipTagging;
|
||||
public void setSkipTag(boolean skipTag) {
|
||||
this.skipTag = skipTag;
|
||||
}
|
||||
|
||||
public Changelog getChangelog() {
|
||||
@@ -417,7 +417,7 @@ public abstract class GitService implements Releaser, CommitAuthorProvider, Owne
|
||||
map.put("releaseName", releaseName);
|
||||
map.put("commitAuthor", commitAuthor.asMap());
|
||||
map.put("sign", sign);
|
||||
map.put("skipTagging", skipTagging);
|
||||
map.put("skipTag", skipTag);
|
||||
map.put("overwrite", overwrite);
|
||||
map.put("update", update);
|
||||
map.put("apiEndpoint", apiEndpoint);
|
||||
|
||||
@@ -58,7 +58,7 @@ interface GitService extends Releaser {
|
||||
|
||||
Property<Boolean> getSign()
|
||||
|
||||
Property<Boolean> getSkipTagging()
|
||||
Property<Boolean> getSkipTag()
|
||||
|
||||
Property<String> getApiEndpoint()
|
||||
|
||||
|
||||
@@ -53,7 +53,7 @@ abstract class AbstractGitService implements GitService {
|
||||
final Property<String> tagName
|
||||
final Property<String> releaseName
|
||||
final Property<Boolean> sign
|
||||
final Property<Boolean> skipTagging
|
||||
final Property<Boolean> skipTag
|
||||
final Property<String> apiEndpoint
|
||||
final Property<Boolean> overwrite
|
||||
final Property<Boolean> update
|
||||
@@ -77,7 +77,7 @@ abstract class AbstractGitService implements GitService {
|
||||
tagName = objects.property(String).convention(Providers.notDefined())
|
||||
releaseName = objects.property(String).convention(Providers.notDefined())
|
||||
sign = objects.property(Boolean).convention(Providers.notDefined())
|
||||
skipTagging = objects.property(Boolean).convention(Providers.notDefined())
|
||||
skipTag = objects.property(Boolean).convention(Providers.notDefined())
|
||||
apiEndpoint = objects.property(String).convention(Providers.notDefined())
|
||||
overwrite = objects.property(Boolean).convention(Providers.notDefined())
|
||||
update = objects.property(Boolean).convention(Providers.notDefined())
|
||||
@@ -101,7 +101,7 @@ abstract class AbstractGitService implements GitService {
|
||||
tagName.present ||
|
||||
releaseName.present ||
|
||||
sign.present ||
|
||||
skipTagging.present ||
|
||||
skipTag.present ||
|
||||
apiEndpoint.present ||
|
||||
overwrite.present ||
|
||||
update.present
|
||||
@@ -140,7 +140,7 @@ abstract class AbstractGitService implements GitService {
|
||||
if (releaseName.present) service.releaseName = releaseName.get()
|
||||
if (apiEndpoint.present) service.apiEndpoint = apiEndpoint.get()
|
||||
service.sign = sign.getOrElse(false)
|
||||
service.skipTagging = skipTagging.getOrElse(false)
|
||||
service.skipTag = skipTag.getOrElse(false)
|
||||
service.overwrite = overwrite.getOrElse(false)
|
||||
service.update = update.getOrElse(false)
|
||||
}
|
||||
|
||||
@@ -41,7 +41,7 @@ public abstract class GitService implements Releaser {
|
||||
private String tagName;
|
||||
private String releaseName;
|
||||
private boolean sign;
|
||||
private boolean skipTagging;
|
||||
private boolean skipTag;
|
||||
private boolean overwrite;
|
||||
private boolean update;
|
||||
private String apiEndpoint;
|
||||
@@ -63,7 +63,7 @@ public abstract class GitService implements Releaser {
|
||||
this.tagName = service.tagName;
|
||||
this.releaseName = service.releaseName;
|
||||
this.sign = service.sign;
|
||||
this.skipTagging = service.skipTagging;
|
||||
this.skipTag = service.skipTag;
|
||||
this.overwrite = service.overwrite;
|
||||
this.update = service.update;
|
||||
this.apiEndpoint = service.apiEndpoint;
|
||||
@@ -215,12 +215,12 @@ public abstract class GitService implements Releaser {
|
||||
this.sign = sign;
|
||||
}
|
||||
|
||||
public boolean isSkipTagging() {
|
||||
return skipTagging;
|
||||
public boolean isSkipTag() {
|
||||
return skipTag;
|
||||
}
|
||||
|
||||
public void setSkipTagging(boolean skipTagging) {
|
||||
this.skipTagging = skipTagging;
|
||||
public void setSkipTag(boolean skipTag) {
|
||||
this.skipTag = skipTag;
|
||||
}
|
||||
|
||||
public Changelog getChangelog() {
|
||||
|
||||
@@ -177,7 +177,7 @@ public final class JReleaserModelConverter {
|
||||
if (isNotBlank(service.getReleaseName())) s.setReleaseName(service.getReleaseName());
|
||||
s.setCommitAuthor(convertCommitAuthor(service.getCommitAuthor()));
|
||||
s.setSign(service.isSign());
|
||||
s.setSkipTagging(service.isSkipTagging());
|
||||
s.setSkipTag(service.isSkipTag());
|
||||
s.setOverwrite(service.isOverwrite());
|
||||
s.setUpdate(service.isUpdate());
|
||||
s.setApiEndpoint(service.getApiEndpoint());
|
||||
|
||||
@@ -125,7 +125,7 @@ public class GiteaReleaser implements Releaser {
|
||||
}
|
||||
|
||||
// local tag
|
||||
if (deleteTags || !gitea.isSkipTagging()) {
|
||||
if (deleteTags || !gitea.isSkipTag()) {
|
||||
context.getLogger().debug("tagging local repository with {}", tagName);
|
||||
GitSdk.of(context).tag(tagName, true);
|
||||
}
|
||||
|
||||
@@ -122,7 +122,7 @@ public class GithubReleaser implements Releaser {
|
||||
}
|
||||
|
||||
// local tag
|
||||
if (deleteTags || !github.isSkipTagging()) {
|
||||
if (deleteTags || !github.isSkipTag()) {
|
||||
context.getLogger().debug("tagging local repository with {}", tagName);
|
||||
GitSdk.of(context).tag(tagName, true);
|
||||
}
|
||||
|
||||
@@ -136,7 +136,7 @@ public class GitlabReleaser implements Releaser {
|
||||
}
|
||||
|
||||
// local tag
|
||||
if (deleteTags || !gitlab.isSkipTagging()) {
|
||||
if (deleteTags || !gitlab.isSkipTag()) {
|
||||
context.getLogger().debug("tagging local repository with {}", tagName);
|
||||
GitSdk.of(context).tag(tagName, true);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user