lsm/initializr
1
0
Fork 0
mirror of https://gitee.com/dcren/initializr.git synced 2025-05-08 06:38:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix reactive starter to use Spring Boot 2.0.0 snap

Browse Source
This commit is contained in:
Stephane Nicoll 2016-09-26 12:46:32 +02:00
parent 8e7f3e70aa
commit 2eeed655f9
3 changed files with 11 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
initializr-service/src/main/groovy/io/spring/initializr/service/extension/ReactiveProjectRequestPostProcessor.groovy
View File

@ -23,15 +23,8 @@ class ReactiveProjectRequestPostProcessor extends ProjectRequestPostProcessorAda
// No need to override those versions with Gradle // No need to override those versions with Gradle
if ('maven'.equals(request.build)) { if ('maven'.equals(request.build)) {
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' } 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' }
}
}
} }
} }

7
initializr-service/src/main/resources/application.yml
View File

@ -52,13 +52,8 @@ initializr:
groupId: org.springframework.boot.experimental groupId: org.springframework.boot.experimental
artifactId: spring-boot-dependencies-web-reactive artifactId: spring-boot-dependencies-web-reactive
repositories: spring-snapshots,spring-milestones repositories: spring-snapshots,spring-milestones
mappings: versionRange: 2.0.0.BUILD-SNAPSHOT
- 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 version: 0.1.0.BUILD-SNAPSHOT
repositories: spring-snapshots,spring-milestones
scs-bom: scs-bom:
groupId: io.pivotal.spring.cloud groupId: io.pivotal.spring.cloud
artifactId: spring-cloud-services-dependencies artifactId: spring-cloud-services-dependencies

26
initializr-service/src/test/groovy/io/spring/initializr/service/extension/ReactiveProjectRequestPostProcessorTests.groovy
View File

@ -37,7 +37,7 @@ class ReactiveProjectRequestPostProcessorTests {
@Test @Test
void java8IsMandatoryMaven() { void java8IsMandatoryMaven() {
ProjectRequest request = createProjectRequest('experimental-web-reactive') ProjectRequest request = createProjectRequest('experimental-web-reactive')
request.bootVersion = '1.4.0.BUILD-SNAPSHOT' request.bootVersion = '2.0.0.BUILD-SNAPSHOT'
request.javaVersion = '1.7' request.javaVersion = '1.7'
generateMavenPom(request).hasJavaVersion('1.8') generateMavenPom(request).hasJavaVersion('1.8')
} }
@ -45,7 +45,7 @@ class ReactiveProjectRequestPostProcessorTests {
@Test @Test
void java8IsMandatoryGradle() { void java8IsMandatoryGradle() {
ProjectRequest request = createProjectRequest('experimental-web-reactive') ProjectRequest request = createProjectRequest('experimental-web-reactive')
request.bootVersion = '1.4.0.BUILD-SNAPSHOT' request.bootVersion = '2.0.0.BUILD-SNAPSHOT'
request.javaVersion = '1.7' request.javaVersion = '1.7'
generateGradleBuild(request).hasJavaVersion('1.8') generateGradleBuild(request).hasJavaVersion('1.8')
} }
@ -53,25 +53,15 @@ class ReactiveProjectRequestPostProcessorTests {
@Test @Test
void versionsAreOverriddenMaven() { void versionsAreOverriddenMaven() {
ProjectRequest request = createProjectRequest('experimental-web-reactive') ProjectRequest request = createProjectRequest('experimental-web-reactive')
request.bootVersion = '1.4.0.RELEASE' request.bootVersion = '2.0.0.BUILD-SNAPSHOT'
generateMavenPom(request) 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') .hasProperty('reactor.version', '3.0.0.BUILD-SNAPSHOT')
} }
@Test @Test
void versionsAreNorOverriddenGradle() { void versionsAreNorOverriddenGradle() {
ProjectRequest request = createProjectRequest('experimental-web-reactive') ProjectRequest request = createProjectRequest('experimental-web-reactive')
request.bootVersion = '1.4.0.BUILD-SNAPSHOT' request.bootVersion = '2.0.0.BUILD-SNAPSHOT'
generateGradleBuild(request) generateGradleBuild(request)
.doesNotContain("ext['spring.version'] = '5.0.0.BUILD-SNAPSHOT'") .doesNotContain("ext['spring.version'] = '5.0.0.BUILD-SNAPSHOT'")
.doesNotContain("ext['reactor.version'] = '3.0.0.BUILD-SNAPSHOT'") .doesNotContain("ext['reactor.version'] = '3.0.0.BUILD-SNAPSHOT'")
@ -80,9 +70,9 @@ class ReactiveProjectRequestPostProcessorTests {
@Test @Test
void bomIsAddedMaven() { void bomIsAddedMaven() {
ProjectRequest request = createProjectRequest('experimental-web-reactive') ProjectRequest request = createProjectRequest('experimental-web-reactive')
request.bootVersion = '1.4.0.RELEASE' request.bootVersion = '2.0.0.RELEASE'
generateMavenPom(request).hasBom('org.springframework.boot.experimental', generateMavenPom(request).hasBom('org.springframework.boot.experimental',
'spring-boot-dependencies-web-reactive', '0.1.0.M1') 'spring-boot-dependencies-web-reactive', '0.1.0.BUILD-SNAPSHOT')
} }
@Test @Test
@ -96,10 +86,10 @@ class ReactiveProjectRequestPostProcessorTests {
@Test @Test
void bomIsAddedGradle() { void bomIsAddedGradle() {
ProjectRequest request = createProjectRequest('experimental-web-reactive') ProjectRequest request = createProjectRequest('experimental-web-reactive')
request.bootVersion = '1.4.0.RELEASE' request.bootVersion = '2.0.0.RELEASE'
generateGradleBuild(request).contains("dependencyManagement {") generateGradleBuild(request).contains("dependencyManagement {")
.contains("imports {") .contains("imports {")
.contains("mavenBom \"org.springframework.boot.experimental:spring-boot-dependencies-web-reactive:0.1.0.M1\"") .contains("mavenBom \"org.springframework.boot.experimental:spring-boot-dependencies-web-reactive:0.1.0.BUILD-SNAPSHOT\"")
} }
@Test @Test