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

It works?

Browse Source
This commit is contained in:
Marcin Grzejszczak
2019-09-05 14:27:56 +02:00
parent c77ae8397e
commit 16ee34af23
4 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/cloud/buildsystem/SpringCloudMavenBomParser.java
View File

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

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

@@ -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"

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

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

5
spring-cloud-release-tools-spring/src/test/java/org/springframework/cloud/release/cloud/docs/SpringCloudDocsAccessor.java
View File

@@ -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</a>\n";
}
}
}