From 91215186ed683987ae4822dd8f5d26fedfbe7ce5 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Tue, 29 Oct 2019 16:08:24 +0100 Subject: [PATCH] Fixed working directory issues --- .../release/internal/buildsystem/GradleUpdater.java | 9 ++++++--- .../cloud/release/internal/project/ProjectVersion.java | 9 +++++++-- 2 files changed, 13 insertions(+), 5 deletions(-) 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 b17642ac..97dcc9af 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 @@ -140,9 +140,12 @@ public class GradleUpdater implements ReleaserPropertiesAware { return; } ProjectVersion value = this.projects.forName(projectName); - log.info("Replacing [{}->{}] with [{}->{}]", key, value1, key, value); - changedString.set(changedString.get().replace(key + "=" + value1, - key + "=" + value)); + if (!value.version.equalsIgnoreCase(value1.toString())) { + log.info("Replacing [{}->{}] with [{}->{}]", key, value1, key, + value); + changedString.set(changedString.get().replace(key + "=" + value1, + key + "=" + value)); + } }); storeString(path, changedString.get()); assertNoSnapshotsArePresent(path); 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 ad5db5ad..48bbd389 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 @@ -27,6 +27,7 @@ import org.apache.maven.model.Model; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.cloud.release.internal.ReleaserProperties; import org.springframework.cloud.release.internal.tech.PomReader; import org.springframework.util.StringUtils; @@ -79,11 +80,13 @@ public class ProjectVersion implements Comparable { public ProjectVersion(File project) { File buildGradle = new File(project, "build.gradle"); if (buildGradle.exists()) { + ReleaserProperties properties = new ReleaserProperties(); + properties.setWorkingDir(project.getAbsolutePath()); log.info("Retrieving fresh Gradle project version information"); ProjectVersion projectVersion = gradleProject(buildGradle); this.projectName = projectVersion.projectName; this.version = projectVersion.version; - this.groupId = new ProjectCommandExecutor().groupId(); + this.groupId = new ProjectCommandExecutor(properties).groupId(); this.artifactId = projectName; } else { @@ -114,7 +117,9 @@ public class ProjectVersion implements Comparable { public static ProjectVersion gradleProject(File file) { File parentFolder = file.getParentFile() != null ? file.getParentFile() : file; String name = parentFolder.getName(); - String version = new ProjectCommandExecutor().version(); + ReleaserProperties properties = new ReleaserProperties(); + properties.setWorkingDir(parentFolder.getAbsolutePath()); + String version = new ProjectCommandExecutor(properties).version(); return new ProjectVersion(nameWithoutParent(name), version); }