Use milestone of reactive starter

This commit makes sure that if a fixed release of Spring Boot is used,
the milestone version of the reactive starter is used as well.
This commit is contained in:
Stephane Nicoll
2016-08-10 13:56:43 +02:00
parent 6d5d82c398
commit 050969fa8a
3 changed files with 44 additions and 6 deletions

View File

@@ -23,8 +23,14 @@ class ReactiveProjectRequestPostProcessor extends ProjectRequestPostProcessorAda
// No need to override those versions with Gradle
if ('maven'.equals(request.build)) {
request.buildProperties.versions['spring.version'] = { '5.0.0.BUILD-SNAPSHOT' }
request.buildProperties.versions['reactor.version'] = { '3.0.0.BUILD-SNAPSHOT' }
if (request.bootVersion.contains('SNAPSHOT')) {
request.buildProperties.versions['spring.version'] = { '5.0.0.BUILD-SNAPSHOT' }
request.buildProperties.versions['reactor.version'] = { '3.0.0.BUILD-SNAPSHOT' }
}
else {
request.buildProperties.versions['spring.version'] = { '5.0.0.M1' }
request.buildProperties.versions['reactor.version'] = { '3.0.0.RC1' }
}
}
}
}

View File

@@ -46,8 +46,14 @@ initializr:
experimental-reactive-bom:
groupId: org.springframework.boot.experimental
artifactId: spring-boot-dependencies-web-reactive
version: 0.1.0.BUILD-SNAPSHOT
repositories: spring-snapshots,spring-milestones
mappings:
- versionRange: "[1.4.0.M1, 1.4.1.M1)"
version: 0.1.0.M1
repositories: spring-milestones
- versionRange: "1.4.1.BUILD-SNAPSHOT"
version: 0.1.0.BUILD-SNAPSHOT
repositories: spring-snapshots,spring-milestones
scs-bom:
groupId: io.pivotal.spring.cloud
artifactId: spring-cloud-services-dependencies

View File

@@ -53,7 +53,16 @@ class ReactiveProjectRequestPostProcessorTests {
@Test
void versionsAreOverriddenMaven() {
ProjectRequest request = createProjectRequest('experimental-web-reactive')
request.bootVersion = '1.4.0.BUILD-SNAPSHOT'
request.bootVersion = '1.4.0.RELEASE'
generateMavenPom(request)
.hasProperty('spring.version', '5.0.0.M1')
.hasProperty('reactor.version', '3.0.0.RC1')
}
@Test
void versionsAreOverriddenWithSnapshotMaven() {
ProjectRequest request = createProjectRequest('experimental-web-reactive')
request.bootVersion = '1.4.1.BUILD-SNAPSHOT'
generateMavenPom(request)
.hasProperty('spring.version', '5.0.0.BUILD-SNAPSHOT')
.hasProperty('reactor.version', '3.0.0.BUILD-SNAPSHOT')
@@ -71,7 +80,15 @@ class ReactiveProjectRequestPostProcessorTests {
@Test
void bomIsAddedMaven() {
ProjectRequest request = createProjectRequest('experimental-web-reactive')
request.bootVersion = '1.4.0.BUILD-SNAPSHOT'
request.bootVersion = '1.4.0.RELEASE'
generateMavenPom(request).hasBom('org.springframework.boot.experimental',
'spring-boot-dependencies-web-reactive', '0.1.0.M1')
}
@Test
void bomIsAddedWithSnapshotMaven() {
ProjectRequest request = createProjectRequest('experimental-web-reactive')
request.bootVersion = '1.4.1.BUILD-SNAPSHOT'
generateMavenPom(request).hasBom('org.springframework.boot.experimental',
'spring-boot-dependencies-web-reactive', '0.1.0.BUILD-SNAPSHOT')
}
@@ -79,7 +96,16 @@ class ReactiveProjectRequestPostProcessorTests {
@Test
void bomIsAddedGradle() {
ProjectRequest request = createProjectRequest('experimental-web-reactive')
request.bootVersion = '1.4.0.BUILD-SNAPSHOT'
request.bootVersion = '1.4.0.RELEASE'
generateGradleBuild(request).contains("dependencyManagement {")
.contains("imports {")
.contains("mavenBom \"org.springframework.boot.experimental:spring-boot-dependencies-web-reactive:0.1.0.M1\"")
}
@Test
void bomIsAddedWithSnapshotGradle() {
ProjectRequest request = createProjectRequest('experimental-web-reactive')
request.bootVersion = '1.4.1.BUILD-SNAPSHOT'
generateGradleBuild(request).contains("dependencyManagement {")
.contains("imports {")
.contains("mavenBom \"org.springframework.boot.experimental:spring-boot-dependencies-web-reactive:0.1.0.BUILD-SNAPSHOT\"")