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

Fixed working directory issues

Browse Source
This commit is contained in:
Marcin Grzejszczak
2019-10-29 16:08:24 +01:00
parent ebf0bd8876
commit 91215186ed
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/buildsystem/GradleUpdater.java
View File

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

9
spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/project/ProjectVersion.java
View File

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