From 0c255e92fdc93460976fe77cc5e80a09dcbfde26 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Wed, 23 Sep 2020 12:32:19 +0200 Subject: [PATCH] Added debug options --- .../internal/buildsystem/ProjectPomUpdater.java | 4 ++-- .../internal/project/ProjectCommandExecutor.java | 2 +- .../java/releaser/internal/spring/Arguments.java | 13 +++++++++++++ .../internal/spring/VersionsToBumpFactory.java | 11 +++++------ .../java/releaser/internal/tasks/ReleaserTask.java | 5 +++++ 5 files changed, 26 insertions(+), 9 deletions(-) diff --git a/releaser-core/src/main/java/releaser/internal/buildsystem/ProjectPomUpdater.java b/releaser-core/src/main/java/releaser/internal/buildsystem/ProjectPomUpdater.java index 78e1a7b4..743efc77 100644 --- a/releaser-core/src/main/java/releaser/internal/buildsystem/ProjectPomUpdater.java +++ b/releaser-core/src/main/java/releaser/internal/buildsystem/ProjectPomUpdater.java @@ -121,8 +121,8 @@ public class ProjectPomUpdater implements Closeable { Set projects = this.properties.getFixedVersions().entrySet().stream() .map(entry -> new Project(entry.getKey(), entry.getValue())) .collect(Collectors.toSet()); - if (log.isInfoEnabled()) { - log.info("Will apply the following fixed versions {}", projects); + if (log.isDebugEnabled()) { + log.debug("Will apply the following fixed versions {}", projects); } return new VersionsFromBomBuilder().releaserProperties(this.properties) .parsers(compositeBomParser().customBomParsers()).projects(projects) diff --git a/releaser-core/src/main/java/releaser/internal/project/ProjectCommandExecutor.java b/releaser-core/src/main/java/releaser/internal/project/ProjectCommandExecutor.java index ea19aa2b..cc4917f2 100644 --- a/releaser-core/src/main/java/releaser/internal/project/ProjectCommandExecutor.java +++ b/releaser-core/src/main/java/releaser/internal/project/ProjectCommandExecutor.java @@ -527,7 +527,7 @@ class CommandPicker { profiles); } else { - log.info("The build is a snapshot one - will not add any profiles"); + log.info("The version [" + version.toString() + "] is a snapshot one - will not add any profiles"); } return trimmedCommand; } diff --git a/releaser-spring/src/main/java/releaser/internal/spring/Arguments.java b/releaser-spring/src/main/java/releaser/internal/spring/Arguments.java index 4dfad2ad..1b8308f6 100644 --- a/releaser-spring/src/main/java/releaser/internal/spring/Arguments.java +++ b/releaser-spring/src/main/java/releaser/internal/spring/Arguments.java @@ -144,4 +144,17 @@ public final class Arguments implements Serializable { return this.projects.releaseTrain(this.properties); } + @Override + public String toString() { + return "Arguments{" + + "project=" + project + + ", projects=" + projects + + ", originalVersion=" + originalVersion + + ", versionFromBom=" + versionFromBom + + ", properties=" + properties + + ", options=" + options + + ", projectToRun=" + projectToRun + + ", processedProjects=" + processedProjects + + '}'; + } } diff --git a/releaser-spring/src/main/java/releaser/internal/spring/VersionsToBumpFactory.java b/releaser-spring/src/main/java/releaser/internal/spring/VersionsToBumpFactory.java index bb82c8d8..94730f87 100644 --- a/releaser-spring/src/main/java/releaser/internal/spring/VersionsToBumpFactory.java +++ b/releaser-spring/src/main/java/releaser/internal/spring/VersionsToBumpFactory.java @@ -64,16 +64,16 @@ class VersionsToBumpFactory implements Closeable { private ProjectsFromBom fetchVersionsFromFixedProjects(File project) { ProjectVersion originalVersion = new ProjectVersion(project); Projects fixedVersions = this.releaser.fixedVersions(); - log.info("Got the following fixed versions [{}]", fixedVersions); + log.debug("Got the following fixed versions [{}]", fixedVersions); String fixedVersionForProject = fixedVersions.containsProject(project.getName()) ? fixedVersions.forName(project.getName()).version : ""; - log.info("Found fixed version for this project is [{}]", fixedVersionForProject); + log.debug("Found fixed version for this project is [{}]", fixedVersionForProject); ProjectVersion versionFromBom = StringUtils.hasText(fixedVersionForProject) ? new ProjectVersion(originalVersion.projectName, fixedVersionForProject) : new ProjectVersion(project); fixedVersions.add(versionFromBom); printSettingVersionFromFixedVersions(fixedVersions); - return cachedProjectsFromBom(project, versionFromBom, fixedVersions); + return cachedProjectsFromBom(versionFromBom, fixedVersions); } private ProjectsFromBom fetchVersionsFromGitForSingleProject(File project) { @@ -81,11 +81,10 @@ class VersionsToBumpFactory implements Closeable { Projects projectsToUpdate = this.releaser.retrieveVersionsFromBom(); ProjectVersion versionFromBom = assertNoSnapshotsForANonSnapshotProject(project, projectsToUpdate); - return cachedProjectsFromBom(project, versionFromBom, projectsToUpdate); + return cachedProjectsFromBom(versionFromBom, projectsToUpdate); } - private ProjectsFromBom cachedProjectsFromBom(File project, - ProjectVersion versionFromBom, Projects projectsToUpdate) { + private ProjectsFromBom cachedProjectsFromBom(ProjectVersion versionFromBom, Projects projectsToUpdate) { return new ProjectsFromBom(projectsToUpdate, versionFromBom); } diff --git a/releaser-spring/src/main/java/releaser/internal/tasks/ReleaserTask.java b/releaser-spring/src/main/java/releaser/internal/tasks/ReleaserTask.java index 1ca5716c..826c750b 100644 --- a/releaser-spring/src/main/java/releaser/internal/tasks/ReleaserTask.java +++ b/releaser-spring/src/main/java/releaser/internal/tasks/ReleaserTask.java @@ -18,6 +18,8 @@ package releaser.internal.tasks; import java.util.function.Function; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import releaser.internal.ReleaserProperties; import releaser.internal.options.Options; import releaser.internal.spring.Arguments; @@ -31,6 +33,8 @@ import org.springframework.core.Ordered; */ public interface ReleaserTask extends Ordered, Function { + Logger log = LoggerFactory.getLogger(ReleaserTask.class); + /** * @return name of the release task (e.g. 'Build') */ @@ -69,6 +73,7 @@ public interface ReleaserTask extends Ordered, Function