diff --git a/initializr-service/src/main/groovy/io/spring/initializr/service/extension/ReactiveProjectRequestPostProcessor.groovy b/initializr-service/src/main/groovy/io/spring/initializr/service/extension/ReactiveProjectRequestPostProcessor.groovy index a9077d0a..31eb244d 100644 --- a/initializr-service/src/main/groovy/io/spring/initializr/service/extension/ReactiveProjectRequestPostProcessor.groovy +++ b/initializr-service/src/main/groovy/io/spring/initializr/service/extension/ReactiveProjectRequestPostProcessor.groovy @@ -23,14 +23,7 @@ class ReactiveProjectRequestPostProcessor extends ProjectRequestPostProcessorAda // No need to override those versions with Gradle 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' } - } - else { - request.buildProperties.versions['spring.version'] = { '5.0.0.M1' } - request.buildProperties.versions['reactor.version'] = { '3.0.0.RC1' } - } + request.buildProperties.versions['reactor.version'] = { '3.0.0.BUILD-SNAPSHOT' } } } } diff --git a/initializr-service/src/main/resources/application.yml b/initializr-service/src/main/resources/application.yml index 8c373f19..a15753ef 100644 --- a/initializr-service/src/main/resources/application.yml +++ b/initializr-service/src/main/resources/application.yml @@ -52,13 +52,8 @@ initializr: groupId: org.springframework.boot.experimental artifactId: spring-boot-dependencies-web-reactive 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 + versionRange: 2.0.0.BUILD-SNAPSHOT + version: 0.1.0.BUILD-SNAPSHOT scs-bom: groupId: io.pivotal.spring.cloud artifactId: spring-cloud-services-dependencies diff --git a/initializr-service/src/test/groovy/io/spring/initializr/service/extension/ReactiveProjectRequestPostProcessorTests.groovy b/initializr-service/src/test/groovy/io/spring/initializr/service/extension/ReactiveProjectRequestPostProcessorTests.groovy index 0cd781ea..1f43a0e4 100644 --- a/initializr-service/src/test/groovy/io/spring/initializr/service/extension/ReactiveProjectRequestPostProcessorTests.groovy +++ b/initializr-service/src/test/groovy/io/spring/initializr/service/extension/ReactiveProjectRequestPostProcessorTests.groovy @@ -37,7 +37,7 @@ class ReactiveProjectRequestPostProcessorTests { @Test void java8IsMandatoryMaven() { ProjectRequest request = createProjectRequest('experimental-web-reactive') - request.bootVersion = '1.4.0.BUILD-SNAPSHOT' + request.bootVersion = '2.0.0.BUILD-SNAPSHOT' request.javaVersion = '1.7' generateMavenPom(request).hasJavaVersion('1.8') } @@ -45,7 +45,7 @@ class ReactiveProjectRequestPostProcessorTests { @Test void java8IsMandatoryGradle() { ProjectRequest request = createProjectRequest('experimental-web-reactive') - request.bootVersion = '1.4.0.BUILD-SNAPSHOT' + request.bootVersion = '2.0.0.BUILD-SNAPSHOT' request.javaVersion = '1.7' generateGradleBuild(request).hasJavaVersion('1.8') } @@ -53,25 +53,15 @@ class ReactiveProjectRequestPostProcessorTests { @Test void versionsAreOverriddenMaven() { ProjectRequest request = createProjectRequest('experimental-web-reactive') - request.bootVersion = '1.4.0.RELEASE' + request.bootVersion = '2.0.0.BUILD-SNAPSHOT' 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') } @Test void versionsAreNorOverriddenGradle() { ProjectRequest request = createProjectRequest('experimental-web-reactive') - request.bootVersion = '1.4.0.BUILD-SNAPSHOT' + request.bootVersion = '2.0.0.BUILD-SNAPSHOT' generateGradleBuild(request) .doesNotContain("ext['spring.version'] = '5.0.0.BUILD-SNAPSHOT'") .doesNotContain("ext['reactor.version'] = '3.0.0.BUILD-SNAPSHOT'") @@ -80,9 +70,9 @@ class ReactiveProjectRequestPostProcessorTests { @Test void bomIsAddedMaven() { 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', - 'spring-boot-dependencies-web-reactive', '0.1.0.M1') + 'spring-boot-dependencies-web-reactive', '0.1.0.BUILD-SNAPSHOT') } @Test @@ -96,10 +86,10 @@ class ReactiveProjectRequestPostProcessorTests { @Test void bomIsAddedGradle() { ProjectRequest request = createProjectRequest('experimental-web-reactive') - request.bootVersion = '1.4.0.RELEASE' + request.bootVersion = '2.0.0.RELEASE' generateGradleBuild(request).contains("dependencyManagement {") .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