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

fixes #35; updating spring-boot-dependencies

Browse Source
This commit is contained in:
Marcin Grzejszczak
2017-07-21 11:59:57 +02:00
parent 09913e50b6
commit 51ed7e8512
3 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/pom/SpringCloudConstants.java
View File

@@ -21,6 +21,7 @@ package org.springframework.cloud.release.internal.pom;
*/
final class SpringCloudConstants {
static final String BOOT_STARTER_ARTIFACT_ID = "spring-boot-starter-parent";
static final String BOOT_DEPENDENCIES_ARTIFACT_ID = "spring-boot-dependencies";
static final String CLOUD_DEPENDENCIES_ARTIFACT_ID = "spring-cloud-dependencies-parent";
static final String BUILD_ARTIFACT_ID = "spring-cloud-build";

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

@@ -20,6 +20,7 @@ import java.util.Properties;
import java.util.Set;
import java.util.stream.Collectors;
import static org.springframework.cloud.release.internal.pom.SpringCloudConstants.BOOT_DEPENDENCIES_ARTIFACT_ID;
import static org.springframework.cloud.release.internal.pom.SpringCloudConstants.BOOT_STARTER_ARTIFACT_ID;
import static org.springframework.cloud.release.internal.pom.SpringCloudConstants.BUILD_ARTIFACT_ID;
import static org.springframework.cloud.release.internal.pom.SpringCloudConstants.CLOUD_DEPENDENCIES_ARTIFACT_ID;
@@ -42,6 +43,7 @@ class Versions {
this.bootVersion = bootVersion;
this.projects.add(new Project(SPRING_BOOT_PROJECT_NAME, bootVersion));
this.projects.add(new Project(BOOT_STARTER_ARTIFACT_ID, bootVersion));
this.projects.add(new Project(BOOT_DEPENDENCIES_ARTIFACT_ID, bootVersion));
}
Versions(String scBuildVersion, Set<Project> projects) {
@@ -56,6 +58,7 @@ class Versions {
this.scBuildVersion = scBuildVersion;
this.projects.add(new Project(SPRING_BOOT_PROJECT_NAME, bootVersion));
this.projects.add(new Project(BOOT_STARTER_ARTIFACT_ID, bootVersion));
this.projects.add(new Project(BOOT_DEPENDENCIES_ARTIFACT_ID, bootVersion));
this.projects.add(new Project(BUILD_ARTIFACT_ID, scBuildVersion));
this.projects.add(new Project(CLOUD_DEPENDENCIES_ARTIFACT_ID, scBuildVersion));
this.projects.addAll(projects);
@@ -114,11 +117,14 @@ class Versions {
switch (projectName) {
case SPRING_BOOT_PROJECT_NAME:
case BOOT_STARTER_ARTIFACT_ID:
case BOOT_DEPENDENCIES_ARTIFACT_ID:
this.bootVersion = version;
remove(SPRING_BOOT_PROJECT_NAME);
remove(BOOT_DEPENDENCIES_ARTIFACT_ID);
remove(BOOT_STARTER_ARTIFACT_ID);
this.projects.add(new Project(SPRING_BOOT_PROJECT_NAME, version));
this.projects.add(new Project(BOOT_STARTER_ARTIFACT_ID, version));
this.projects.add(new Project(BOOT_DEPENDENCIES_ARTIFACT_ID, version));
break;
case BUILD_ARTIFACT_ID:
case CLOUD_DEPENDENCIES_ARTIFACT_ID:

11
spring-cloud-release-tools-core/src/test/java/org/springframework/cloud/release/internal/pom/VersionsTests.java
View File

@@ -36,7 +36,8 @@ public class VersionsTests {
then(new Versions("1.2.3.RELEASE").projects)
.contains(
new Project("spring-boot", "1.2.3.RELEASE"),
new Project("spring-boot-starter-parent", "1.2.3.RELEASE")
new Project("spring-boot-starter-parent", "1.2.3.RELEASE"),
new Project("spring-boot-dependencies", "1.2.3.RELEASE")
);
}
@@ -96,11 +97,19 @@ public class VersionsTests {
then(versions.versionForProject("spring-boot")).isEqualTo("3.0.0");
then(versions.versionForProject("spring-boot-starter-parent")).isEqualTo("3.0.0");
then(versions.versionForProject("spring-boot-dependencies")).isEqualTo("3.0.0");
versions = mixedVersions().setVersion("spring-boot-starter-parent", "3.0.0");
then(versions.versionForProject("spring-boot")).isEqualTo("3.0.0");
then(versions.versionForProject("spring-boot-starter-parent")).isEqualTo("3.0.0");
then(versions.versionForProject("spring-boot-dependencies")).isEqualTo("3.0.0");
versions = mixedVersions().setVersion("spring-boot-dependencies", "3.0.0");
then(versions.versionForProject("spring-boot")).isEqualTo("3.0.0");
then(versions.versionForProject("spring-boot-starter-parent")).isEqualTo("3.0.0");
then(versions.versionForProject("spring-boot-dependencies")).isEqualTo("3.0.0");
}
@Test