SpringCloud/spring-cloud-release-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added debug options

Browse Source
This commit is contained in:
Marcin Grzejszczak
2020-09-23 12:32:19 +02:00
parent 453179dd8e
commit 0c255e92fd
5 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
releaser-core/src/main/java/releaser/internal/buildsystem/ProjectPomUpdater.java
View File

@@ -121,8 +121,8 @@ public class ProjectPomUpdater implements Closeable {
Set<Project> 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)

2
releaser-core/src/main/java/releaser/internal/project/ProjectCommandExecutor.java
View File

@@ -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;
}

13
releaser-spring/src/main/java/releaser/internal/spring/Arguments.java
View File

@@ -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 +
'}';
}
}

11
releaser-spring/src/main/java/releaser/internal/spring/VersionsToBumpFactory.java
View File

@@ -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);
}

5
releaser-spring/src/main/java/releaser/internal/tasks/ReleaserTask.java
View File

@@ -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<Arguments, ExecutionResult> {
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<Arguments, ExecutionResu
*/
default ExecutionResult apply(Arguments args) {
try {
log.info("Running a task [{}] with arguments [{}]", name(), args);
return runTask(args);
}
catch (BuildUnstableException ex) {