diff --git a/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/cloud/buildsystem/SpringCloudMavenBomParser.java b/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/cloud/buildsystem/SpringCloudMavenBomParser.java index 8d9d3ab4..460e5da2 100644 --- a/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/cloud/buildsystem/SpringCloudMavenBomParser.java +++ b/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/cloud/buildsystem/SpringCloudMavenBomParser.java @@ -60,6 +60,10 @@ public class SpringCloudMavenBomParser implements CustomBomParser { public VersionsFromBom parseBom(File root, ReleaserProperties properties) { VersionsFromBom springCloudBuild = springCloudBuild(root, properties); VersionsFromBom boot = bootVersion(root, properties); + if (log.isDebugEnabled()) { + log.debug("Added Spring Cloud Build [{}] and boot versions [{}]", + springCloudBuild, boot); + } return new VersionsFromBomBuilder().thisProjectRoot(root) .releaserProperties(properties).projects(springCloudBuild, boot).merged(); } diff --git a/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/buildsystem/ProjectPomUpdater.java b/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/buildsystem/ProjectPomUpdater.java index 74e363e0..59024804 100644 --- a/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/buildsystem/ProjectPomUpdater.java +++ b/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/buildsystem/ProjectPomUpdater.java @@ -226,7 +226,8 @@ public class ProjectPomUpdater implements ReleaserPropertiesAware { && !this.pomUpdater.hasSkipDeployment(model.model)) { log.debug( "Update is a non-snapshot one. Checking if no snapshot versions remained in the pom"); - Scanner scanner = new Scanner(asString(path)); + String text = asString(path); + Scanner scanner = new Scanner(text); int lineNumber = 0; while (scanner.hasNextLine()) { String line = scanner.nextLine(); @@ -238,6 +239,9 @@ public class ProjectPomUpdater implements ReleaserPropertiesAware { && pattern.matcher(line).matches()) .findFirst().orElse(null); if (matchingPattern != null) { + if (log.isDebugEnabled()) { + log.debug("File text \n" + text); + } throw new IllegalStateException("The file [" + path + "] matches the [ " + matchingPattern.pattern() + "] pattern in line number [" + lineNumber + "]\n\n" 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 34e1749f..e1bf859a 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 @@ -258,15 +258,14 @@ public class SpringReleaser { } else { ProjectVersion originalVersion = new ProjectVersion(project); - String fixedVersionForProject = this.properties.getFixedVersions() - .get(project.getName()); + Projects fixedVersions = this.releaser.fixedVersions(); + String fixedVersionForProject = fixedVersions + .forName(project.getName()).version; versionFromBom = StringUtils.hasText(fixedVersionForProject) ? new ProjectVersion(originalVersion.projectName, fixedVersionForProject) : new ProjectVersion(project); - projectsToUpdate = this.properties.getFixedVersions().entrySet().stream() - .map(entry -> new ProjectVersion(entry.getKey(), entry.getValue())) - .collect(Collectors.toCollection(Projects::new)); + projectsToUpdate = fixedVersions; projectsToUpdate.add(versionFromBom); printSettingVersionFromFixedVersions(projectsToUpdate); } diff --git a/spring-cloud-release-tools-spring/src/test/java/org/springframework/cloud/release/cloud/docs/SpringCloudDocsAccessor.java b/spring-cloud-release-tools-spring/src/test/java/org/springframework/cloud/release/cloud/docs/SpringCloudDocsAccessor.java index e53e8b5b..082e0fa3 100644 --- a/spring-cloud-release-tools-spring/src/test/java/org/springframework/cloud/release/cloud/docs/SpringCloudDocsAccessor.java +++ b/spring-cloud-release-tools-spring/src/test/java/org/springframework/cloud/release/cloud/docs/SpringCloudDocsAccessor.java @@ -39,8 +39,7 @@ class TestCustomProjectDocumentationUpdater private final String version; - public TestCustomProjectDocumentationUpdater(ProjectGitHandler gitHandler, - String version) { + TestCustomProjectDocumentationUpdater(ProjectGitHandler gitHandler, String version) { super(gitHandler); this.version = version; } @@ -62,4 +61,4 @@ class TestCustomProjectDocumentationUpdater + this.version + "/'>link to latest release\n"; } -} \ No newline at end of file +}