diff --git a/core/jreleaser-model/src/main/java/org/jreleaser/model/GitService.java b/core/jreleaser-model/src/main/java/org/jreleaser/model/GitService.java index a5deabda..ae516769 100644 --- a/core/jreleaser-model/src/main/java/org/jreleaser/model/GitService.java +++ b/core/jreleaser-model/src/main/java/org/jreleaser/model/GitService.java @@ -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); diff --git a/plugins/jreleaser-gradle-plugin/src/main/groovy/org/jreleaser/gradle/plugin/dsl/GitService.groovy b/plugins/jreleaser-gradle-plugin/src/main/groovy/org/jreleaser/gradle/plugin/dsl/GitService.groovy index 34b713b4..1f3c9557 100644 --- a/plugins/jreleaser-gradle-plugin/src/main/groovy/org/jreleaser/gradle/plugin/dsl/GitService.groovy +++ b/plugins/jreleaser-gradle-plugin/src/main/groovy/org/jreleaser/gradle/plugin/dsl/GitService.groovy @@ -58,7 +58,7 @@ interface GitService extends Releaser { Property getSign() - Property getSkipTagging() + Property getSkipTag() Property getApiEndpoint() diff --git a/plugins/jreleaser-gradle-plugin/src/main/groovy/org/jreleaser/gradle/plugin/internal/dsl/AbstractGitService.groovy b/plugins/jreleaser-gradle-plugin/src/main/groovy/org/jreleaser/gradle/plugin/internal/dsl/AbstractGitService.groovy index e58bd18f..f93d0cc5 100644 --- a/plugins/jreleaser-gradle-plugin/src/main/groovy/org/jreleaser/gradle/plugin/internal/dsl/AbstractGitService.groovy +++ b/plugins/jreleaser-gradle-plugin/src/main/groovy/org/jreleaser/gradle/plugin/internal/dsl/AbstractGitService.groovy @@ -53,7 +53,7 @@ abstract class AbstractGitService implements GitService { final Property tagName final Property releaseName final Property sign - final Property skipTagging + final Property skipTag final Property apiEndpoint final Property overwrite final Property 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) } diff --git a/plugins/jreleaser-maven-plugin/src/main/java/org/jreleaser/maven/plugin/GitService.java b/plugins/jreleaser-maven-plugin/src/main/java/org/jreleaser/maven/plugin/GitService.java index 78c7bf90..8cf77afd 100644 --- a/plugins/jreleaser-maven-plugin/src/main/java/org/jreleaser/maven/plugin/GitService.java +++ b/plugins/jreleaser-maven-plugin/src/main/java/org/jreleaser/maven/plugin/GitService.java @@ -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() { diff --git a/plugins/jreleaser-maven-plugin/src/main/java/org/jreleaser/maven/plugin/internal/JReleaserModelConverter.java b/plugins/jreleaser-maven-plugin/src/main/java/org/jreleaser/maven/plugin/internal/JReleaserModelConverter.java index 2ba62809..d67bce06 100644 --- a/plugins/jreleaser-maven-plugin/src/main/java/org/jreleaser/maven/plugin/internal/JReleaserModelConverter.java +++ b/plugins/jreleaser-maven-plugin/src/main/java/org/jreleaser/maven/plugin/internal/JReleaserModelConverter.java @@ -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()); diff --git a/sdks/gitea-java-sdk/src/main/java/org/jreleaser/sdk/gitea/GiteaReleaser.java b/sdks/gitea-java-sdk/src/main/java/org/jreleaser/sdk/gitea/GiteaReleaser.java index 9a95896a..39e9180b 100644 --- a/sdks/gitea-java-sdk/src/main/java/org/jreleaser/sdk/gitea/GiteaReleaser.java +++ b/sdks/gitea-java-sdk/src/main/java/org/jreleaser/sdk/gitea/GiteaReleaser.java @@ -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); } diff --git a/sdks/github-java-sdk/src/main/java/org/jreleaser/sdk/github/GithubReleaser.java b/sdks/github-java-sdk/src/main/java/org/jreleaser/sdk/github/GithubReleaser.java index 4d42412d..9d4feaf5 100644 --- a/sdks/github-java-sdk/src/main/java/org/jreleaser/sdk/github/GithubReleaser.java +++ b/sdks/github-java-sdk/src/main/java/org/jreleaser/sdk/github/GithubReleaser.java @@ -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); } diff --git a/sdks/gitlab-java-sdk/src/main/java/org/jreleaser/sdk/gitlab/GitlabReleaser.java b/sdks/gitlab-java-sdk/src/main/java/org/jreleaser/sdk/gitlab/GitlabReleaser.java index c809783b..665d0c57 100644 --- a/sdks/gitlab-java-sdk/src/main/java/org/jreleaser/sdk/gitlab/GitlabReleaser.java +++ b/sdks/gitlab-java-sdk/src/main/java/org/jreleaser/sdk/gitlab/GitlabReleaser.java @@ -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); }