diff --git a/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/Releaser.java b/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/Releaser.java index e2be5d7f..9fdac3b9 100644 --- a/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/Releaser.java +++ b/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/Releaser.java @@ -113,7 +113,7 @@ public class Releaser implements ReleaserPropertiesAware { this.gradleUpdater.updateProjectFromBom(project, versions, versionFromScRelease, assertSnapshots); ProjectVersion changedVersion = new ProjectVersion(project); - log.info("\n\nProject was successfully updated to [{}]", changedVersion); + log.info("\n\nProject was successfully updated to [{}]", changedVersion.version); } public void buildProject(ProjectVersion versionFromScRelease) { diff --git a/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/buildsystem/GradleUpdater.java b/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/buildsystem/GradleUpdater.java index c3b34bab..b17642ac 100644 --- a/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/buildsystem/GradleUpdater.java +++ b/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/buildsystem/GradleUpdater.java @@ -131,10 +131,6 @@ public class GradleUpdater implements ReleaserPropertiesAware { Properties props = loadProps(file); final Map substitution = this.properties.getGradle() .getGradlePropsSubstitution(); - // TODO: Automatically should search for e.g. [reactor-pool] -> - // [reactorPoolVersion] - // TODO: [version] -> current project version - // reactorPoolVersion, 1.0.0.BUILD-SNAPSHOT props.forEach((key, value1) -> { String projectName = projectName(parentName, substitution, key); if (!this.projects.containsProject(projectName)) { diff --git a/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/project/ProjectCommandExecutor.java b/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/project/ProjectCommandExecutor.java index 0043d41b..6fc5b44e 100644 --- a/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/project/ProjectCommandExecutor.java +++ b/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/project/ProjectCommandExecutor.java @@ -255,7 +255,7 @@ class ProcessExecutor implements ReleaserPropertiesAware { String runCommand(String[] commands, long waitTimeInMinutes) { try { String workingDir = this.workingDir; - log.debug( + log.info( "Will run the command from [{}] via {} and wait for result for [{}] minutes", workingDir, commands, waitTimeInMinutes); ProcessBuilder builder = builder(commands, workingDir); diff --git a/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/project/ProjectVersion.java b/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/project/ProjectVersion.java index 5f9566c4..ad5db5ad 100644 --- a/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/project/ProjectVersion.java +++ b/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/project/ProjectVersion.java @@ -24,6 +24,8 @@ import java.util.Objects; import java.util.regex.Pattern; import org.apache.maven.model.Model; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.cloud.release.internal.tech.PomReader; import org.springframework.util.StringUtils; @@ -36,6 +38,8 @@ import org.springframework.util.StringUtils; */ public class ProjectVersion implements Comparable { + private static final Logger log = LoggerFactory.getLogger(ProjectVersion.class); + private static final Pattern SNAPSHOT_PATTERN = Pattern .compile("^.*[\\.|\\-](BUILD-)?SNAPSHOT.*$"); @@ -75,6 +79,7 @@ public class ProjectVersion implements Comparable { public ProjectVersion(File project) { File buildGradle = new File(project, "build.gradle"); if (buildGradle.exists()) { + log.info("Retrieving fresh Gradle project version information"); ProjectVersion projectVersion = gradleProject(buildGradle); this.projectName = projectVersion.projectName; this.version = projectVersion.version; diff --git a/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/SpringReleaser.java b/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/SpringReleaser.java index 84a0c207..4514fc24 100644 --- a/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/SpringReleaser.java +++ b/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/SpringReleaser.java @@ -304,7 +304,7 @@ public class SpringReleaser { } private void printVersionRetrieval() { - log.info("\n\n\n=== RETRIEVING VERSIONS ===\n\nWill clone the bom" + log.info("\n\n\n=== RETRIEVING VERSIONS ===\n\nWill clone the BOM project" + " to retrieve all versions"); }