From 606c878f4ba205057aa8be2b765f7c39b3cfb0be Mon Sep 17 00:00:00 2001 From: Andres Almiray Date: Sat, 27 Aug 2022 11:32:44 +0200 Subject: [PATCH] refactor(core): Additional log messages during validation --- .../main/java/org/jreleaser/model/AppImage.java | 2 +- .../main/java/org/jreleaser/model/Flatpak.java | 2 +- .../jreleaser/model/JReleaserModelValidator.java | 12 +++++++++--- .../java/org/jreleaser/model/util/Artifacts.java | 3 ++- .../model/validation/AnnouncersValidator.java | 7 ++++++- .../model/validation/AppImageValidator.java | 11 ++++++++--- .../model/validation/ArchiveResolver.java | 6 ++++-- .../model/validation/ArchiveValidator.java | 9 +++++++-- .../model/validation/ArticleValidator.java | 5 ++++- .../model/validation/ArtifactoryValidator.java | 9 ++++++++- .../model/validation/AsdfValidator.java | 11 ++++++++--- .../model/validation/AssemblersValidator.java | 6 +++++- .../model/validation/BrewValidator.java | 10 ++++++++-- .../model/validation/ChocolateyValidator.java | 11 ++++++++--- .../model/validation/CommandHooksValidator.java | 10 ++++++++-- .../model/validation/DiscordValidator.java | 5 ++++- .../model/validation/DiscussionsValidator.java | 6 +++++- .../model/validation/DistributionsValidator.java | 13 +++++++++++-- .../model/validation/DockerValidator.java | 12 ++++++++---- .../model/validation/DownloadersValidator.java | 6 +++++- .../model/validation/FilesValidator.java | 6 +++++- .../model/validation/FlatpakValidator.java | 12 +++++++++--- .../model/validation/FtpDownloaderValidator.java | 3 ++- .../model/validation/FtpUploaderValidator.java | 4 +++- .../model/validation/GitServiceValidator.java | 1 + .../model/validation/GiteaUploaderValidator.java | 4 +++- .../validation/GitlabUploaderValidator.java | 4 +++- .../model/validation/GitterValidator.java | 5 ++++- .../model/validation/GofishValidator.java | 6 +++++- .../model/validation/GoogleChatValidator.java | 5 ++++- .../model/validation/HooksValidator.java | 6 +++++- .../validation/HttpDownloaderValidator.java | 3 ++- .../model/validation/HttpUploaderValidator.java | 4 +++- .../model/validation/JbangValidator.java | 10 +++++++--- .../model/validation/JlinkResolver.java | 6 ++++-- .../model/validation/JlinkValidator.java | 9 +++++++-- .../model/validation/JpackageResolver.java | 6 ++++-- .../model/validation/JpackageValidator.java | 9 +++++++-- .../model/validation/MacportsValidator.java | 7 +++++-- .../model/validation/MailValidator.java | 5 ++++- .../model/validation/MastodonValidator.java | 5 ++++- .../model/validation/MattermostValidator.java | 5 ++++- .../model/validation/NativeImageResolver.java | 6 ++++-- .../model/validation/NativeImageValidator.java | 10 ++++++++-- .../jreleaser/model/validation/S3Validator.java | 4 +++- .../model/validation/ScoopValidator.java | 12 +++++++++--- .../model/validation/ScpDownloaderValidator.java | 3 ++- .../model/validation/ScpUploaderValidator.java | 4 +++- .../validation/SdkmanAnnouncerValidator.java | 8 ++++++-- .../model/validation/SdkmanValidator.java | 11 ++++++++--- .../validation/SftpDownloaderValidator.java | 3 ++- .../model/validation/SftpUploaderValidator.java | 4 +++- .../model/validation/SigningValidator.java | 5 ++++- .../model/validation/SlackValidator.java | 5 ++++- .../model/validation/SnapValidator.java | 12 +++++++++--- .../model/validation/SpecValidator.java | 7 +++++-- .../model/validation/TeamsValidator.java | 5 ++++- .../model/validation/TelegramValidator.java | 5 ++++- .../model/validation/TwitterValidator.java | 5 ++++- .../model/validation/UploadersValidator.java | 6 +++++- .../model/validation/WebhooksValidator.java | 16 ++++++++++++---- .../model/validation/ZulipValidator.java | 5 ++++- .../org/jreleaser/bundle/Messages.properties | 8 +++++++- .../org/jreleaser/bundle/Messages_ca.properties | 2 +- .../org/jreleaser/bundle/Messages_ko.properties | 2 +- .../org/jreleaser/bundle/Messages_ru.properties | 2 +- jreleaser.yml | 2 ++ 67 files changed, 330 insertions(+), 103 deletions(-) diff --git a/core/jreleaser-model/src/main/java/org/jreleaser/model/AppImage.java b/core/jreleaser-model/src/main/java/org/jreleaser/model/AppImage.java index 7afe8f5c4..5a56feb1b 100644 --- a/core/jreleaser-model/src/main/java/org/jreleaser/model/AppImage.java +++ b/core/jreleaser-model/src/main/java/org/jreleaser/model/AppImage.java @@ -215,7 +215,7 @@ public RepositoryTap getRepositoryTap() { @Override public boolean supportsPlatform(String platform) { return isBlank(platform) || - PlatformUtils.isLinux(platform) && PlatformUtils.isIntel64(platform); + PlatformUtils.isLinux(platform) && PlatformUtils.isIntel64(platform) && !PlatformUtils.isAlpineLinux(platform); } @Override diff --git a/core/jreleaser-model/src/main/java/org/jreleaser/model/Flatpak.java b/core/jreleaser-model/src/main/java/org/jreleaser/model/Flatpak.java index 4c185dfc7..faac2a77d 100644 --- a/core/jreleaser-model/src/main/java/org/jreleaser/model/Flatpak.java +++ b/core/jreleaser-model/src/main/java/org/jreleaser/model/Flatpak.java @@ -255,7 +255,7 @@ public RepositoryTap getRepositoryTap() { @Override public boolean supportsPlatform(String platform) { return isBlank(platform) || - PlatformUtils.isLinux(platform) && PlatformUtils.isIntel64(platform); + PlatformUtils.isLinux(platform) && PlatformUtils.isIntel64(platform) && !PlatformUtils.isAlpineLinux(platform); } @Override diff --git a/core/jreleaser-model/src/main/java/org/jreleaser/model/JReleaserModelValidator.java b/core/jreleaser-model/src/main/java/org/jreleaser/model/JReleaserModelValidator.java index daf34659f..c986e6be9 100644 --- a/core/jreleaser-model/src/main/java/org/jreleaser/model/JReleaserModelValidator.java +++ b/core/jreleaser-model/src/main/java/org/jreleaser/model/JReleaserModelValidator.java @@ -48,6 +48,7 @@ public static void validate(JReleaserContext context, JReleaserContext.Mode mode context.getLogger().increaseIndent(); context.getLogger().setPrefix("validation"); try { + context.getLogger().debug("mode {}", mode); validateModel(context, mode, errors); } finally { context.getLogger().restorePrefix(); @@ -72,8 +73,13 @@ private static void validateModel(JReleaserContext context, JReleaserContext.Mod validateFiles(context, mode, errors); validateAnnouncers(context, mode, errors); - postValidateProject(context, mode, errors); - postValidateAssemblers(context, mode, errors); - postValidateDistributions(context, mode, errors); + context.getLogger().setPrefix("postvalidation"); + try { + postValidateProject(context, mode, errors); + postValidateAssemblers(context, mode, errors); + postValidateDistributions(context, mode, errors); + } finally { + context.getLogger().restorePrefix(); + } } } diff --git a/core/jreleaser-model/src/main/java/org/jreleaser/model/util/Artifacts.java b/core/jreleaser-model/src/main/java/org/jreleaser/model/util/Artifacts.java index 3402fb38f..0a316eef6 100644 --- a/core/jreleaser-model/src/main/java/org/jreleaser/model/util/Artifacts.java +++ b/core/jreleaser-model/src/main/java/org/jreleaser/model/util/Artifacts.java @@ -442,7 +442,8 @@ public static void copyFile(JReleaserContext context, Path src, Path dest) throw } catch (IOException e) { throw new JReleaserException(RB.$("ERROR_artifacts_unexpected_error_copying", context.relativizeToBasedir(src), - context.relativizeToBasedir(dest))); + context.relativizeToBasedir(dest), + e.toString())); } } diff --git a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/AnnouncersValidator.java b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/AnnouncersValidator.java index 9e9e9fc14..4836b720d 100644 --- a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/AnnouncersValidator.java +++ b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/AnnouncersValidator.java @@ -17,6 +17,7 @@ */ package org.jreleaser.model.validation; +import org.jreleaser.bundle.RB; import org.jreleaser.model.Announce; import org.jreleaser.model.JReleaserContext; import org.jreleaser.util.Errors; @@ -63,6 +64,7 @@ public static void validateAnnouncers(JReleaserContext context, JReleaserContext validateZulip(context, announce.getZulip(), errors); if (!mode.validateAnnounce() && !mode.validateConfig()) { + context.getLogger().debug(RB.$("validation.disabled")); announce.disable(); return; } @@ -89,7 +91,10 @@ public static void validateAnnouncers(JReleaserContext context, JReleaserContext announce.getConfiguredWebhooks().isEnabled() || announce.getZulip().isEnabled(); - if (!activeSet && !enabled) announce.disable(); + if (!activeSet && !enabled) { + context.getLogger().debug(RB.$("validation.disabled")); + announce.disable(); + } } } } \ No newline at end of file diff --git a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/AppImageValidator.java b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/AppImageValidator.java index cc18cc44d..769100515 100644 --- a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/AppImageValidator.java +++ b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/AppImageValidator.java @@ -46,30 +46,35 @@ */ public abstract class AppImageValidator extends Validator { public static void validateAppImage(JReleaserContext context, JReleaserContext.Mode mode, Distribution distribution, AppImage packager, Errors errors) { + context.getLogger().debug("distribution.{}.appImage", distribution.getName()); JReleaserModel model = context.getModel(); AppImage parentPackager = model.getPackagers().getAppImage(); if (!packager.isActiveSet() && parentPackager.isActiveSet()) { packager.setActive(parentPackager.getActive()); } - if (!packager.resolveEnabled(context.getModel().getProject(), distribution)) return; + if (!packager.resolveEnabled(context.getModel().getProject(), distribution)) { + context.getLogger().debug(RB.$("validation.disabled")); + return; + } GitService service = model.getRelease().getGitService(); if (!service.isReleaseSupported()) { + context.getLogger().debug(RB.$("validation.disabled.release")); packager.disable(); return; } - context.getLogger().debug("distribution.{}.appImage", distribution.getName()); - List candidateArtifacts = packager.resolveCandidateArtifacts(context, distribution); if (candidateArtifacts.size() == 0) { packager.setActive(Active.NEVER); + context.getLogger().debug(RB.$("validation.disabled.no.artifacts")); packager.disable(); return; } else if (candidateArtifacts.stream() .filter(artifact -> isBlank(artifact.getPlatform())) .count() > 1) { errors.configuration(RB.$("validation_packager_multiple_artifacts", "distribution." + distribution.getName() + ".appImage")); + context.getLogger().debug(RB.$("validation.disabled.multiple.artifacts")); packager.disable(); return; } diff --git a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/ArchiveResolver.java b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/ArchiveResolver.java index 64abad86b..fb89d271d 100644 --- a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/ArchiveResolver.java +++ b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/ArchiveResolver.java @@ -26,6 +26,7 @@ import java.nio.file.Files; import java.nio.file.Path; +import java.util.List; /** * @author Andres Almiray @@ -33,9 +34,10 @@ */ public abstract class ArchiveResolver extends Validator { public static void resolveArchiveOutputs(JReleaserContext context, Errors errors) { - context.getLogger().debug("assemble.archive"); + List activeArchives = context.getModel().getAssemble().getActiveArchives(); + if (!activeArchives.isEmpty()) context.getLogger().debug("assemble.archive"); - for (Archive archive : context.getModel().getAssemble().getActiveArchives()) { + for (Archive archive : activeArchives) { if (archive.isExported()) resolveArchiveOutputs(context, archive, errors); } } diff --git a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/ArchiveValidator.java b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/ArchiveValidator.java index 6ee44b4d1..41e25b978 100644 --- a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/ArchiveValidator.java +++ b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/ArchiveValidator.java @@ -35,8 +35,8 @@ */ public abstract class ArchiveValidator extends Validator { public static void validateArchive(JReleaserContext context, JReleaserContext.Mode mode, Errors errors) { - context.getLogger().debug("assemble.archive"); Map archive = context.getModel().getAssemble().getArchive(); + if (!archive.isEmpty()) context.getLogger().debug("assemble.archive"); for (Map.Entry e : archive.entrySet()) { e.getValue().setName(e.getKey()); @@ -54,10 +54,15 @@ private static void validateArchive(JReleaserContext context, JReleaserContext.M if (!archive.isActiveSet()) { archive.setActive(Active.NEVER); } - if (!archive.resolveEnabled(context.getModel().getProject())) return; + if (!archive.resolveEnabled(context.getModel().getProject())) { + context.getLogger().debug(RB.$("validation.disabled")); + return; + } if (isBlank(archive.getName())) { errors.configuration(RB.$("validation_must_not_be_blank", "archive.name")); + context.getLogger().debug(RB.$("validation.disabled.error")); + archive.disable(); return; } diff --git a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/ArticleValidator.java b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/ArticleValidator.java index d53bf0f1e..90649480e 100644 --- a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/ArticleValidator.java +++ b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/ArticleValidator.java @@ -35,8 +35,11 @@ */ public abstract class ArticleValidator extends Validator { public static void validateArticle(JReleaserContext context, Article article, Errors errors) { - if (!article.resolveEnabled(context.getModel().getProject())) return; context.getLogger().debug("announce.article"); + if (!article.resolveEnabled(context.getModel().getProject())) { + context.getLogger().debug(RB.$("validation.disabled")); + return; + } GitService service = context.getModel().getRelease().getGitService(); Repository repository = article.getRepository(); diff --git a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/ArtifactoryValidator.java b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/ArtifactoryValidator.java index 9cacb34ab..624e31e91 100644 --- a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/ArtifactoryValidator.java +++ b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/ArtifactoryValidator.java @@ -32,8 +32,8 @@ */ public abstract class ArtifactoryValidator extends Validator { public static void validateArtifactory(JReleaserContext context, JReleaserContext.Mode mode, Errors errors) { - context.getLogger().debug("upload.artifactory"); Map artifactory = context.getModel().getUpload().getArtifactory(); + if (!artifactory.isEmpty()) context.getLogger().debug("upload.artifactory"); for (Map.Entry e : artifactory.entrySet()) { e.getValue().setName(e.getKey()); @@ -52,16 +52,20 @@ private static void validateArtifactory(JReleaserContext context, JReleaserConte artifactory.setActive(Active.NEVER); } if (!artifactory.resolveEnabled(context.getModel().getProject())) { + context.getLogger().debug(RB.$("validation.disabled")); return; } if (!artifactory.isArtifacts() && !artifactory.isFiles() && !artifactory.isSignatures()) { + context.getLogger().debug(RB.$("validation.disabled.no.artifacts")); artifactory.disable(); return; } if (artifactory.getRepositories().isEmpty()) { errors.configuration(RB.$("validation_artifactory_no_repositories", "artifactory." + artifactory.getName())); + context.getLogger().debug(RB.$("validation.disabled.no.repositories")); + artifactory.disable(); return; } @@ -101,6 +105,8 @@ private static void validateArtifactory(JReleaserContext context, JReleaserConte break; case NONE: errors.configuration(RB.$("validation_value_cannot_be", "artifactory." + artifactory.getName() + ".authorization", "NONE")); + context.getLogger().debug(RB.$("validation.disabled.error")); + artifactory.disable(); break; } @@ -115,6 +121,7 @@ private static void validateArtifactory(JReleaserContext context, JReleaserConte if (artifactory.getRepositories().stream().noneMatch(Artifactory.ArtifactoryRepository::isEnabled)) { errors.warning(RB.$("validation_artifactory_disabled_repositories", "artifactory." + artifactory.getName())); + context.getLogger().debug(RB.$("validation.disabled.no.repositories")); artifactory.disable(); } } diff --git a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/AsdfValidator.java b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/AsdfValidator.java index 5565a2ce1..3b5cf81a7 100644 --- a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/AsdfValidator.java +++ b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/AsdfValidator.java @@ -41,30 +41,35 @@ */ public abstract class AsdfValidator extends Validator { public static void validateAsdf(JReleaserContext context, Distribution distribution, Asdf packager, Errors errors) { + context.getLogger().debug("distribution.{}.asdf", distribution.getName()); JReleaserModel model = context.getModel(); Asdf parentPackager = model.getPackagers().getAsdf(); if (!packager.isActiveSet() && parentPackager.isActiveSet()) { packager.setActive(parentPackager.getActive()); } - if (!packager.resolveEnabled(context.getModel().getProject(), distribution)) return; + if (!packager.resolveEnabled(context.getModel().getProject(), distribution)) { + context.getLogger().debug(RB.$("validation.disabled")); + return; + } GitService service = model.getRelease().getGitService(); if (!service.isReleaseSupported()) { + context.getLogger().debug(RB.$("validation.disabled.release")); packager.disable(); return; } - context.getLogger().debug("distribution.{}.asdf", distribution.getName()); - List candidateArtifacts = packager.resolveCandidateArtifacts(context, distribution); if (candidateArtifacts.size() == 0) { packager.setActive(Active.NEVER); + context.getLogger().debug(RB.$("validation.disabled.no.artifacts")); packager.disable(); return; } else if (candidateArtifacts.stream() .filter(artifact -> isBlank(artifact.getPlatform())) .count() > 1) { errors.configuration(RB.$("validation_packager_multiple_artifacts", "distribution." + distribution.getName() + ".asdf")); + context.getLogger().debug(RB.$("validation.disabled.multiple.artifacts")); packager.disable(); return; } diff --git a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/AssemblersValidator.java b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/AssemblersValidator.java index 66b4ad9af..c65430777 100644 --- a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/AssemblersValidator.java +++ b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/AssemblersValidator.java @@ -77,6 +77,7 @@ public static void validateAssemblers(JReleaserContext context, JReleaserContext byDistributionName.forEach((name, types) -> { if (types.size() > 1) { errors.configuration(RB.$("validation_multiple_assemblers", "distribution." + name, types)); + context.getLogger().debug(RB.$("validation.disabled.error")); assemble.disable(); } }); @@ -92,7 +93,10 @@ public static void validateAssemblers(JReleaserContext context, JReleaserContext !assemble.getActiveJpackages().isEmpty() || !assemble.getActiveNativeImages().isEmpty(); - if (!activeSet && !enabled) assemble.disable(); + if (!activeSet && !enabled) { + context.getLogger().debug(RB.$("validation.disabled")); + assemble.disable(); + } } } diff --git a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/BrewValidator.java b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/BrewValidator.java index 34b3258ae..30c21ab96 100644 --- a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/BrewValidator.java +++ b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/BrewValidator.java @@ -49,6 +49,7 @@ */ public abstract class BrewValidator extends Validator { public static void validateBrew(JReleaserContext context, Distribution distribution, Brew packager, Errors errors) { + context.getLogger().debug("distribution.{}.brew", distribution.getName()); JReleaserModel model = context.getModel(); Brew parentPackager = model.getPackagers().getBrew(); @@ -56,19 +57,19 @@ public static void validateBrew(JReleaserContext context, Distribution distribut packager.setActive(parentPackager.getActive()); } if (!packager.resolveEnabled(context.getModel().getProject(), distribution)) { + context.getLogger().debug(RB.$("validation.disabled")); packager.disable(); packager.getCask().disable(); return; } GitService service = model.getRelease().getGitService(); if (!service.isReleaseSupported()) { + context.getLogger().debug(RB.$("validation.disabled.release")); packager.disable(); packager.getCask().disable(); return; } - context.getLogger().debug("distribution.{}.brew", distribution.getName()); - Brew.Cask cask = preValidateCask(distribution, packager, parentPackager); if (!packager.isMultiPlatformSet() && parentPackager.isMultiPlatformSet()) { @@ -88,6 +89,7 @@ public static void validateBrew(JReleaserContext context, Distribution distribut List candidateArtifacts = packager.resolveCandidateArtifacts(context, distribution); if (candidateArtifacts.size() == 0) { packager.setActive(Active.NEVER); + context.getLogger().debug(RB.$("validation.disabled.no.artifacts")); packager.disable(); return; } @@ -162,18 +164,22 @@ private static void validateCask(JReleaserContext context, Distribution distribu return; } else if (dmgFound > 1) { errors.configuration(RB.$("validation_brew_multiple_artifact", "distribution." + distribution.getName() + ".brew", ".dmg")); + context.getLogger().debug(RB.$("validation.disabled.error")); cask.disable(); return; } else if (pkgFound > 1) { errors.configuration(RB.$("validation_brew_multiple_artifact", "distribution." + distribution.getName() + ".brew", ".pkg")); + context.getLogger().debug(RB.$("validation.disabled.error")); cask.disable(); return; } else if (zipFound > 1) { errors.configuration(RB.$("validation_brew_multiple_artifact", "distribution." + distribution.getName() + ".brew", ".zip")); + context.getLogger().debug(RB.$("validation.disabled.error")); cask.disable(); return; } else if (dmgFound + pkgFound + zipFound > 1) { errors.configuration(RB.$("validation_brew_single_artifact", "distribution." + distribution.getName() + ".brew")); + context.getLogger().debug(RB.$("validation.disabled.error")); cask.disable(); return; } diff --git a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/ChocolateyValidator.java b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/ChocolateyValidator.java index cde8c864a..aeed80ac3 100644 --- a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/ChocolateyValidator.java +++ b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/ChocolateyValidator.java @@ -52,6 +52,7 @@ */ public abstract class ChocolateyValidator extends Validator { public static void validateChocolatey(JReleaserContext context, Distribution distribution, Chocolatey packager, Errors errors) { + context.getLogger().debug("distribution.{}.chocolatey", distribution.getName()); JReleaserModel model = context.getModel(); Chocolatey parentPackager = model.getPackagers().getChocolatey(); @@ -59,22 +60,26 @@ public static void validateChocolatey(JReleaserContext context, Distribution dis packager.setActive(parentPackager.getActive()); } Project project = context.getModel().getProject(); - if (!packager.resolveEnabled(project, distribution)) return; + if (!packager.resolveEnabled(project, distribution)) { + context.getLogger().debug(RB.$("validation.disabled")); + return; + } GitService service = model.getRelease().getGitService(); if (!service.isReleaseSupported()) { + context.getLogger().debug(RB.$("validation.disabled.release")); packager.disable(); return; } - context.getLogger().debug("distribution.{}.chocolatey", distribution.getName()); - List candidateArtifacts = packager.resolveCandidateArtifacts(context, distribution); if (candidateArtifacts.size() == 0) { packager.setActive(Active.NEVER); + context.getLogger().debug(RB.$("validation.disabled.no.artifacts")); packager.disable(); return; } else if (candidateArtifacts.size() > 1) { errors.configuration(RB.$("validation_packager_multiple_artifacts", "distribution." + distribution.getName() + ".chocolatey")); + context.getLogger().debug(RB.$("validation.disabled.multiple.artifacts")); packager.disable(); return; } diff --git a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/CommandHooksValidator.java b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/CommandHooksValidator.java index 69b427027..455360ccc 100644 --- a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/CommandHooksValidator.java +++ b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/CommandHooksValidator.java @@ -53,7 +53,10 @@ public static void validateCommandHooks(JReleaserContext context, JReleaserConte hooks.getSuccess().stream().anyMatch(CommandHook::isEnabled) || hooks.getFailure().stream().anyMatch(CommandHook::isEnabled); - if (!activeSet && !enabled) hooks.disable(); + if (!activeSet && !enabled) { + context.getLogger().debug(RB.$("validation.disabled")); + hooks.disable(); + } } } @@ -63,7 +66,10 @@ private static void validateCommandHook(JReleaserContext context, JReleaserConte if (!hook.isActiveSet()) { hook.setActive(Active.ALWAYS); } - if (!hook.resolveEnabled(context.getModel().getProject())) return; + if (!hook.resolveEnabled(context.getModel().getProject())) { + context.getLogger().debug(RB.$("validation.disabled")); + return; + } if (isBlank(hook.getCmd())) { errors.configuration(RB.$("validation_must_not_be_blank", "hook.cmd")); diff --git a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/DiscordValidator.java b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/DiscordValidator.java index e521bb488..6f590f0bb 100644 --- a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/DiscordValidator.java +++ b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/DiscordValidator.java @@ -36,8 +36,11 @@ public abstract class DiscordValidator extends Validator { private static final String DEFAULT_DISCORD_TPL = "src/jreleaser/templates/discord.tpl"; public static void validateDiscord(JReleaserContext context, Discord discord, Errors errors) { - if (!discord.resolveEnabled(context.getModel().getProject())) return; context.getLogger().debug("announce.discord"); + if (!discord.resolveEnabled(context.getModel().getProject())) { + context.getLogger().debug(RB.$("validation.disabled")); + return; + } discord.setWebhook( checkProperty(context, diff --git a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/DiscussionsValidator.java b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/DiscussionsValidator.java index 95daa2d49..053eeae59 100644 --- a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/DiscussionsValidator.java +++ b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/DiscussionsValidator.java @@ -36,11 +36,15 @@ public abstract class DiscussionsValidator extends Validator { private static final String DEFAULT_DISCUSSIONS_TPL = "src/jreleaser/templates/discussions.tpl"; public static void validateDiscussions(JReleaserContext context, Discussions discussions, Errors errors) { - if (!discussions.resolveEnabled(context.getModel().getProject())) return; context.getLogger().debug("announce.discussions"); + if (!discussions.resolveEnabled(context.getModel().getProject())) { + context.getLogger().debug(RB.$("validation.disabled")); + return; + } if (!Github.NAME.equals(context.getModel().getRelease().getGitService().getServiceName())) { errors.configuration(RB.$("validation_discussions_enabled")); + context.getLogger().debug(RB.$("validation.disabled")); discussions.disable(); return; } diff --git a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/DistributionsValidator.java b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/DistributionsValidator.java index 84483dee1..42cd63f9e 100644 --- a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/DistributionsValidator.java +++ b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/DistributionsValidator.java @@ -62,8 +62,8 @@ */ public abstract class DistributionsValidator extends Validator { public static void validateDistributions(JReleaserContext context, JReleaserContext.Mode mode, Errors errors) { - context.getLogger().debug("distributions"); Map distributions = context.getModel().getDistributions(); + if (!distributions.isEmpty()) context.getLogger().debug("distributions"); for (Map.Entry e : distributions.entrySet()) { Distribution distribution = e.getValue(); @@ -95,20 +95,27 @@ private static void validateDistribution(JReleaserContext context, JReleaserCont if (!distribution.isActiveSet()) { distribution.setActive(Active.ALWAYS); } - if (!distribution.resolveEnabled(context.getModel().getProject())) return; + if (!distribution.resolveEnabled(context.getModel().getProject())) { + context.getLogger().debug(RB.$("validation.disabled")); + return; + } if (!selectArtifactsByPlatform(context, distribution)) { distribution.setActive(Active.NEVER); + context.getLogger().debug(RB.$("validation.disabled.no.artifacts")); distribution.disable(); return; } if (isBlank(distribution.getName())) { errors.configuration(RB.$("validation_must_not_be_blank", "distribution.name")); + context.getLogger().debug(RB.$("validation.disabled.error")); + distribution.disable(); return; } if (null == distribution.getType()) { errors.configuration(RB.$("validation_must_not_be_null", "distribution." + distribution.getName() + ".type")); + distribution.disable(); return; } if (null == distribution.getStereotype()) { @@ -147,6 +154,8 @@ private static void validateDistribution(JReleaserContext context, JReleaserCont if (null == distribution.getArtifacts() || distribution.getArtifacts().isEmpty()) { errors.configuration(RB.$("validation_is_empty", "distribution." + distribution.getName() + ".artifacts")); + context.getLogger().debug(RB.$("validation.disabled.no.artifacts")); + distribution.disable(); return; } diff --git a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/DockerValidator.java b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/DockerValidator.java index 9e109d9b0..9a748ba98 100644 --- a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/DockerValidator.java +++ b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/DockerValidator.java @@ -59,6 +59,8 @@ */ public abstract class DockerValidator extends Validator { public static void validateDocker(JReleaserContext context, Distribution distribution, Docker packager, Errors errors) { + String element = "distribution." + distribution.getName() + ".docker"; + context.getLogger().debug(element); JReleaserModel model = context.getModel(); Project project = model.getProject(); Docker parentPackager = model.getPackagers().getDocker(); @@ -66,14 +68,16 @@ public static void validateDocker(JReleaserContext context, Distribution distrib if (!packager.isActiveSet() && parentPackager.isActiveSet()) { packager.setActive(parentPackager.getActive()); } - if (!packager.resolveEnabled(context.getModel().getProject(), distribution)) return; - - String element = "distribution." + distribution.getName() + ".docker"; - context.getLogger().debug(element); + if (!packager.resolveEnabled(context.getModel().getProject(), distribution)) { + context.getLogger().debug(RB.$("validation.disabled")); + packager.disable(); + return; + } List candidateArtifacts = packager.resolveCandidateArtifacts(context, distribution); if (candidateArtifacts.size() == 0) { packager.setActive(Active.NEVER); + context.getLogger().debug(RB.$("validation.disabled.no.artifacts")); packager.disable(); return; } diff --git a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/DownloadersValidator.java b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/DownloadersValidator.java index e57426df2..b6fafb165 100644 --- a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/DownloadersValidator.java +++ b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/DownloadersValidator.java @@ -17,6 +17,7 @@ */ package org.jreleaser.model.validation; +import org.jreleaser.bundle.RB; import org.jreleaser.model.Download; import org.jreleaser.model.JReleaserContext; import org.jreleaser.util.Errors; @@ -52,7 +53,10 @@ public static void validateDownloaders(JReleaserContext context, JReleaserContex !download.getActiveScps().isEmpty() || !download.getActiveSftps().isEmpty(); - if (!activeSet && !enabled) download.disable(); + if (!activeSet && !enabled) { + context.getLogger().debug(RB.$("validation.disabled")); + download.disable(); + } } } else { download.disable(); diff --git a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/FilesValidator.java b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/FilesValidator.java index 61fe6afcc..01388440b 100644 --- a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/FilesValidator.java +++ b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/FilesValidator.java @@ -17,6 +17,7 @@ */ package org.jreleaser.model.validation; +import org.jreleaser.bundle.RB; import org.jreleaser.model.Active; import org.jreleaser.model.Files; import org.jreleaser.model.JReleaserContext; @@ -38,7 +39,10 @@ public static void validateFiles(JReleaserContext context, JReleaserContext.Mode if (!files.isActiveSet()) { files.setActive(Active.ALWAYS); } - if (!files.resolveEnabled(context.getModel().getProject())) return; + if (!files.resolveEnabled(context.getModel().getProject())) { + context.getLogger().debug(RB.$("validation.disabled")); + return; + } files.getArtifacts() .forEach(artifact -> { diff --git a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/FlatpakValidator.java b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/FlatpakValidator.java index 5468ee94e..df6e3f3c1 100644 --- a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/FlatpakValidator.java +++ b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/FlatpakValidator.java @@ -48,30 +48,36 @@ */ public abstract class FlatpakValidator extends Validator { public static void validateFlatpak(JReleaserContext context, JReleaserContext.Mode mode, Distribution distribution, Flatpak packager, Errors errors) { + context.getLogger().debug("distribution.{}.flatpak", distribution.getName()); JReleaserModel model = context.getModel(); Flatpak parentPackager = model.getPackagers().getFlatpak(); if (!packager.isActiveSet() && parentPackager.isActiveSet()) { packager.setActive(parentPackager.getActive()); } - if (!packager.resolveEnabled(context.getModel().getProject(), distribution)) return; + if (!packager.resolveEnabled(context.getModel().getProject(), distribution)) { + context.getLogger().debug(RB.$("validation.disabled")); + packager.disable(); + return; + } GitService service = model.getRelease().getGitService(); if (!service.isReleaseSupported()) { + context.getLogger().debug(RB.$("validation.disabled.release")); packager.disable(); return; } - context.getLogger().debug("distribution.{}.flatpak", distribution.getName()); - List candidateArtifacts = packager.resolveCandidateArtifacts(context, distribution); if (candidateArtifacts.size() == 0) { packager.setActive(Active.NEVER); + context.getLogger().debug(RB.$("validation.disabled.no.artifacts")); packager.disable(); return; } else if (candidateArtifacts.stream() .filter(artifact -> isBlank(artifact.getPlatform())) .count() > 1) { errors.configuration(RB.$("validation_packager_multiple_artifacts", "distribution." + distribution.getName() + ".flatpak")); + context.getLogger().debug(RB.$("validation.disabled.multiple.artifacts")); packager.disable(); return; } diff --git a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/FtpDownloaderValidator.java b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/FtpDownloaderValidator.java index c1a27f345..0c720fc04 100644 --- a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/FtpDownloaderValidator.java +++ b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/FtpDownloaderValidator.java @@ -35,8 +35,8 @@ */ public abstract class FtpDownloaderValidator extends Validator { public static void validateFtpDownloader(JReleaserContext context, JReleaserContext.Mode mode, Errors errors) { - context.getLogger().debug("download.ftp"); Map ftp = context.getModel().getDownload().getFtp(); + if (!ftp.isEmpty()) context.getLogger().debug("download.ftp"); for (Map.Entry e : ftp.entrySet()) { e.getValue().setName(e.getKey()); @@ -55,6 +55,7 @@ private static void validateFtp(JReleaserContext context, JReleaserContext.Mode ftp.setActive(Active.ALWAYS); } if (!ftp.resolveEnabled(context.getModel().getProject())) { + context.getLogger().debug(RB.$("validation.disabled")); return; } diff --git a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/FtpUploaderValidator.java b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/FtpUploaderValidator.java index ff23cad99..cdad17fde 100644 --- a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/FtpUploaderValidator.java +++ b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/FtpUploaderValidator.java @@ -34,8 +34,8 @@ */ public abstract class FtpUploaderValidator extends Validator { public static void validateFtpUploader(JReleaserContext context, JReleaserContext.Mode mode, Errors errors) { - context.getLogger().debug("upload.ftp"); Map ftp = context.getModel().getUpload().getFtp(); + if (!ftp.isEmpty()) context.getLogger().debug("upload.ftp"); for (Map.Entry e : ftp.entrySet()) { e.getValue().setName(e.getKey()); @@ -54,10 +54,12 @@ private static void validateFtp(JReleaserContext context, JReleaserContext.Mode ftp.setActive(Active.NEVER); } if (!ftp.resolveEnabled(context.getModel().getProject())) { + context.getLogger().debug(RB.$("validation.disabled")); return; } if (!ftp.isArtifacts() && !ftp.isFiles() && !ftp.isSignatures()) { + context.getLogger().debug(RB.$("validation.disabled.no.artifacts")); ftp.disable(); return; } diff --git a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/GitServiceValidator.java b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/GitServiceValidator.java index d89cb6580..1408d3b8e 100644 --- a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/GitServiceValidator.java +++ b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/GitServiceValidator.java @@ -70,6 +70,7 @@ public static void validateGitService(JReleaserContext context, JReleaserContext } if (!service.isEnabled()) { + context.getLogger().debug(RB.$("validation.disabled")); return; } diff --git a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/GiteaUploaderValidator.java b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/GiteaUploaderValidator.java index 9b442b982..8a2fd4b87 100644 --- a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/GiteaUploaderValidator.java +++ b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/GiteaUploaderValidator.java @@ -35,8 +35,8 @@ */ public abstract class GiteaUploaderValidator extends Validator { public static void validateGiteaUploader(JReleaserContext context, JReleaserContext.Mode mode, Errors errors) { - context.getLogger().debug("upload.gitea"); Map gitea = context.getModel().getUpload().getGitea(); + if (!gitea.isEmpty()) context.getLogger().debug("upload.gitea"); for (Map.Entry e : gitea.entrySet()) { e.getValue().setName(e.getKey()); @@ -55,10 +55,12 @@ private static void validateGiteaUploader(JReleaserContext context, JReleaserCon gitea.setActive(Active.NEVER); } if (!gitea.resolveEnabled(context.getModel().getProject())) { + context.getLogger().debug(RB.$("validation.disabled")); return; } if (!gitea.isArtifacts() && !gitea.isFiles() && !gitea.isSignatures()) { + context.getLogger().debug(RB.$("validation.disabled.no.artifacts")); gitea.disable(); return; } diff --git a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/GitlabUploaderValidator.java b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/GitlabUploaderValidator.java index 7ed3cbb7f..04a892588 100644 --- a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/GitlabUploaderValidator.java +++ b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/GitlabUploaderValidator.java @@ -35,8 +35,8 @@ */ public abstract class GitlabUploaderValidator extends Validator { public static void validateGitlabUploader(JReleaserContext context, JReleaserContext.Mode mode, Errors errors) { - context.getLogger().debug("upload.gitlab"); Map gitlab = context.getModel().getUpload().getGitlab(); + if (!gitlab.isEmpty()) context.getLogger().debug("upload.gitlab"); for (Map.Entry e : gitlab.entrySet()) { e.getValue().setName(e.getKey()); @@ -55,10 +55,12 @@ private static void validateGitlabUploader(JReleaserContext context, JReleaserCo gitlab.setActive(Active.NEVER); } if (!gitlab.resolveEnabled(context.getModel().getProject())) { + context.getLogger().debug(RB.$("validation.disabled")); return; } if (!gitlab.isArtifacts() && !gitlab.isFiles() && !gitlab.isSignatures()) { + context.getLogger().debug(RB.$("validation.disabled.no.artifacts")); gitlab.disable(); return; } diff --git a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/GitterValidator.java b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/GitterValidator.java index 81f253c1a..d8916f566 100644 --- a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/GitterValidator.java +++ b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/GitterValidator.java @@ -36,8 +36,11 @@ public abstract class GitterValidator extends Validator { private static final String DEFAULT_GITTER_TPL = "src/jreleaser/templates/gitter.tpl"; public static void validateGitter(JReleaserContext context, Gitter gitter, Errors errors) { - if (!gitter.resolveEnabled(context.getModel().getProject())) return; context.getLogger().debug("announce.gitter"); + if (!gitter.resolveEnabled(context.getModel().getProject())) { + context.getLogger().debug(RB.$("validation.disabled")); + return; + } gitter.setWebhook( checkProperty(context, diff --git a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/GofishValidator.java b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/GofishValidator.java index e3bcf0a2b..043235509 100644 --- a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/GofishValidator.java +++ b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/GofishValidator.java @@ -41,6 +41,7 @@ */ public abstract class GofishValidator extends Validator { public static void validateGofish(JReleaserContext context, Distribution distribution, Gofish packager, Errors errors) { + context.getLogger().debug("distribution.{}.gofish", distribution.getName()); JReleaserModel model = context.getModel(); Gofish parentPackager = model.getPackagers().getGofish(); @@ -48,27 +49,30 @@ public static void validateGofish(JReleaserContext context, Distribution distrib packager.setActive(parentPackager.getActive()); } if (!packager.resolveEnabled(context.getModel().getProject(), distribution)) { + context.getLogger().debug(RB.$("validation.disabled")); packager.disable(); return; } GitService service = model.getRelease().getGitService(); if (!service.isReleaseSupported()) { + context.getLogger().debug(RB.$("validation.disabled.release")); packager.disable(); return; } - context.getLogger().debug("distribution.{}.gofish", distribution.getName()); nag("Gofish is deprecated since 1.1.0 and will be removed in 2.0.0"); List candidateArtifacts = packager.resolveCandidateArtifacts(context, distribution); if (candidateArtifacts.size() == 0) { packager.setActive(Active.NEVER); + context.getLogger().debug(RB.$("validation.disabled.no.artifacts")); packager.disable(); return; } else if (candidateArtifacts.stream() .filter(artifact -> isBlank(artifact.getPlatform())) .count() > 1) { errors.configuration(RB.$("validation_packager_multiple_artifacts", "distribution." + distribution.getName() + ".gofish")); + context.getLogger().debug(RB.$("validation.disabled.multiple.artifacts")); packager.disable(); return; } diff --git a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/GoogleChatValidator.java b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/GoogleChatValidator.java index 722abce20..d4ece8374 100644 --- a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/GoogleChatValidator.java +++ b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/GoogleChatValidator.java @@ -36,8 +36,11 @@ public abstract class GoogleChatValidator extends Validator { private static final String DEFAULT_GOOGLE_CHAT_TPL = "src/jreleaser/templates/googleChat.tpl"; public static void validateGoogleChat(JReleaserContext context, GoogleChat googleChat, Errors errors) { - if (!googleChat.resolveEnabled(context.getModel().getProject())) return; context.getLogger().debug("announce.googleChat"); + if (!googleChat.resolveEnabled(context.getModel().getProject())) { + context.getLogger().debug(RB.$("validation.disabled")); + return; + } googleChat.setWebhook( checkProperty(context, diff --git a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/HooksValidator.java b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/HooksValidator.java index 207ad8769..757097dd1 100644 --- a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/HooksValidator.java +++ b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/HooksValidator.java @@ -17,6 +17,7 @@ */ package org.jreleaser.model.validation; +import org.jreleaser.bundle.RB; import org.jreleaser.model.Hooks; import org.jreleaser.model.JReleaserContext; import org.jreleaser.util.Errors; @@ -40,7 +41,10 @@ public static void validateHooks(JReleaserContext context, JReleaserContext.Mode if (hooks.isEnabled()) { boolean enabled = hooks.getCommand().isEnabled(); - if (!activeSet && !enabled) hooks.disable(); + if (!activeSet && !enabled) { + context.getLogger().debug(RB.$("validation.disabled")); + hooks.disable(); + } } } } \ No newline at end of file diff --git a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/HttpDownloaderValidator.java b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/HttpDownloaderValidator.java index 0498e5e22..2ba8fdb56 100644 --- a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/HttpDownloaderValidator.java +++ b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/HttpDownloaderValidator.java @@ -35,8 +35,8 @@ */ public abstract class HttpDownloaderValidator extends Validator { public static void validateHttpDownloader(JReleaserContext context, JReleaserContext.Mode mode, Errors errors) { - context.getLogger().debug("download.http"); Map http = context.getModel().getDownload().getHttp(); + if (!http.isEmpty()) context.getLogger().debug("download.http"); for (Map.Entry e : http.entrySet()) { e.getValue().setName(e.getKey()); @@ -55,6 +55,7 @@ private static void validateHttp(JReleaserContext context, JReleaserContext.Mode http.setActive(Active.ALWAYS); } if (!http.resolveEnabled(context.getModel().getProject())) { + context.getLogger().debug(RB.$("validation.disabled")); return; } diff --git a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/HttpUploaderValidator.java b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/HttpUploaderValidator.java index 45e5dfaf4..4193ef0e7 100644 --- a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/HttpUploaderValidator.java +++ b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/HttpUploaderValidator.java @@ -35,8 +35,8 @@ */ public abstract class HttpUploaderValidator extends Validator { public static void validateHttpUploader(JReleaserContext context, JReleaserContext.Mode mode, Errors errors) { - context.getLogger().debug("upload.http"); Map http = context.getModel().getUpload().getHttp(); + if (!http.isEmpty()) context.getLogger().debug("upload.http"); for (Map.Entry e : http.entrySet()) { e.getValue().setName(e.getKey()); @@ -55,10 +55,12 @@ private static void validateHttp(JReleaserContext context, JReleaserContext.Mode http.setActive(Active.NEVER); } if (!http.resolveEnabled(context.getModel().getProject())) { + context.getLogger().debug(RB.$("validation.disabled")); return; } if (!http.isArtifacts() && !http.isFiles() && !http.isSignatures()) { + context.getLogger().debug(RB.$("validation.disabled.no.artifacts")); http.disable(); return; } diff --git a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/JbangValidator.java b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/JbangValidator.java index 0e4413299..16fed261a 100644 --- a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/JbangValidator.java +++ b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/JbangValidator.java @@ -41,21 +41,25 @@ */ public abstract class JbangValidator extends Validator { public static void validateJbang(JReleaserContext context, Distribution distribution, Jbang packager, Errors errors) { + context.getLogger().debug("distribution.{}.jbang", distribution.getName()); JReleaserModel model = context.getModel(); Jbang parentPackager = model.getPackagers().getJbang(); if (!packager.isActiveSet() && parentPackager.isActiveSet()) { packager.setActive(parentPackager.getActive()); } - if (!packager.resolveEnabled(context.getModel().getProject(), distribution)) return; + if (!packager.resolveEnabled(context.getModel().getProject(), distribution)) { + context.getLogger().debug(RB.$("validation.disabled")); + packager.disable(); + return; + } GitService service = model.getRelease().getGitService(); if (!service.isReleaseSupported()) { + context.getLogger().debug(RB.$("validation.disabled.release")); packager.disable(); return; } - context.getLogger().debug("distribution.{}.jbang", distribution.getName()); - validateCommitAuthor(packager, parentPackager); Jbang.JbangCatalog catalog = packager.getCatalog(); catalog.resolveEnabled(model.getProject()); diff --git a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/JlinkResolver.java b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/JlinkResolver.java index 2614977eb..4dfd57d16 100644 --- a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/JlinkResolver.java +++ b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/JlinkResolver.java @@ -26,6 +26,7 @@ import java.nio.file.Files; import java.nio.file.Path; +import java.util.List; import static org.jreleaser.util.StringUtils.isNotBlank; @@ -35,9 +36,10 @@ */ public abstract class JlinkResolver extends Validator { public static void resolveJlinkOutputs(JReleaserContext context, Errors errors) { - context.getLogger().debug("assemble.jlink"); + List activeJlinks = context.getModel().getAssemble().getActiveJlinks(); + if (!activeJlinks.isEmpty()) context.getLogger().debug("assemble.jlink"); - for (Jlink jlink : context.getModel().getAssemble().getActiveJlinks()) { + for (Jlink jlink : activeJlinks) { if (jlink.isExported()) resolveJlinkOutputs(context, jlink, errors); } } diff --git a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/JlinkValidator.java b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/JlinkValidator.java index f4437cd8b..8e30fd4bb 100644 --- a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/JlinkValidator.java +++ b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/JlinkValidator.java @@ -42,8 +42,8 @@ */ public abstract class JlinkValidator extends Validator { public static void validateJlink(JReleaserContext context, JReleaserContext.Mode mode, Errors errors) { - context.getLogger().debug("assemble.jlink"); Map jlink = context.getModel().getAssemble().getJlink(); + if (!jlink.isEmpty()) context.getLogger().debug("assemble.jlink"); for (Map.Entry e : jlink.entrySet()) { e.getValue().setName(e.getKey()); @@ -61,7 +61,10 @@ private static void validateJlink(JReleaserContext context, JReleaserContext.Mod if (!jlink.isActiveSet()) { jlink.setActive(Active.NEVER); } - if (!jlink.resolveEnabled(context.getModel().getProject())) return; + if (!jlink.resolveEnabled(context.getModel().getProject())) { + context.getLogger().debug(RB.$("validation.disabled")); + return; + } if (isBlank(jlink.getName())) { errors.configuration(RB.$("validation_must_not_be_blank", "jlink.name")); @@ -73,6 +76,8 @@ private static void validateJlink(JReleaserContext context, JReleaserContext.Mod context.getLogger().debug("assemble.jlink.{}.java", jlink.getName()); if (!validateJava(context, jlink, errors)) { + context.getLogger().debug(RB.$("validation.disabled.error")); + jlink.disable(); return; } diff --git a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/JpackageResolver.java b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/JpackageResolver.java index 3b3fb940a..27a38cb1f 100644 --- a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/JpackageResolver.java +++ b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/JpackageResolver.java @@ -26,6 +26,7 @@ import java.io.IOException; import java.nio.file.Path; +import java.util.List; import java.util.Optional; import static org.jreleaser.util.FileUtils.listFilesAndProcess; @@ -36,9 +37,10 @@ */ public abstract class JpackageResolver extends Validator { public static void resolveJpackageOutputs(JReleaserContext context, Errors errors) { - context.getLogger().debug("assemble.jpackage"); + List activeJpackages = context.getModel().getAssemble().getActiveJpackages(); + if (!activeJpackages.isEmpty()) context.getLogger().debug("assemble.jpackage"); - for (Jpackage jpackage : context.getModel().getAssemble().getActiveJpackages()) { + for (Jpackage jpackage : activeJpackages) { if (jpackage.isExported()) resolveJpackageOutputs(context, jpackage, errors); } } diff --git a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/JpackageValidator.java b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/JpackageValidator.java index 191bb51e1..33909af07 100644 --- a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/JpackageValidator.java +++ b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/JpackageValidator.java @@ -49,8 +49,8 @@ public abstract class JpackageValidator extends Validator { private static final Pattern MAC_IDENTIFIER_PATTERN = Pattern.compile(MAC_IDENTIFIER); public static void validateJpackage(JReleaserContext context, JReleaserContext.Mode mode, Errors errors) { - context.getLogger().debug("assemble.jpackage"); Map jpackage = context.getModel().getAssemble().getJpackage(); + if (!jpackage.isEmpty()) context.getLogger().debug("assemble.jpackage"); for (Map.Entry e : jpackage.entrySet()) { e.getValue().setName(e.getKey()); @@ -79,7 +79,10 @@ private static void validateJpackage(JReleaserContext context, JReleaserContext. } Project project = context.getModel().getProject(); - if (!jpackage.resolveEnabled(project)) return; + if (!jpackage.resolveEnabled(project)) { + context.getLogger().debug(RB.$("validation.disabled")); + return; + } if (null == jpackage.getStereotype()) { jpackage.setStereotype(context.getModel().getProject().getStereotype()); @@ -145,6 +148,8 @@ private static void validateJpackage(JReleaserContext context, JReleaserContext. context.getLogger().debug("assemble.jpackage.{}.java", jpackage.getName()); if (!validateJava(context, jpackage, errors)) { + context.getLogger().debug(RB.$("validation.disabled.error")); + jpackage.disable(); return; } diff --git a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/MacportsValidator.java b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/MacportsValidator.java index 35285e1db..b83e91ff4 100644 --- a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/MacportsValidator.java +++ b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/MacportsValidator.java @@ -43,6 +43,7 @@ */ public abstract class MacportsValidator extends Validator { public static void validateMacports(JReleaserContext context, Distribution distribution, Macports packager, Errors errors) { + context.getLogger().debug("distribution.{}.macports", distribution.getName()); JReleaserModel model = context.getModel(); Macports parentPackager = model.getPackagers().getMacports(); @@ -50,24 +51,26 @@ public static void validateMacports(JReleaserContext context, Distribution distr packager.setActive(parentPackager.getActive()); } if (!packager.resolveEnabled(context.getModel().getProject(), distribution)) { + context.getLogger().debug(RB.$("validation.disabled")); packager.disable(); return; } GitService service = model.getRelease().getGitService(); if (!service.isReleaseSupported()) { + context.getLogger().debug(RB.$("validation.disabled.release")); packager.disable(); return; } - context.getLogger().debug("distribution.{}.macports", distribution.getName()); - List candidateArtifacts = packager.resolveCandidateArtifacts(context, distribution); if (candidateArtifacts.size() == 0) { packager.setActive(Active.NEVER); + context.getLogger().debug(RB.$("validation.disabled.no.artifacts")); packager.disable(); return; } else if (candidateArtifacts.size() > 1) { errors.configuration(RB.$("validation_packager_multiple_artifacts", "distribution." + distribution.getName() + ".macports")); + context.getLogger().debug(RB.$("validation.disabled.multiple.artifacts")); packager.disable(); return; } else { diff --git a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/MailValidator.java b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/MailValidator.java index 4b0e0fea5..f181f918e 100644 --- a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/MailValidator.java +++ b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/MailValidator.java @@ -34,8 +34,11 @@ */ public abstract class MailValidator extends Validator { public static void validateMail(JReleaserContext context, Mail mail, Errors errors) { - if (!mail.resolveEnabled(context.getModel().getProject())) return; context.getLogger().debug("announce.mail"); + if (!mail.resolveEnabled(context.getModel().getProject())) { + context.getLogger().debug(RB.$("validation.disabled")); + return; + } if (null == mail.getTransport()) { mail.setTransport(Mail.Transport.SMTP); diff --git a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/MastodonValidator.java b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/MastodonValidator.java index 58c721841..f279b46b6 100644 --- a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/MastodonValidator.java +++ b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/MastodonValidator.java @@ -31,8 +31,11 @@ */ public abstract class MastodonValidator extends Validator { public static void validateMastodon(JReleaserContext context, Mastodon mastodon, Errors errors) { - if (!mastodon.resolveEnabled(context.getModel().getProject())) return; context.getLogger().debug("announce.mastodon"); + if (!mastodon.resolveEnabled(context.getModel().getProject())) { + context.getLogger().debug(RB.$("validation.disabled")); + return; + } if (isBlank(mastodon.getHost())) { errors.configuration(RB.$("validation_must_not_be_blank", "mastodon.host")); diff --git a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/MattermostValidator.java b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/MattermostValidator.java index c9eb7b2af..16811427d 100644 --- a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/MattermostValidator.java +++ b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/MattermostValidator.java @@ -36,8 +36,11 @@ public abstract class MattermostValidator extends Validator { private static final String DEFAULT_MATTERMOST_TPL = "src/jreleaser/templates/mattermost.tpl"; public static void validateMattermost(JReleaserContext context, Mattermost mattermost, Errors errors) { - if (!mattermost.resolveEnabled(context.getModel().getProject())) return; context.getLogger().debug("announce.mattermost"); + if (!mattermost.resolveEnabled(context.getModel().getProject())) { + context.getLogger().debug(RB.$("validation.disabled")); + return; + } mattermost.setWebhook( checkProperty(context, diff --git a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/NativeImageResolver.java b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/NativeImageResolver.java index 25fd63925..73f5a0431 100644 --- a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/NativeImageResolver.java +++ b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/NativeImageResolver.java @@ -25,6 +25,7 @@ import java.nio.file.Files; import java.nio.file.Path; +import java.util.List; import static org.jreleaser.util.StringUtils.isNotBlank; @@ -34,9 +35,10 @@ */ public abstract class NativeImageResolver extends Validator { public static void resolveNativeImageOutputs(JReleaserContext context, Errors errors) { - context.getLogger().debug("assemble.nativeImage"); + List activeNativeImages = context.getModel().getAssemble().getActiveNativeImages(); + if (!activeNativeImages.isEmpty()) context.getLogger().debug("assemble.nativeImage"); - for (NativeImage nativeImage : context.getModel().getAssemble().getActiveNativeImages()) { + for (NativeImage nativeImage : activeNativeImages) { if (nativeImage.isExported()) resolveNativeImageOutputs(context, nativeImage, errors); } } diff --git a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/NativeImageValidator.java b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/NativeImageValidator.java index 781a0eaba..8d911ff8c 100644 --- a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/NativeImageValidator.java +++ b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/NativeImageValidator.java @@ -42,8 +42,8 @@ */ public abstract class NativeImageValidator extends Validator { public static void validateNativeImage(JReleaserContext context, JReleaserContext.Mode mode, Errors errors) { - context.getLogger().debug("assemble.nativeImage"); Map nativeImage = context.getModel().getAssemble().getNativeImage(); + if (!nativeImage.isEmpty()) context.getLogger().debug("assemble.nativeImage"); for (Map.Entry e : nativeImage.entrySet()) { e.getValue().setName(e.getKey()); @@ -61,7 +61,10 @@ private static void validateNativeImage(JReleaserContext context, JReleaserConte if (!nativeImage.isActiveSet()) { nativeImage.setActive(Active.NEVER); } - if (!nativeImage.resolveEnabled(context.getModel().getProject())) return; + if (!nativeImage.resolveEnabled(context.getModel().getProject())) { + context.getLogger().debug(RB.$("validation.disabled")); + return; + } if (null == nativeImage.getStereotype()) { nativeImage.setStereotype(context.getModel().getProject().getStereotype()); @@ -69,11 +72,14 @@ private static void validateNativeImage(JReleaserContext context, JReleaserConte if (isBlank(nativeImage.getName())) { errors.configuration(RB.$("validation_must_not_be_blank", "nativeImage.name")); + context.getLogger().debug(RB.$("validation.disabled.error")); + nativeImage.disable(); return; } if (null == nativeImage.getMainJar()) { errors.configuration(RB.$("validation_is_null", "nativeImage." + nativeImage.getName() + ".mainJar")); + context.getLogger().debug(RB.$("validation.disabled.error")); return; } diff --git a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/S3Validator.java b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/S3Validator.java index c7b16ebef..bbd7aa561 100644 --- a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/S3Validator.java +++ b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/S3Validator.java @@ -35,8 +35,8 @@ */ public abstract class S3Validator extends Validator { public static void validateS3(JReleaserContext context, JReleaserContext.Mode mode, Errors errors) { - context.getLogger().debug("upload.s3"); Map s3 = context.getModel().getUpload().getS3(); + if (!s3.isEmpty()) context.getLogger().debug("upload.s3"); for (Map.Entry e : s3.entrySet()) { e.getValue().setName(e.getKey()); @@ -55,10 +55,12 @@ private static void validateS3(JReleaserContext context, JReleaserContext.Mode m s3.setActive(Active.NEVER); } if (!s3.resolveEnabled(context.getModel().getProject())) { + context.getLogger().debug(RB.$("validation.disabled")); return; } if (!s3.isArtifacts() && !s3.isFiles() && !s3.isSignatures()) { + context.getLogger().debug(RB.$("validation.disabled.no.artifacts")); s3.disable(); return; } diff --git a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/ScoopValidator.java b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/ScoopValidator.java index 6278d7742..0b94bb5c0 100644 --- a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/ScoopValidator.java +++ b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/ScoopValidator.java @@ -41,28 +41,34 @@ */ public abstract class ScoopValidator extends Validator { public static void validateScoop(JReleaserContext context, Distribution distribution, Scoop packager, Errors errors) { + context.getLogger().debug("distribution.{}.scoop", distribution.getName()); JReleaserModel model = context.getModel(); Scoop parentPackager = model.getPackagers().getScoop(); if (!packager.isActiveSet() && parentPackager.isActiveSet()) { packager.setActive(parentPackager.getActive()); } - if (!packager.resolveEnabled(context.getModel().getProject(), distribution)) return; + if (!packager.resolveEnabled(context.getModel().getProject(), distribution)) { + context.getLogger().debug(RB.$("validation.disabled")); + packager.disable(); + return; + } GitService service = model.getRelease().getGitService(); if (!service.isReleaseSupported()) { + context.getLogger().debug(RB.$("validation.disabled.release")); packager.disable(); return; } - context.getLogger().debug("distribution.{}.scoop", distribution.getName()); - List candidateArtifacts = packager.resolveCandidateArtifacts(context, distribution); if (candidateArtifacts.size() == 0) { packager.setActive(Active.NEVER); + context.getLogger().debug(RB.$("validation.disabled.no.artifacts")); packager.disable(); return; } else if (candidateArtifacts.size() > 1) { errors.configuration(RB.$("validation_packager_multiple_artifacts", "distribution." + distribution.getName() + ".scoop")); + context.getLogger().debug(RB.$("validation.disabled.multiple.artifacts")); packager.disable(); return; } diff --git a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/ScpDownloaderValidator.java b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/ScpDownloaderValidator.java index 84779847e..0c365afb7 100644 --- a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/ScpDownloaderValidator.java +++ b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/ScpDownloaderValidator.java @@ -35,8 +35,8 @@ */ public abstract class ScpDownloaderValidator extends Validator { public static void validateScpDownloader(JReleaserContext context, JReleaserContext.Mode mode, Errors errors) { - context.getLogger().debug("download.scp"); Map scp = context.getModel().getDownload().getScp(); + if (!scp.isEmpty()) context.getLogger().debug("download.scp"); for (Map.Entry e : scp.entrySet()) { e.getValue().setName(e.getKey()); @@ -55,6 +55,7 @@ private static void validateScpDownloader(JReleaserContext context, JReleaserCon scp.setActive(Active.ALWAYS); } if (!scp.resolveEnabled(context.getModel().getProject())) { + context.getLogger().debug(RB.$("validation.disabled")); return; } diff --git a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/ScpUploaderValidator.java b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/ScpUploaderValidator.java index f07951f51..5fe6eaee2 100644 --- a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/ScpUploaderValidator.java +++ b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/ScpUploaderValidator.java @@ -34,8 +34,8 @@ */ public abstract class ScpUploaderValidator extends Validator { public static void validateScpUploader(JReleaserContext context, JReleaserContext.Mode mode, Errors errors) { - context.getLogger().debug("upload.scp"); Map scp = context.getModel().getUpload().getScp(); + if (!scp.isEmpty()) context.getLogger().debug("upload.scp"); for (Map.Entry e : scp.entrySet()) { e.getValue().setName(e.getKey()); @@ -54,10 +54,12 @@ private static void validateScpUploader(JReleaserContext context, JReleaserConte scp.setActive(Active.NEVER); } if (!scp.resolveEnabled(context.getModel().getProject())) { + context.getLogger().debug(RB.$("validation.disabled")); return; } if (!scp.isArtifacts() && !scp.isFiles() && !scp.isSignatures()) { + context.getLogger().debug(RB.$("validation.disabled.no.artifacts")); scp.disable(); return; } diff --git a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/SdkmanAnnouncerValidator.java b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/SdkmanAnnouncerValidator.java index eadf89c3f..97c5f2258 100644 --- a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/SdkmanAnnouncerValidator.java +++ b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/SdkmanAnnouncerValidator.java @@ -34,19 +34,23 @@ */ public abstract class SdkmanAnnouncerValidator extends Validator { public static void validateSdkmanAnnouncer(JReleaserContext context, SdkmanAnnouncer sdkman, Errors errors) { + context.getLogger().debug("announce.sdkman"); // activate if there are any active distributions with Sdkman packager enabled context.getModel().getActiveDistributions().stream() .filter(d -> d.getSdkman().isEnabled()) .findFirst() .ifPresent(distribution -> sdkman.setActive(Active.ALWAYS)); - if (!sdkman.resolveEnabled(context.getModel().getProject())) return; + if (!sdkman.resolveEnabled(context.getModel().getProject())) { + context.getLogger().debug(RB.$("validation.disabled")); + return; + } if (!context.getModel().getRelease().getGitService().isReleaseSupported()) { + context.getLogger().debug(RB.$("validation.disabled.release")); sdkman.disable(); return; } - context.getLogger().debug("announce.sdkman"); sdkman.setConsumerKey( checkProperty(context, diff --git a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/SdkmanValidator.java b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/SdkmanValidator.java index 1820beeee..911f83f84 100644 --- a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/SdkmanValidator.java +++ b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/SdkmanValidator.java @@ -45,6 +45,7 @@ */ public abstract class SdkmanValidator extends Validator { public static void validateSdkman(JReleaserContext context, Distribution distribution, Sdkman packager, Errors errors) { + context.getLogger().debug("distribution.{}.sdkman", distribution.getName()); JReleaserModel model = context.getModel(); Sdkman parentPackager = model.getPackagers().getSdkman(); @@ -55,18 +56,22 @@ public static void validateSdkman(JReleaserContext context, Distribution distrib if (!packager.isActiveSet() && parentPackager.isActiveSet()) { packager.setActive(parentPackager.getActive()); } - if (!packager.resolveEnabled(context.getModel().getProject(), distribution)) return; + if (!packager.resolveEnabled(context.getModel().getProject(), distribution)) { + context.getLogger().debug(RB.$("validation.disabled")); + packager.disable(); + return; + } GitService service = model.getRelease().getGitService(); if (!service.isReleaseSupported()) { + context.getLogger().debug(RB.$("validation.disabled.release")); packager.disable(); return; } - context.getLogger().debug("distribution.{}.sdkman", distribution.getName()); - List candidateArtifacts = packager.resolveCandidateArtifacts(context, distribution); if (candidateArtifacts.size() == 0) { packager.setActive(Active.NEVER); + context.getLogger().debug(RB.$("validation.disabled.no.artifacts")); packager.disable(); return; } diff --git a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/SftpDownloaderValidator.java b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/SftpDownloaderValidator.java index d1271ffe2..27768dc7a 100644 --- a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/SftpDownloaderValidator.java +++ b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/SftpDownloaderValidator.java @@ -35,8 +35,8 @@ */ public abstract class SftpDownloaderValidator extends Validator { public static void validateSftpDownloader(JReleaserContext context, JReleaserContext.Mode mode, Errors errors) { - context.getLogger().debug("download.sftp"); Map sftp = context.getModel().getDownload().getSftp(); + if (!sftp.isEmpty()) context.getLogger().debug("download.sftp"); for (Map.Entry e : sftp.entrySet()) { e.getValue().setName(e.getKey()); @@ -55,6 +55,7 @@ private static void validateSftpDownloader(JReleaserContext context, JReleaserCo sftp.setActive(Active.ALWAYS); } if (!sftp.resolveEnabled(context.getModel().getProject())) { + context.getLogger().debug(RB.$("validation.disabled")); return; } diff --git a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/SftpUploaderValidator.java b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/SftpUploaderValidator.java index 15661c482..f8f6e5b25 100644 --- a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/SftpUploaderValidator.java +++ b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/SftpUploaderValidator.java @@ -34,8 +34,8 @@ */ public abstract class SftpUploaderValidator extends Validator { public static void validateSftpUploader(JReleaserContext context, JReleaserContext.Mode mode, Errors errors) { - context.getLogger().debug("upload.sftp"); Map sftp = context.getModel().getUpload().getSftp(); + if (!sftp.isEmpty()) context.getLogger().debug("upload.sftp"); for (Map.Entry e : sftp.entrySet()) { e.getValue().setName(e.getKey()); @@ -54,10 +54,12 @@ private static void validateSftpUploader(JReleaserContext context, JReleaserCont sftp.setActive(Active.NEVER); } if (!sftp.resolveEnabled(context.getModel().getProject())) { + context.getLogger().debug(RB.$("validation.disabled")); return; } if (!sftp.isArtifacts() && !sftp.isFiles() && !sftp.isSignatures()) { + context.getLogger().debug(RB.$("validation.disabled.no.artifacts")); sftp.disable(); return; } diff --git a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/SigningValidator.java b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/SigningValidator.java index 960f29099..f6445d74e 100644 --- a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/SigningValidator.java +++ b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/SigningValidator.java @@ -48,7 +48,10 @@ public static void validateSigning(JReleaserContext context, JReleaserContext.Mo context.getLogger().debug("signing"); Signing signing = context.getModel().getSigning(); - if (!signing.resolveEnabled(context.getModel().getProject())) return; + if (!signing.resolveEnabled(context.getModel().getProject())) { + context.getLogger().debug(RB.$("validation.disabled")); + return; + } if (!signing.isArmoredSet()) { signing.setArmored(true); diff --git a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/SlackValidator.java b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/SlackValidator.java index d0a9b00f7..86a0d2427 100644 --- a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/SlackValidator.java +++ b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/SlackValidator.java @@ -37,8 +37,11 @@ public abstract class SlackValidator extends Validator { private static final String DEFAULT_SLACK_TPL = "src/jreleaser/templates/slack.tpl"; public static void validateSlack(JReleaserContext context, Slack slack, Errors errors) { - if (!slack.resolveEnabled(context.getModel().getProject())) return; context.getLogger().debug("announce.slack"); + if (!slack.resolveEnabled(context.getModel().getProject())) { + context.getLogger().debug(RB.$("validation.disabled")); + return; + } Errors ignored = new Errors(); slack.setToken( diff --git a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/SnapValidator.java b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/SnapValidator.java index 609febd22..da63c13a0 100644 --- a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/SnapValidator.java +++ b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/SnapValidator.java @@ -46,28 +46,34 @@ */ public abstract class SnapValidator extends Validator { public static void validateSnap(JReleaserContext context, Distribution distribution, Snap packager, Errors errors) { + context.getLogger().debug("distribution.{}.snap", distribution.getName()); JReleaserModel model = context.getModel(); Snap parentPackager = model.getPackagers().getSnap(); if (!packager.isActiveSet() && parentPackager.isActiveSet()) { packager.setActive(parentPackager.getActive()); } - if (!packager.resolveEnabled(context.getModel().getProject(), distribution)) return; + if (!packager.resolveEnabled(context.getModel().getProject(), distribution)) { + context.getLogger().debug(RB.$("validation.disabled")); + packager.disable(); + return; + } GitService service = model.getRelease().getGitService(); if (!service.isReleaseSupported()) { + context.getLogger().debug(RB.$("validation.disabled.release")); packager.disable(); return; } - context.getLogger().debug("distribution.{}.snap", distribution.getName()); - List candidateArtifacts = packager.resolveCandidateArtifacts(context, distribution); if (candidateArtifacts.size() == 0) { packager.setActive(Active.NEVER); + context.getLogger().debug(RB.$("validation.disabled.no.artifacts")); packager.disable(); return; } else if (candidateArtifacts.size() > 1) { errors.configuration(RB.$("validation_packager_multiple_artifacts", "distribution." + distribution.getName() + ".snap")); + context.getLogger().debug(RB.$("validation.disabled.multiple.artifacts")); packager.disable(); return; } diff --git a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/SpecValidator.java b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/SpecValidator.java index 2e295f21c..b34f441a2 100644 --- a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/SpecValidator.java +++ b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/SpecValidator.java @@ -41,6 +41,7 @@ */ public abstract class SpecValidator extends Validator { public static void validateSpec(JReleaserContext context, Distribution distribution, Spec packager, Errors errors) { + context.getLogger().debug("distribution.{}.spec", distribution.getName()); JReleaserModel model = context.getModel(); Spec parentPackager = model.getPackagers().getSpec(); @@ -48,24 +49,26 @@ public static void validateSpec(JReleaserContext context, Distribution distribut packager.setActive(parentPackager.getActive()); } if (!packager.resolveEnabled(context.getModel().getProject(), distribution)) { + context.getLogger().debug(RB.$("validation.disabled")); packager.disable(); return; } GitService service = model.getRelease().getGitService(); if (!service.isReleaseSupported()) { + context.getLogger().debug(RB.$("validation.disabled.release")); packager.disable(); return; } - context.getLogger().debug("distribution.{}.spec", distribution.getName()); - List candidateArtifacts = packager.resolveCandidateArtifacts(context, distribution); if (candidateArtifacts.size() == 0) { packager.setActive(Active.NEVER); + context.getLogger().debug(RB.$("validation.disabled.no.artifacts")); packager.disable(); return; } else if (candidateArtifacts.size() > 1) { errors.configuration(RB.$("validation_packager_multiple_artifacts", "distribution." + distribution.getName() + ".spec")); + context.getLogger().debug(RB.$("validation.disabled.multiple.artifacts")); packager.disable(); return; } diff --git a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/TeamsValidator.java b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/TeamsValidator.java index 80290bba5..d2afadb39 100644 --- a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/TeamsValidator.java +++ b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/TeamsValidator.java @@ -36,8 +36,11 @@ public abstract class TeamsValidator extends Validator { private static final String DEFAULT_TEAMS_TPL = "src/jreleaser/templates/teams.tpl"; public static void validateTeams(JReleaserContext context, Teams teams, Errors errors) { - if (!teams.resolveEnabled(context.getModel().getProject())) return; context.getLogger().debug("announce.teams"); + if (!teams.resolveEnabled(context.getModel().getProject())) { + context.getLogger().debug(RB.$("validation.disabled")); + return; + } teams.setWebhook( checkProperty(context, diff --git a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/TelegramValidator.java b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/TelegramValidator.java index 306e47ce3..45e4d1a1c 100644 --- a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/TelegramValidator.java +++ b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/TelegramValidator.java @@ -37,8 +37,11 @@ public abstract class TelegramValidator extends Validator { private static final String DEFAULT_TELEGRAM_TPL = "src/jreleaser/templates/telegram.tpl"; public static void validateTelegram(JReleaserContext context, Telegram telegram, Errors errors) { - if (!telegram.resolveEnabled(context.getModel().getProject())) return; context.getLogger().debug("announce.telegram"); + if (!telegram.resolveEnabled(context.getModel().getProject())) { + context.getLogger().debug(RB.$("validation.disabled")); + return; + } telegram.setToken( checkProperty(context, diff --git a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/TwitterValidator.java b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/TwitterValidator.java index af9d6a15b..5e26fc11c 100644 --- a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/TwitterValidator.java +++ b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/TwitterValidator.java @@ -37,8 +37,11 @@ */ public abstract class TwitterValidator extends Validator { public static void validateTwitter(JReleaserContext context, Twitter twitter, Errors errors) { - if (!twitter.resolveEnabled(context.getModel().getProject())) return; context.getLogger().debug("announce.twitter"); + if (!twitter.resolveEnabled(context.getModel().getProject())) { + context.getLogger().debug(RB.$("validation.disabled")); + return; + } twitter.setConsumerKey( checkProperty(context, diff --git a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/UploadersValidator.java b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/UploadersValidator.java index b40aa66c2..beb0f60ae 100644 --- a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/UploadersValidator.java +++ b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/UploadersValidator.java @@ -17,6 +17,7 @@ */ package org.jreleaser.model.validation; +import org.jreleaser.bundle.RB; import org.jreleaser.model.JReleaserContext; import org.jreleaser.model.Upload; import org.jreleaser.util.Errors; @@ -68,7 +69,10 @@ public static void validateUploaders(JReleaserContext context, JReleaserContext. !upload.getActiveScps().isEmpty() || !upload.getActiveSftps().isEmpty(); - if (!activeSet && !enabled) upload.disable(); + if (!activeSet && !enabled) { + context.getLogger().debug(RB.$("validation.disabled")); + upload.disable(); + } } } } \ No newline at end of file diff --git a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/WebhooksValidator.java b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/WebhooksValidator.java index e856ebf12..52ec22e79 100644 --- a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/WebhooksValidator.java +++ b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/WebhooksValidator.java @@ -53,19 +53,27 @@ public static void validateWebhooks(JReleaserContext context, Webhooks webhooks, if (enabled) { webhooks.setActive(Active.ALWAYS); - webhooks.resolveEnabled(context.getModel().getProject()); + } else { + webhooks.setActive(Active.NEVER); + } + + if (!webhooks.resolveEnabled(context.getModel().getProject())) { + context.getLogger().debug(RB.$("validation.disabled")); } } public static boolean validateWebhook(JReleaserContext context, Webhooks webhooks, Webhook webhook, Errors errors) { - if (!webhook.resolveEnabled(context.getModel().getProject())) return false; + context.getLogger().debug("announce.webhook." + webhook.getName()); + if (!webhook.resolveEnabled(context.getModel().getProject())) { + context.getLogger().debug(RB.$("validation.disabled")); + return false; + } if (isBlank(webhook.getName())) { + context.getLogger().debug(RB.$("validation.disabled")); webhook.disable(); return false; } - context.getLogger().debug("announce.webhook." + webhook.getName()); - webhook.setWebhook( checkProperty(context, Env.toVar(webhook.getName()) + "_WEBHOOK", diff --git a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/ZulipValidator.java b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/ZulipValidator.java index c1444dedc..43a74d91f 100644 --- a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/ZulipValidator.java +++ b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/ZulipValidator.java @@ -36,8 +36,11 @@ public abstract class ZulipValidator extends Validator { private static final String DEFAULT_ZULIP_TPL = "src/jreleaser/templates/zulip.tpl"; public static void validateZulip(JReleaserContext context, Zulip zulip, Errors errors) { - if (!zulip.resolveEnabled(context.getModel().getProject())) return; context.getLogger().debug("announce.zulip"); + if (!zulip.resolveEnabled(context.getModel().getProject())) { + context.getLogger().debug(RB.$("validation.disabled")); + return; + } if (isBlank(zulip.getAccount())) { errors.configuration(RB.$("validation_must_not_be_blank", "zulip.account")); diff --git a/core/jreleaser-utils/src/main/resources/org/jreleaser/bundle/Messages.properties b/core/jreleaser-utils/src/main/resources/org/jreleaser/bundle/Messages.properties index e71633d4d..722b1e6da 100644 --- a/core/jreleaser-utils/src/main/resources/org/jreleaser/bundle/Messages.properties +++ b/core/jreleaser-utils/src/main/resources/org/jreleaser/bundle/Messages.properties @@ -259,13 +259,19 @@ releaser.tag.and.release.skipped = Release and tag are skipped artifacts.not.exists = Artifact does not exist: {} artifacts.newer = {} is newer than {} -ERROR_artifacts_unexpected_error_copying = Unexpected error copying {} to {} +ERROR_artifacts_unexpected_error_copying = Unexpected error copying {} to {}.\n{} ERROR_artifacts_glob_missing_input = Input does not exist: {} ERROR_artifacts_glob_resolution = Some globs failed to be resolved ERROR_artifacts_unexpected_error_globs = Unexpected error when resolving globs ERROR_artifacts_unexpected_error_path = Unexpected error visiting path {} ERROR_artifacts_download_url_missing = cannot resolve downloadUrl for {}. Using default settings from {} +validation.disabled = - disabled +validation.disabled.error = - disabled because validation failed +validation.disabled.release = - disabled because release is not supported +validation.disabled.no.artifacts = - disabled because there were no matching artifacts +validation.disabled.multiple.artifacts = - disabled because there's more than one matching artifact +validation.disabled.no.repositories = - disabled because there were no matching repositories validation_multiple_primary_screenshots = There's more than one primary screenshot in {} validation_multiple_primary_icons = There's more than one primary icon in {} validation_no_primary_icon = There is no primary icon in {} diff --git a/core/jreleaser-utils/src/main/resources/org/jreleaser/bundle/Messages_ca.properties b/core/jreleaser-utils/src/main/resources/org/jreleaser/bundle/Messages_ca.properties index a1d1e43b4..257a136fa 100644 --- a/core/jreleaser-utils/src/main/resources/org/jreleaser/bundle/Messages_ca.properties +++ b/core/jreleaser-utils/src/main/resources/org/jreleaser/bundle/Messages_ca.properties @@ -203,7 +203,7 @@ releaser.tag.and.release.skipped = llançament and etiqueta are skipped artifacts.not.exists = artefact no existeix: {} artifacts.newer = {} és més nou que {} -ERROR_artifacts_unexpected_error_copying = Error inesperat copiant {} a {} +ERROR_artifacts_unexpected_error_copying = Error inesperat copiant {} a {}.\n{} ERROR_artifacts_glob_resolution = Alguns globs han fallat per resoldre ERROR_artifacts_unexpected_error_globs = Error inesperat en resolució de globs ERROR_artifacts_unexpected_error_path = Error inesperat visitant rute {} diff --git a/core/jreleaser-utils/src/main/resources/org/jreleaser/bundle/Messages_ko.properties b/core/jreleaser-utils/src/main/resources/org/jreleaser/bundle/Messages_ko.properties index 5820c12d6..176398e4a 100644 --- a/core/jreleaser-utils/src/main/resources/org/jreleaser/bundle/Messages_ko.properties +++ b/core/jreleaser-utils/src/main/resources/org/jreleaser/bundle/Messages_ko.properties @@ -235,7 +235,7 @@ releaser.tag.and.release.skipped = Release 및 tag를 건너뜁니다. artifacts.not.exists = 아티팩트가 존재하지 않습니다.: {} artifacts.newer = {}가 {}보다 최신입니다. -ERROR_artifacts_unexpected_error_copying = A를 B로 복사하는 동안 예기치 않은 오류가 발생했습니다. +ERROR_artifacts_unexpected_error_copying = A를 B로 복사하는 동안 예기치 않은 오류가 발생했습니다.\n{} ERROR_artifacts_glob_missing_input = 입력 값이 존재하지 않습니다: {} ERROR_artifacts_glob_resolution = 일부 glob을 확인할 수 없습니다. ERROR_artifacts_unexpected_error_globs = glob을 확인하는 동안 예기치 않은 오류가 발생했습니다. diff --git a/core/jreleaser-utils/src/main/resources/org/jreleaser/bundle/Messages_ru.properties b/core/jreleaser-utils/src/main/resources/org/jreleaser/bundle/Messages_ru.properties index 29fbc9c54..fc0b8cf53 100644 --- a/core/jreleaser-utils/src/main/resources/org/jreleaser/bundle/Messages_ru.properties +++ b/core/jreleaser-utils/src/main/resources/org/jreleaser/bundle/Messages_ru.properties @@ -203,7 +203,7 @@ releaser.tag.and.release.skipped = Релиз и тег пропущены artifacts.not.exists = артефакт не существует: {} artifacts.newer = {} новее, чем {} -ERROR_artifacts_unexpected_error_copying = Неожиданная ошибка при копировании {} в {} +ERROR_artifacts_unexpected_error_copying = Неожиданная ошибка при копировании {} в {}.\n{} ERROR_artifacts_glob_resolution = Некоторые glob не удалось разрешить ERROR_artifacts_unexpected_error_globs = Неожиданная ошибка при разрешении глобусов ERROR_artifacts_unexpected_error_path = Неожиданная ошибка при посещении пути {} diff --git a/jreleaser.yml b/jreleaser.yml index c0d086347..f26377ab1 100644 --- a/jreleaser.yml +++ b/jreleaser.yml @@ -223,6 +223,7 @@ distributions: java: mainClass: org.jreleaser.cli.Main flatpak: + continueOnError: true active: always componentId: org.jreleaser.cli developerName: JReleaser @@ -310,6 +311,7 @@ distributions: jreleaser-standalone: appImage: + continueOnError: true active: always componentId: org.jreleaser.cli developerName: JReleaser