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

Added spring-cloud-starter to the list of updated projects

Browse Source
This commit is contained in:
Marcin Grzejszczak
2018-06-30 07:39:47 +02:00
parent 152c7224f4
commit 932205be61
3 changed files with 8 additions and 2 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

@@ -29,6 +29,7 @@ final class SpringCloudConstants {
static final String BUILD_ARTIFACT_ID = "spring-cloud-build";
static final String SPRING_CLOUD_RELEASE = "spring-cloud-release";
static final String SPRING_CLOUD = "spring-cloud";
static final String SPRING_CLOUD_STARTER = "spring-cloud-starter";
private SpringCloudConstants() {
throw new IllegalStateException("Don't instantiate a utility class");

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

@@ -16,7 +16,6 @@
package org.springframework.cloud.release.internal.pom;
import java.util.HashSet;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
import java.util.stream.Collectors;
@@ -24,10 +23,11 @@ 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_PARENT_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_PARENT_ARTIFACT_ID;
import static org.springframework.cloud.release.internal.pom.SpringCloudConstants.CLOUD_DEPENDENCIES_ARTIFACT_ID;
import static org.springframework.cloud.release.internal.pom.SpringCloudConstants.CLOUD_DEPENDENCIES_PARENT_ARTIFACT_ID;
import static org.springframework.cloud.release.internal.pom.SpringCloudConstants.SPRING_CLOUD;
import static org.springframework.cloud.release.internal.pom.SpringCloudConstants.SPRING_CLOUD_RELEASE;
import static org.springframework.cloud.release.internal.pom.SpringCloudConstants.SPRING_CLOUD_STARTER;
/**
* Represents versions taken out from Spring Cloud Release pom
@@ -145,10 +145,13 @@ class Versions {
break;
case SPRING_CLOUD_RELEASE:
case SPRING_CLOUD:
case SPRING_CLOUD_STARTER:
remove(SPRING_CLOUD_RELEASE);
remove(SPRING_CLOUD);
remove(SPRING_CLOUD_STARTER);
this.projects.add(new Project(SPRING_CLOUD_RELEASE, version));
this.projects.add(new Project(SPRING_CLOUD, version));
this.projects.add(new Project(SPRING_CLOUD_STARTER, version));
break;
default:
remove(projectName);

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

@@ -123,11 +123,13 @@ public class VersionsTests {
then(versions.versionForProject("spring-cloud")).isEqualTo("3.0.0");
then(versions.versionForProject("spring-cloud-release")).isEqualTo("3.0.0");
then(versions.versionForProject("spring-cloud-starter")).isEqualTo("3.0.0");
versions = mixedVersions().setVersion("spring-cloud-release", "3.0.0");
then(versions.versionForProject("spring-cloud")).isEqualTo("3.0.0");
then(versions.versionForProject("spring-cloud-release")).isEqualTo("3.0.0");
then(versions.versionForProject("spring-cloud-starter")).isEqualTo("3.0.0");
}
@Test