From 51ed7e85128a8c1038c7bc84135e52bb93b29de6 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Fri, 21 Jul 2017 11:59:57 +0200 Subject: [PATCH] fixes #35; updating spring-boot-dependencies --- .../release/internal/pom/SpringCloudConstants.java | 1 + .../cloud/release/internal/pom/Versions.java | 6 ++++++ .../cloud/release/internal/pom/VersionsTests.java | 11 ++++++++++- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/pom/SpringCloudConstants.java b/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/pom/SpringCloudConstants.java index c3a56a65..b607722e 100644 --- a/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/pom/SpringCloudConstants.java +++ b/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/pom/SpringCloudConstants.java @@ -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"; diff --git a/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/pom/Versions.java b/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/pom/Versions.java index 883392b0..c15a74b8 100644 --- a/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/pom/Versions.java +++ b/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/pom/Versions.java @@ -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 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: diff --git a/spring-cloud-release-tools-core/src/test/java/org/springframework/cloud/release/internal/pom/VersionsTests.java b/spring-cloud-release-tools-core/src/test/java/org/springframework/cloud/release/internal/pom/VersionsTests.java index a98c1fa1..43c97a7e 100644 --- a/spring-cloud-release-tools-core/src/test/java/org/springframework/cloud/release/internal/pom/VersionsTests.java +++ b/spring-cloud-release-tools-core/src/test/java/org/springframework/cloud/release/internal/pom/VersionsTests.java @@ -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