Adapt test suite to more recent Spring Boot versions

See gh-763

initializr-actuator/src/test/java/io/spring/initializr/actuate/metric/ProjectGenerationMetricsListenerTests.java

@@ -192,7 +192,7 @@ public class ProjectGenerationMetricsListenerTests {
 		ProjectRequest request = initialize();
 		request.resolve(this.metadata);
 		fireProjectGeneratedEvent(request);
-		this.metricsAssert.hasValue(1, "initializr.boot_version.1_2_3_RELEASE");
+		this.metricsAssert.hasValue(1, "initializr.boot_version.2_1_1_RELEASE");
 	}
 
 	@Test

initializr-actuator/src/test/java/io/spring/initializr/actuate/stat/ProjectRequestDocumentFactoryTests.java

@@ -43,7 +43,7 @@ public class ProjectRequestDocumentFactoryTests extends AbstractInitializrStatTe
 		assertThat(document.getGroupId()).isEqualTo("com.example");
 		assertThat(document.getArtifactId()).isEqualTo("demo");
 		assertThat(document.getPackageName()).isEqualTo("com.example.demo");
-		assertThat(document.getBootVersion()).isEqualTo("1.2.3.RELEASE");
+		assertThat(document.getBootVersion()).isEqualTo("2.1.1.RELEASE");
 		assertThat(document.getJavaVersion()).isEqualTo("1.8");
 		assertThat(document.getLanguage()).isEqualTo("java");
 		assertThat(document.getPackaging()).isEqualTo("jar");

initializr-generator/src/test/java/io/spring/initializr/generator/ProjectGeneratorBuildTests.java

@@ -56,21 +56,21 @@ public class ProjectGeneratorBuildTests extends AbstractProjectGeneratorTests {
 	}
 
 	@Test
-	public void standardJarJava() {
+	public void currentGenerationJarJava() {
-		testStandardJar("java");
+		testCurrentGenerationJar("java");
 	}
 
 	@Test
-	public void standardJarGroovy() {
+	public void currentGenerationJarGroovy() {
-		testStandardJar("groovy");
+		testCurrentGenerationJar("groovy");
 	}
 
 	@Test
-	public void standardJarKotlin() {
+	public void currentGenerationJarKotlin() {
-		testStandardJar("kotlin");
+		testCurrentGenerationJar("kotlin");
 	}
 
-	private void testStandardJar(String language) {
+	private void testCurrentGenerationJar(String language) {
 		ProjectRequest request = createProjectRequest();
 		request.setLanguage(language);
 		ProjectAssert project = generateProject(request);
@@ -79,27 +79,61 @@ public class ProjectGeneratorBuildTests extends AbstractProjectGeneratorTests {
 	}
 
 	@Test
-	public void standardWarJava() {
+	public void currentGenerationWarJava() {
-		testStandardWar("java");
+		testCurrentGenerationWar("java");
 	}
 
 	@Test
-	public void standardWarGroovy() {
+	public void currentGenerationWarGroovy() {
-		testStandardWar("groovy");
+		testCurrentGenerationWar("groovy");
 	}
 
 	@Test
-	public void standardWarKotlin() {
+	public void currentGenerationWarKotlin() {
-		testStandardWar("kotlin");
+		testCurrentGenerationWar("kotlin");
 	}
 
-	private void testStandardWar(String language) {
+	private void testCurrentGenerationWar(String language) {
 		ProjectRequest request = createProjectRequest("web");
 		request.setPackaging("war");
 		request.setLanguage(language);
 		ProjectAssert project = generateProject(request);
 		project.sourceCodeAssert(this.fileName).equalsTo(new ClassPathResource(
-				"project/" + language + "/war/" + this.assertFileName));
+				"project/" + language + "/standard/war-" + this.assertFileName));
+	}
+
+	@Test
+	public void previousGenerationJarJava() {
+		testPreviousGenerationJar("java");
+	}
+
+	@Test
+	public void previousGenerationJarGroovy() {
+		testPreviousGenerationJar("groovy");
+	}
+
+	@Test
+	public void previousGenerationJarKotlin() {
+		testPreviousGenerationJar("kotlin");
+	}
+
+	private void testPreviousGenerationJar(String language) {
+		ProjectRequest request = createProjectRequest();
+		request.setLanguage(language);
+		request.setBootVersion("1.5.18.RELEASE");
+		ProjectAssert project = generateProject(request);
+		project.sourceCodeAssert(this.fileName).equalsTo(new ClassPathResource(
+				"project/" + language + "/previous/" + this.assertFileName));
+	}
+
+	@Test
+	public void kotlinJava11() {
+		ProjectRequest request = createProjectRequest();
+		request.setLanguage("kotlin");
+		request.setJavaVersion("11");
+		ProjectAssert project = generateProject(request);
+		project.sourceCodeAssert(this.fileName).equalsTo(new ClassPathResource(
+				"project/" + this.build + "/kotlin-java11-" + this.assertFileName));
 	}
 
 	@Test
@@ -185,63 +219,6 @@ public class ProjectGeneratorBuildTests extends AbstractProjectGeneratorTests {
 				"project/" + this.build + "/bom-ordering-" + this.assertFileName));
 	}
 
-	@Test
-	public void kotlinJava6() {
-		ProjectRequest request = createProjectRequest();
-		request.setLanguage("kotlin");
-		request.setJavaVersion("1.6");
-		ProjectAssert project = generateProject(request);
-		project.sourceCodeAssert(this.fileName).equalsTo(new ClassPathResource(
-				"project/" + this.build + "/kotlin-java6-" + this.assertFileName));
-	}
-
-	@Test
-	public void kotlinJava7() {
-		ProjectRequest request = createProjectRequest();
-		request.setLanguage("kotlin");
-		request.setJavaVersion("1.7");
-		ProjectAssert project = generateProject(request);
-		project.sourceCodeAssert(this.fileName).equalsTo(new ClassPathResource(
-				"project/" + this.build + "/kotlin-java7-" + this.assertFileName));
-	}
-
-	@Test
-	public void kotlinSpringBoot2Legacy() {
-		ProjectRequest request = createProjectRequest();
-		request.setLanguage("kotlin");
-		request.setBootVersion("2.0.0.M5");
-		ProjectAssert project = generateProject(request);
-		project.sourceCodeAssert("src/main/kotlin/com/example/demo/DemoApplication.kt")
-				.equalsTo(new ClassPathResource(
-						"project/kotlin/spring-boot-2.0/DemoApplicationLegacy.kt.gen"));
-		project.sourceCodeAssert(this.fileName).equalsTo(new ClassPathResource("project/"
-				+ this.build + "/kotlin-springboot2-legacy-" + this.assertFileName));
-	}
-
-	@Test
-	public void kotlinSpringBoot2() {
-		ProjectRequest request = createProjectRequest();
-		request.setLanguage("kotlin");
-		request.setBootVersion("2.0.0.M6");
-		ProjectAssert project = generateProject(request);
-		project.sourceCodeAssert("src/main/kotlin/com/example/demo/DemoApplication.kt")
-				.equalsTo(new ClassPathResource(
-						"project/kotlin/spring-boot-2.0/DemoApplication.kt.gen"));
-		project.sourceCodeAssert(this.fileName).equalsTo(new ClassPathResource(
-				"project/" + this.build + "/kotlin-springboot2-" + this.assertFileName));
-	}
-
-	@Test
-	public void kotlinJava9() {
-		ProjectRequest request = createProjectRequest();
-		request.setLanguage("kotlin");
-		request.setBootVersion("2.0.0.M6");
-		request.setJavaVersion("9");
-		ProjectAssert project = generateProject(request);
-		project.sourceCodeAssert(this.fileName).equalsTo(new ClassPathResource(
-				"project/" + this.build + "/kotlin-java9-" + this.assertFileName));
-	}
-
 	@Override
 	public ProjectRequest createProjectRequest(String... styles) {
 		ProjectRequest request = super.createProjectRequest(styles);

initializr-generator/src/test/java/io/spring/initializr/generator/ProjectGeneratorLanguageTests.java

@@ -52,7 +52,7 @@ public class ProjectGeneratorLanguageTests extends AbstractProjectGeneratorTests
 	}
 
 	@Test
-	public void standardJar() {
+	public void currentGenerationJar() {
 		ProjectRequest request = createProjectRequest();
 		request.setLanguage(this.language);
 		generateProject(request).isGenericProject(ProjectAssert.DEFAULT_PACKAGE_NAME,
@@ -60,7 +60,7 @@ public class ProjectGeneratorLanguageTests extends AbstractProjectGeneratorTests
 	}
 
 	@Test
-	public void standardWar() {
+	public void currentGenerationWar() {
 		ProjectRequest request = createProjectRequest("web");
 		request.setLanguage(this.language);
 		request.setPackaging("war");
@@ -69,7 +69,7 @@ public class ProjectGeneratorLanguageTests extends AbstractProjectGeneratorTests
 	}
 
 	@Test
-	public void standardMainClass() {
+	public void currentGenerationMainClass() {
 		ProjectRequest request = createProjectRequest();
 		request.setLanguage(this.language);
 
@@ -81,7 +81,19 @@ public class ProjectGeneratorLanguageTests extends AbstractProjectGeneratorTests
 	}
 
 	@Test
-	public void standardTestClass() {
+	public void previousGenerationMainClass() {
+		ProjectRequest request = createProjectRequest();
+		request.setLanguage(this.language);
+		request.setBootVersion("1.5.18.RELEASE");
+		ProjectAssert project = generateProject(request);
+		project.sourceCodeAssert("src/main/" + this.language
+				+ "/com/example/demo/DemoApplication." + this.extension)
+				.equalsTo(new ClassPathResource("project/" + this.language + "/previous/"
+						+ "/DemoApplication." + this.expectedExtension));
+	}
+
+	@Test
+	public void currentGenerationTestClass() {
 		ProjectRequest request = createProjectRequest();
 		request.setLanguage(this.language);
 
@@ -93,7 +105,7 @@ public class ProjectGeneratorLanguageTests extends AbstractProjectGeneratorTests
 	}
 
 	@Test
-	public void standardTestClassWeb() {
+	public void currentGenerationTestClassWeb() {
 		ProjectRequest request = createProjectRequest("web");
 		request.setLanguage(this.language);
 
@@ -105,79 +117,28 @@ public class ProjectGeneratorLanguageTests extends AbstractProjectGeneratorTests
 	}
 
 	@Test
-	public void standardServletInitializer() {
+	public void currentGenerationServletInitializer() {
-		testServletInitializr(null, "standard");
-	}
-
-	@Test
-	public void springBoot14M2ServletInitializer() {
-		testServletInitializr("1.4.0.M2", "standard");
-	}
-
-	@Test
-	public void springBoot14ServletInitializer() {
-		testServletInitializr("1.4.0.M3", "spring-boot-1.4");
-	}
-
-	@Test
-	public void springBoot2ServletInitializer() {
-		testServletInitializr("2.0.0.M3", "spring-boot-2.0");
-	}
-
-	private void testServletInitializr(String bootVersion, String expectedOutput) {
 		ProjectRequest request = createProjectRequest();
 		request.setLanguage(this.language);
 		request.setPackaging("war");
-		if (bootVersion != null) {
-			request.setBootVersion(bootVersion);
-		}
 		ProjectAssert project = generateProject(request);
 		project.sourceCodeAssert("src/main/" + this.language
 				+ "/com/example/demo/ServletInitializer." + this.extension)
-				.equalsTo(new ClassPathResource(
+				.equalsTo(new ClassPathResource("project/" + this.language + "/standard/"
-						"project/" + this.language + "/" + expectedOutput
+						+ "ServletInitializer." + this.expectedExtension));
-								+ "/ServletInitializer." + this.expectedExtension));
 	}
 
 	@Test
-	public void springBoot14M1TestClass() {
+	public void previousGenerationServletInitializer() {
 		ProjectRequest request = createProjectRequest();
 		request.setLanguage(this.language);
-		request.setBootVersion("1.4.0.M1");
+		request.setBootVersion("1.5.18.RELEASE");
-
+		request.setPackaging("war");
 		ProjectAssert project = generateProject(request);
-		project.sourceCodeAssert("src/test/" + this.language
+		project.sourceCodeAssert("src/main/" + this.language
-				+ "/com/example/demo/DemoApplicationTests." + this.extension)
+				+ "/com/example/demo/ServletInitializer." + this.extension)
-				.equalsTo(new ClassPathResource("project/" + this.language
+				.equalsTo(new ClassPathResource("project/" + this.language + "/previous/"
-						+ "/standard/DemoApplicationTests." + this.expectedExtension));
+						+ "ServletInitializer." + this.expectedExtension));
-	}
-
-	@Test
-	public void springBoot14TestClass() {
-		ProjectRequest request = createProjectRequest();
-		request.setLanguage(this.language);
-		request.setBootVersion("1.4.0.M2");
-
-		ProjectAssert project = generateProject(request);
-		project.sourceCodeAssert("src/test/" + this.language
-				+ "/com/example/demo/DemoApplicationTests." + this.extension)
-				.equalsTo(new ClassPathResource("project/" + this.language
-						+ "/spring-boot-1.4/DemoApplicationTests."
-						+ this.expectedExtension));
-	}
-
-	@Test
-	public void springBoot14TestClassWeb() {
-		ProjectRequest request = createProjectRequest("web");
-		request.setLanguage(this.language);
-		request.setBootVersion("1.4.0.M2");
-
-		ProjectAssert project = generateProject(request);
-		project.sourceCodeAssert("src/test/" + this.language
-				+ "/com/example/demo/DemoApplicationTests." + this.extension)
-				.equalsTo(new ClassPathResource("project/" + this.language
-						+ "/spring-boot-1.4/DemoApplicationTests."
-						+ this.expectedExtension));
 	}
 
 }

initializr-generator/src/test/java/io/spring/initializr/metadata/InitializrMetadataBuilderTests.java

@@ -114,7 +114,7 @@ public class InitializrMetadataBuilderTests {
 		assertThat(myBom).isNotNull();
 		assertThat(myBom.getGroupId()).isEqualTo("org.acme");
 		assertThat(myBom.getArtifactId()).isEqualTo("my-bom");
-		assertThat(myBom.getVersion()).isEqualTo("1.2.3.RELEASE");
+		assertThat(myBom.getVersion()).isEqualTo("2.1.1.RELEASE");
 
 		BillOfMaterials anotherBom = boms.get("another-bom");
 		assertThat(anotherBom).isNotNull();

initializr-generator/src/test/java/io/spring/initializr/test/metadata/InitializrMetadataTestBuilder.java

@@ -165,9 +165,10 @@ public class InitializrMetadataTestBuilder {
 	}
 
 	public InitializrMetadataTestBuilder addDefaultBootVersions() {
-		return addBootVersion("1.1.2.RELEASE", false)
+		return addBootVersion("1.5.17.RELEASE", false)
-				.addBootVersion("1.2.3.RELEASE", true)
+				.addBootVersion("2.0.3.RELEASE", false)
-				.addBootVersion("1.3.0.BUILD-SNAPSHOT", false);
+				.addBootVersion("2.1.1.RELEASE", true)
+				.addBootVersion("2.2.0.BUILD-SNAPSHOT", false);
 	}
 
 	public InitializrMetadataTestBuilder addBootVersion(String id, boolean defaultValue) {

initializr-generator/src/test/resources/metadata/config/test-bom.json

@@ -6,7 +6,7 @@
         "my-bom": {
           "groupId": "org.acme",
           "artifactId": "my-bom",
-          "version": "1.2.3.RELEASE"
+          "version": "2.1.1.RELEASE"
         },
         "another-bom": {
           "groupId": "org.acme",

initializr-generator/src/test/resources/project/gradle/annotation-processor-dependency-build.gradle.gen

@@ -1,19 +1,18 @@
 buildscript {
 	ext {
-		springBootVersion = '1.2.3.RELEASE'
+		springBootVersion = '2.1.1.RELEASE'
 	}
 	repositories {
 		mavenCentral()
 	}
 	dependencies {
 		classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}")
-		classpath('io.spring.gradle:dependency-management-plugin:0.5.1.RELEASE')
 	}
 }
 
 apply plugin: 'java'
 apply plugin: 'eclipse'
-apply plugin: 'spring-boot'
+apply plugin: 'org.springframework.boot'
 apply plugin: 'io.spring.dependency-management'
 
 group = 'com.example'

initializr-generator/src/test/resources/project/gradle/bom-ordering-build.gradle.gen

@@ -1,19 +1,18 @@
 buildscript {
 	ext {
-		springBootVersion = '1.2.3.RELEASE'
+		springBootVersion = '2.1.1.RELEASE'
 	}
 	repositories {
 		mavenCentral()
 	}
 	dependencies {
 		classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}")
-		classpath('io.spring.gradle:dependency-management-plugin:0.5.1.RELEASE')
 	}
 }
 
 apply plugin: 'java'
 apply plugin: 'eclipse'
-apply plugin: 'spring-boot'
+apply plugin: 'org.springframework.boot'
 apply plugin: 'io.spring.dependency-management'
 
 group = 'com.example'

initializr-generator/src/test/resources/project/gradle/bom-property-build.gradle.gen

@@ -1,19 +1,18 @@
 buildscript {
 	ext {
-		springBootVersion = '1.2.3.RELEASE'
+		springBootVersion = '2.1.1.RELEASE'
 	}
 	repositories {
 		mavenCentral()
 	}
 	dependencies {
 		classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}")
-		classpath('io.spring.gradle:dependency-management-plugin:0.5.1.RELEASE')
 	}
 }
 
 apply plugin: 'java'
 apply plugin: 'eclipse'
-apply plugin: 'spring-boot'
+apply plugin: 'org.springframework.boot'
 apply plugin: 'io.spring.dependency-management'
 
 group = 'com.example'

initializr-generator/src/test/resources/project/gradle/compile-only-dependency-build.gradle.gen

@@ -1,19 +1,18 @@
 buildscript {
 	ext {
-		springBootVersion = '1.2.3.RELEASE'
+		springBootVersion = '2.1.1.RELEASE'
 	}
 	repositories {
 		mavenCentral()
 	}
 	dependencies {
 		classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}")
-		classpath('io.spring.gradle:dependency-management-plugin:0.5.1.RELEASE')
 	}
 }
 
 apply plugin: 'java'
 apply plugin: 'eclipse'
-apply plugin: 'spring-boot'
+apply plugin: 'org.springframework.boot'
 apply plugin: 'io.spring.dependency-management'
 
 group = 'com.example'

initializr-generator/src/test/resources/project/gradle/kotlin-java11-build.gradle.gen

@@ -1,12 +1,10 @@
 buildscript {
 	ext {
 		kotlinVersion = '1.1.1'
-		springBootVersion = '2.0.0.M6'
+		springBootVersion = '2.1.1.RELEASE'
 	}
 	repositories {
 		mavenCentral()
-		maven { url "https://repo.spring.io/snapshot" }
-		maven { url "https://repo.spring.io/milestone" }
 	}
 	dependencies {
 		classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}")
@@ -23,7 +21,7 @@ apply plugin: 'io.spring.dependency-management'
 
 group = 'com.example'
 version = '0.0.1-SNAPSHOT'
-sourceCompatibility = 9
+sourceCompatibility = 11
 compileKotlin {
 	kotlinOptions {
 		freeCompilerArgs = ["-Xjsr305=strict"]
@@ -39,8 +37,6 @@ compileTestKotlin {
 
 repositories {
 	mavenCentral()
-	maven { url "https://repo.spring.io/snapshot" }
-	maven { url "https://repo.spring.io/milestone" }
 }
 
 

initializr-generator/src/test/resources/project/gradle/kotlin-java6-build.gradle.gen

@@ -1,47 +0,0 @@
-buildscript {
-	ext {
-		kotlinVersion = '1.1.1'
-		springBootVersion = '1.2.3.RELEASE'
-	}
-	repositories {
-		mavenCentral()
-	}
-	dependencies {
-		classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}")
-		classpath('io.spring.gradle:dependency-management-plugin:0.5.1.RELEASE')
-		classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}")
-		classpath("org.jetbrains.kotlin:kotlin-allopen:${kotlinVersion}")
-	}
-}
-
-apply plugin: 'kotlin'
-apply plugin: 'kotlin-spring'
-apply plugin: 'eclipse'
-apply plugin: 'spring-boot'
-apply plugin: 'io.spring.dependency-management'
-
-group = 'com.example'
-version = '0.0.1-SNAPSHOT'
-sourceCompatibility = 1.6
-compileKotlin {
-	kotlinOptions {
-		freeCompilerArgs = ["-Xjsr305=strict"]
-	}
-}
-compileTestKotlin {
-	kotlinOptions {
-		freeCompilerArgs = ["-Xjsr305=strict"]
-	}
-}
-
-repositories {
-	mavenCentral()
-}
-
-
-dependencies {
-	implementation('org.springframework.boot:spring-boot-starter')
-	implementation("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")
-	implementation("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
-	testImplementation('org.springframework.boot:spring-boot-starter-test')
-}

initializr-generator/src/test/resources/project/gradle/kotlin-java7-build.gradle.gen

@@ -1,47 +0,0 @@
-buildscript {
-	ext {
-		kotlinVersion = '1.1.1'
-		springBootVersion = '1.2.3.RELEASE'
-	}
-	repositories {
-		mavenCentral()
-	}
-	dependencies {
-		classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}")
-		classpath('io.spring.gradle:dependency-management-plugin:0.5.1.RELEASE')
-		classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}")
-		classpath("org.jetbrains.kotlin:kotlin-allopen:${kotlinVersion}")
-	}
-}
-
-apply plugin: 'kotlin'
-apply plugin: 'kotlin-spring'
-apply plugin: 'eclipse'
-apply plugin: 'spring-boot'
-apply plugin: 'io.spring.dependency-management'
-
-group = 'com.example'
-version = '0.0.1-SNAPSHOT'
-sourceCompatibility = 1.7
-compileKotlin {
-	kotlinOptions {
-		freeCompilerArgs = ["-Xjsr305=strict"]
-	}
-}
-compileTestKotlin {
-	kotlinOptions {
-		freeCompilerArgs = ["-Xjsr305=strict"]
-	}
-}
-
-repositories {
-	mavenCentral()
-}
-
-
-dependencies {
-	implementation('org.springframework.boot:spring-boot-starter')
-	implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:${kotlinVersion}")
-	implementation("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
-	testImplementation('org.springframework.boot:spring-boot-starter-test')
-}

initializr-generator/src/test/resources/project/gradle/kotlin-springboot2-build.gradle.gen

@@ -1,52 +0,0 @@
-buildscript {
-	ext {
-		kotlinVersion = '1.1.1'
-		springBootVersion = '2.0.0.M6'
-	}
-	repositories {
-		mavenCentral()
-		maven { url "https://repo.spring.io/snapshot" }
-		maven { url "https://repo.spring.io/milestone" }
-	}
-	dependencies {
-		classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}")
-		classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}")
-		classpath("org.jetbrains.kotlin:kotlin-allopen:${kotlinVersion}")
-	}
-}
-
-apply plugin: 'kotlin'
-apply plugin: 'kotlin-spring'
-apply plugin: 'eclipse'
-apply plugin: 'org.springframework.boot'
-apply plugin: 'io.spring.dependency-management'
-
-group = 'com.example'
-version = '0.0.1-SNAPSHOT'
-sourceCompatibility = 1.8
-compileKotlin {
-	kotlinOptions {
-		freeCompilerArgs = ["-Xjsr305=strict"]
-		jvmTarget = "1.8"
-	}
-}
-compileTestKotlin {
-	kotlinOptions {
-		freeCompilerArgs = ["-Xjsr305=strict"]
-		jvmTarget = "1.8"
-	}
-}
-
-repositories {
-	mavenCentral()
-	maven { url "https://repo.spring.io/snapshot" }
-	maven { url "https://repo.spring.io/milestone" }
-}
-
-
-dependencies {
-	implementation('org.springframework.boot:spring-boot-starter')
-	implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
-	implementation("org.jetbrains.kotlin:kotlin-reflect")
-	testImplementation('org.springframework.boot:spring-boot-starter-test')
-}

initializr-generator/src/test/resources/project/gradle/version-override-build.gradle.gen

@@ -1,19 +1,18 @@
 buildscript {
 	ext {
-		springBootVersion = '1.2.3.RELEASE'
+		springBootVersion = '2.1.1.RELEASE'
 	}
 	repositories {
 		mavenCentral()
 	}
 	dependencies {
 		classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}")
-		classpath('io.spring.gradle:dependency-management-plugin:0.5.1.RELEASE')
 	}
 }
 
 apply plugin: 'java'
 apply plugin: 'eclipse'
-apply plugin: 'spring-boot'
+apply plugin: 'org.springframework.boot'
 apply plugin: 'io.spring.dependency-management'
 
 group = 'com.example'

initializr-generator/src/test/resources/project/groovy/previous/DemoApplication.groovy.gen

@@ -0,0 +1,12 @@
+package com.example.demo
+
+import org.springframework.boot.SpringApplication
+import org.springframework.boot.autoconfigure.SpringBootApplication
+
+@SpringBootApplication
+class DemoApplication {
+
+	static void main(String[] args) {
+		SpringApplication.run DemoApplication, args
+	}
+}

initializr-generator/src/test/resources/project/groovy/previous/build.gradle.gen

@@ -0,0 +1,30 @@
+buildscript {
+	ext {
+		springBootVersion = '1.5.18.RELEASE'
+	}
+	repositories {
+		mavenCentral()
+	}
+	dependencies {
+		classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}")
+	}
+}
+
+apply plugin: 'groovy'
+apply plugin: 'eclipse'
+apply plugin: 'org.springframework.boot'
+
+group = 'com.example'
+version = '0.0.1-SNAPSHOT'
+sourceCompatibility = 1.8
+
+repositories {
+	mavenCentral()
+}
+
+
+dependencies {
+	implementation('org.springframework.boot:spring-boot-starter')
+	implementation('org.codehaus.groovy:groovy')
+	testImplementation('org.springframework.boot:spring-boot-starter-test')
+}

initializr-generator/src/test/resources/project/groovy/previous/pom.xml.gen

@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<groupId>com.example</groupId>
+	<artifactId>demo</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+	<packaging>jar</packaging>
+
+	<name>demo</name>
+	<description>Demo project for Spring Boot</description>
+
+	<parent>
+		<groupId>org.springframework.boot</groupId>
+		<artifactId>spring-boot-starter-parent</artifactId>
+		<version>1.5.18.RELEASE</version>
+		<relativePath/> <!-- lookup parent from repository -->
+	</parent>
+
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+		<java.version>1.8</java.version>
+	</properties>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.codehaus.groovy</groupId>
+			<artifactId>groovy</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.gmavenplus</groupId>
+				<artifactId>gmavenplus-plugin</artifactId>
+				<version>1.5</version>
+				<executions>
+					<execution>
+						<goals>
+							<goal>addSources</goal>
+							<goal>addTestSources</goal>
+							<goal>generateStubs</goal>
+							<goal>compile</goal>
+							<goal>testGenerateStubs</goal>
+							<goal>testCompile</goal>
+							<goal>removeStubs</goal>
+							<goal>removeTestStubs</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
+
+</project>

initializr-generator/src/test/resources/project/groovy/spring-boot-1.4/DemoApplicationTests.groovy.gen

@@ -1,16 +0,0 @@
-package com.example.demo
-
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.springframework.boot.test.context.SpringBootTest
-import org.springframework.test.context.junit4.SpringRunner
-
-@RunWith(SpringRunner)
-@SpringBootTest
-class DemoApplicationTests {
-
-	@Test
-	void contextLoads() {
-	}
-
-}

initializr-generator/src/test/resources/project/groovy/spring-boot-2.0/ServletInitializer.groovy.gen

@@ -1,13 +0,0 @@
-package com.example.demo
-
-import org.springframework.boot.builder.SpringApplicationBuilder
-import org.springframework.boot.web.servlet.support.SpringBootServletInitializer
-
-class ServletInitializer extends SpringBootServletInitializer {
-
-	@Override
-	protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
-		application.sources(DemoApplication)
-	}
-
-}

initializr-generator/src/test/resources/project/groovy/standard/DemoApplicationTests.groovy.gen

@@ -2,11 +2,11 @@ package com.example.demo
 
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.springframework.boot.test.SpringApplicationConfiguration
+import org.springframework.boot.test.context.SpringBootTest
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner
+import org.springframework.test.context.junit4.SpringRunner
 
-@RunWith(SpringJUnit4ClassRunner)
+@RunWith(SpringRunner)
-@SpringApplicationConfiguration(classes = DemoApplication)
+@SpringBootTest
 class DemoApplicationTests {
 
 	@Test

initializr-generator/src/test/resources/project/groovy/standard/DemoApplicationTestsWeb.groovy.gen

@@ -2,13 +2,11 @@ package com.example.demo
 
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.springframework.boot.test.SpringApplicationConfiguration
+import org.springframework.boot.test.context.SpringBootTest
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner
+import org.springframework.test.context.junit4.SpringRunner
-import org.springframework.test.context.web.WebAppConfiguration
 
-@RunWith(SpringJUnit4ClassRunner)
+@RunWith(SpringRunner)
-@SpringApplicationConfiguration(classes = DemoApplication)
+@SpringBootTest
-@WebAppConfiguration
 class DemoApplicationTests {
 
 	@Test

initializr-generator/src/test/resources/project/groovy/standard/ServletInitializer.groovy.gen

@@ -1,7 +1,7 @@
 package com.example.demo
 
 import org.springframework.boot.builder.SpringApplicationBuilder
-import org.springframework.boot.context.web.SpringBootServletInitializer
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer
 
 class ServletInitializer extends SpringBootServletInitializer {
 

initializr-generator/src/test/resources/project/groovy/standard/build.gradle.gen

@@ -1,19 +1,18 @@
 buildscript {
 	ext {
-		springBootVersion = '1.2.3.RELEASE'
+		springBootVersion = '2.1.1.RELEASE'
 	}
 	repositories {
 		mavenCentral()
 	}
 	dependencies {
 		classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}")
-		classpath('io.spring.gradle:dependency-management-plugin:0.5.1.RELEASE')
 	}
 }
 
 apply plugin: 'groovy'
 apply plugin: 'eclipse'
-apply plugin: 'spring-boot'
+apply plugin: 'org.springframework.boot'
 apply plugin: 'io.spring.dependency-management'
 
 group = 'com.example'

initializr-generator/src/test/resources/project/groovy/standard/pom.xml.gen

@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.2.3.RELEASE</version>
+		<version>2.1.1.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 

initializr-generator/src/test/resources/project/groovy/standard/war-build.gradle.gen

@@ -1,19 +1,18 @@
 buildscript {
 	ext {
-		springBootVersion = '1.2.3.RELEASE'
+		springBootVersion = '2.1.1.RELEASE'
 	}
 	repositories {
 		mavenCentral()
 	}
 	dependencies {
 		classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}")
-		classpath('io.spring.gradle:dependency-management-plugin:0.5.1.RELEASE')
 	}
 }
 
 apply plugin: 'groovy'
 apply plugin: 'eclipse-wtp'
-apply plugin: 'spring-boot'
+apply plugin: 'org.springframework.boot'
 apply plugin: 'io.spring.dependency-management'
 apply plugin: 'war'
 

initializr-generator/src/test/resources/project/groovy/standard/war-pom.xml.gen

@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.2.3.RELEASE</version>
+		<version>2.1.1.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 

initializr-generator/src/test/resources/project/java/previous/DemoApplication.java.gen

@@ -0,0 +1,12 @@
+package com.example.demo;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class DemoApplication {
+
+	public static void main(String[] args) {
+		SpringApplication.run(DemoApplication.class, args);
+	}
+}

initializr-generator/src/test/resources/project/java/previous/build.gradle.gen

@@ -0,0 +1,29 @@
+buildscript {
+	ext {
+		springBootVersion = '1.5.18.RELEASE'
+	}
+	repositories {
+		mavenCentral()
+	}
+	dependencies {
+		classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}")
+	}
+}
+
+apply plugin: 'java'
+apply plugin: 'eclipse'
+apply plugin: 'org.springframework.boot'
+
+group = 'com.example'
+version = '0.0.1-SNAPSHOT'
+sourceCompatibility = 1.8
+
+repositories {
+	mavenCentral()
+}
+
+
+dependencies {
+	implementation('org.springframework.boot:spring-boot-starter')
+	testImplementation('org.springframework.boot:spring-boot-starter-test')
+}

initializr-generator/src/test/resources/project/java/previous/pom.xml.gen

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<groupId>com.example</groupId>
+	<artifactId>demo</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+	<packaging>jar</packaging>
+
+	<name>demo</name>
+	<description>Demo project for Spring Boot</description>
+
+	<parent>
+		<groupId>org.springframework.boot</groupId>
+		<artifactId>spring-boot-starter-parent</artifactId>
+		<version>1.5.18.RELEASE</version>
+		<relativePath/> <!-- lookup parent from repository -->
+	</parent>
+
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+		<java.version>1.8</java.version>
+	</properties>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+
+
+</project>

initializr-generator/src/test/resources/project/java/spring-boot-1.4/DemoApplicationTests.java.gen

@@ -1,16 +0,0 @@
-package com.example.demo;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest
-public class DemoApplicationTests {
-
-	@Test
-	public void contextLoads() {
-	}
-
-}

initializr-generator/src/test/resources/project/java/spring-boot-2.0/ServletInitializer.java.gen

@@ -1,13 +0,0 @@
-package com.example.demo;
-
-import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
-
-public class ServletInitializer extends SpringBootServletInitializer {
-
-	@Override
-	protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
-		return application.sources(DemoApplication.class);
-	}
-
-}

initializr-generator/src/test/resources/project/java/standard/DemoApplicationTests.java.gen

@@ -2,11 +2,11 @@ package com.example.demo;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 
-@RunWith(SpringJUnit4ClassRunner.class)
+@RunWith(SpringRunner.class)
-@SpringApplicationConfiguration(classes = DemoApplication.class)
+@SpringBootTest
 public class DemoApplicationTests {
 
 	@Test

initializr-generator/src/test/resources/project/java/standard/DemoApplicationTestsWeb.java.gen

@@ -2,13 +2,11 @@ package com.example.demo;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
-import org.springframework.test.context.web.WebAppConfiguration;
 
-@RunWith(SpringJUnit4ClassRunner.class)
+@RunWith(SpringRunner.class)
-@SpringApplicationConfiguration(classes = DemoApplication.class)
+@SpringBootTest
-@WebAppConfiguration
 public class DemoApplicationTests {
 
 	@Test

initializr-generator/src/test/resources/project/java/standard/ServletInitializer.java.gen

@@ -1,7 +1,7 @@
 package com.example.demo;
 
 import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.boot.context.web.SpringBootServletInitializer;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 
 public class ServletInitializer extends SpringBootServletInitializer {
 

initializr-generator/src/test/resources/project/java/standard/build.gradle.gen

@@ -1,19 +1,18 @@
 buildscript {
 	ext {
-		springBootVersion = '1.2.3.RELEASE'
+		springBootVersion = '2.1.1.RELEASE'
 	}
 	repositories {
 		mavenCentral()
 	}
 	dependencies {
 		classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}")
-		classpath('io.spring.gradle:dependency-management-plugin:0.5.1.RELEASE')
 	}
 }
 
 apply plugin: 'java'
 apply plugin: 'eclipse'
-apply plugin: 'spring-boot'
+apply plugin: 'org.springframework.boot'
 apply plugin: 'io.spring.dependency-management'
 
 group = 'com.example'

initializr-generator/src/test/resources/project/java/standard/pom.xml.gen

@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.2.3.RELEASE</version>
+		<version>2.1.1.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 

initializr-generator/src/test/resources/project/java/standard/war-build.gradle.gen

@@ -1,19 +1,18 @@
 buildscript {
 	ext {
-		springBootVersion = '1.2.3.RELEASE'
+		springBootVersion = '2.1.1.RELEASE'
 	}
 	repositories {
 		mavenCentral()
 	}
 	dependencies {
 		classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}")
-		classpath('io.spring.gradle:dependency-management-plugin:0.5.1.RELEASE')
 	}
 }
 
 apply plugin: 'java'
 apply plugin: 'eclipse-wtp'
-apply plugin: 'spring-boot'
+apply plugin: 'org.springframework.boot'
 apply plugin: 'io.spring.dependency-management'
 apply plugin: 'war'
 

initializr-generator/src/test/resources/project/java/standard/war-pom.xml.gen

@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.2.3.RELEASE</version>
+		<version>2.1.1.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 

initializr-generator/src/test/resources/project/kotlin/previous/build.gradle.gen

@@ -1,12 +1,10 @@
 buildscript {
 	ext {
 		kotlinVersion = '1.1.1'
-		springBootVersion = '2.0.0.M5'
+		springBootVersion = '1.5.18.RELEASE'
 	}
 	repositories {
 		mavenCentral()
-		maven { url "https://repo.spring.io/snapshot" }
-		maven { url "https://repo.spring.io/milestone" }
 	}
 	dependencies {
 		classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}")
@@ -19,7 +17,6 @@ apply plugin: 'kotlin'
 apply plugin: 'kotlin-spring'
 apply plugin: 'eclipse'
 apply plugin: 'org.springframework.boot'
-apply plugin: 'io.spring.dependency-management'
 
 group = 'com.example'
 version = '0.0.1-SNAPSHOT'
@@ -39,8 +36,6 @@ compileTestKotlin {
 
 repositories {
 	mavenCentral()
-	maven { url "https://repo.spring.io/snapshot" }
-	maven { url "https://repo.spring.io/milestone" }
 }
 
 

initializr-generator/src/test/resources/project/kotlin/previous/pom.xml.gen

@@ -14,14 +14,14 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.2.3.RELEASE</version>
+		<version>1.5.18.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<java.version>1.7</java.version>
+		<java.version>1.8</java.version>
 		<kotlin.version>1.1.1</kotlin.version>
 	</properties>
 
@@ -32,7 +32,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.jetbrains.kotlin</groupId>
-			<artifactId>kotlin-stdlib-jdk7</artifactId>
+			<artifactId>kotlin-stdlib-jdk8</artifactId>
 			<version>${kotlin.version}</version>
 		</dependency>
 		<dependency>
@@ -67,6 +67,7 @@
 					<compilerPlugins>
 						<plugin>spring</plugin>
 					</compilerPlugins>
+					<jvmTarget>1.8</jvmTarget>
 				</configuration>
 				<executions>
 					<execution>

initializr-generator/src/test/resources/project/kotlin/spring-boot-1.4/DemoApplicationTests.kt.gen

@@ -1,16 +0,0 @@
-package com.example.demo
-
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.springframework.boot.test.context.SpringBootTest
-import org.springframework.test.context.junit4.SpringRunner
-
-@RunWith(SpringRunner::class)
-@SpringBootTest
-class DemoApplicationTests {
-
-	@Test
-	fun contextLoads() {
-	}
-
-}

initializr-generator/src/test/resources/project/kotlin/spring-boot-2.0/DemoApplication.kt.gen

@@ -1,11 +0,0 @@
-package com.example.demo
-
-import org.springframework.boot.autoconfigure.SpringBootApplication
-import org.springframework.boot.runApplication
-
-@SpringBootApplication
-class DemoApplication
-
-fun main(args: Array<String>) {
-    runApplication<DemoApplication>(*args)
-}

initializr-generator/src/test/resources/project/kotlin/spring-boot-2.0/ServletInitializer.kt.gen

@@ -1,12 +0,0 @@
-package com.example.demo
-
-import org.springframework.boot.builder.SpringApplicationBuilder
-import org.springframework.boot.web.servlet.support.SpringBootServletInitializer
-
-class ServletInitializer : SpringBootServletInitializer() {
-
-	override fun configure(application: SpringApplicationBuilder) : SpringApplicationBuilder {
-		return application.sources(DemoApplication::class.java)
-	}
-
-}

initializr-generator/src/test/resources/project/kotlin/standard/DemoApplication.kt.gen

@@ -1,11 +1,11 @@
 package com.example.demo
 
-import org.springframework.boot.SpringApplication
 import org.springframework.boot.autoconfigure.SpringBootApplication
+import org.springframework.boot.runApplication
 
 @SpringBootApplication
 class DemoApplication
 
 fun main(args: Array<String>) {
-    SpringApplication.run(DemoApplication::class.java, *args)
+    runApplication<DemoApplication>(*args)
 }

initializr-generator/src/test/resources/project/kotlin/standard/DemoApplicationTests.kt.gen

@@ -2,11 +2,11 @@ package com.example.demo
 
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.springframework.boot.test.SpringApplicationConfiguration
+import org.springframework.boot.test.context.SpringBootTest
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner
+import org.springframework.test.context.junit4.SpringRunner
 
-@RunWith(SpringJUnit4ClassRunner::class)
+@RunWith(SpringRunner::class)
-@SpringApplicationConfiguration(classes = arrayOf(DemoApplication::class))
+@SpringBootTest
 class DemoApplicationTests {
 
 	@Test

initializr-generator/src/test/resources/project/kotlin/standard/DemoApplicationTestsWeb.kt.gen

@@ -2,13 +2,11 @@ package com.example.demo
 
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.springframework.boot.test.SpringApplicationConfiguration
+import org.springframework.boot.test.context.SpringBootTest
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner
+import org.springframework.test.context.junit4.SpringRunner
-import org.springframework.test.context.web.WebAppConfiguration
 
-@RunWith(SpringJUnit4ClassRunner::class)
+@RunWith(SpringRunner::class)
-@SpringApplicationConfiguration(classes = arrayOf(DemoApplication::class))
+@SpringBootTest
-@WebAppConfiguration
 class DemoApplicationTests {
 
 	@Test

initializr-generator/src/test/resources/project/kotlin/standard/ServletInitializer.kt.gen

@@ -1,7 +1,7 @@
 package com.example.demo
 
 import org.springframework.boot.builder.SpringApplicationBuilder
-import org.springframework.boot.context.web.SpringBootServletInitializer
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer
 
 class ServletInitializer : SpringBootServletInitializer() {
 

initializr-generator/src/test/resources/project/kotlin/standard/build.gradle.gen

@@ -1,14 +1,13 @@
 buildscript {
 	ext {
 		kotlinVersion = '1.1.1'
-		springBootVersion = '1.2.3.RELEASE'
+		springBootVersion = '2.1.1.RELEASE'
 	}
 	repositories {
 		mavenCentral()
 	}
 	dependencies {
 		classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}")
-		classpath('io.spring.gradle:dependency-management-plugin:0.5.1.RELEASE')
 		classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}")
 		classpath("org.jetbrains.kotlin:kotlin-allopen:${kotlinVersion}")
 	}
@@ -17,7 +16,7 @@ buildscript {
 apply plugin: 'kotlin'
 apply plugin: 'kotlin-spring'
 apply plugin: 'eclipse'
-apply plugin: 'spring-boot'
+apply plugin: 'org.springframework.boot'
 apply plugin: 'io.spring.dependency-management'
 
 group = 'com.example'
@@ -43,7 +42,7 @@ repositories {
 
 dependencies {
 	implementation('org.springframework.boot:spring-boot-starter')
-	implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:${kotlinVersion}")
+	implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
-	implementation("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
+	implementation("org.jetbrains.kotlin:kotlin-reflect")
 	testImplementation('org.springframework.boot:spring-boot-starter-test')
 }

initializr-generator/src/test/resources/project/kotlin/standard/pom.xml.gen

@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.2.3.RELEASE</version>
+		<version>2.1.1.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
@@ -33,12 +33,10 @@
 		<dependency>
 			<groupId>org.jetbrains.kotlin</groupId>
 			<artifactId>kotlin-stdlib-jdk8</artifactId>
-			<version>${kotlin.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.jetbrains.kotlin</groupId>
 			<artifactId>kotlin-reflect</artifactId>
-			<version>${kotlin.version}</version>
 		</dependency>
 
 		<dependency>
@@ -59,7 +57,6 @@
 			<plugin>
 				<artifactId>kotlin-maven-plugin</artifactId>
 				<groupId>org.jetbrains.kotlin</groupId>
-				<version>${kotlin.version}</version>
 				<configuration>
 					<args>
 						<arg>-Xjsr305=strict</arg>
@@ -67,24 +64,7 @@
 					<compilerPlugins>
 						<plugin>spring</plugin>
 					</compilerPlugins>
-					<jvmTarget>1.8</jvmTarget>
 				</configuration>
-				<executions>
-					<execution>
-						<id>compile</id>
-						<phase>compile</phase>
-						<goals>
-							<goal>compile</goal>
-						</goals>
-					</execution>
-					<execution>
-						<id>test-compile</id>
-						<phase>test-compile</phase>
-						<goals>
-							<goal>test-compile</goal>
-						</goals>
-					</execution>
-				</executions>
 				<dependencies>
 					<dependency>
 						<groupId>org.jetbrains.kotlin</groupId>

initializr-generator/src/test/resources/project/kotlin/standard/war-build.gradle.gen

@@ -1,14 +1,13 @@
 buildscript {
 	ext {
 		kotlinVersion = '1.1.1'
-		springBootVersion = '1.2.3.RELEASE'
+		springBootVersion = '2.1.1.RELEASE'
 	}
 	repositories {
 		mavenCentral()
 	}
 	dependencies {
 		classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}")
-		classpath('io.spring.gradle:dependency-management-plugin:0.5.1.RELEASE')
 		classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}")
 		classpath("org.jetbrains.kotlin:kotlin-allopen:${kotlinVersion}")
 	}
@@ -17,7 +16,7 @@ buildscript {
 apply plugin: 'kotlin'
 apply plugin: 'kotlin-spring'
 apply plugin: 'eclipse-wtp'
-apply plugin: 'spring-boot'
+apply plugin: 'org.springframework.boot'
 apply plugin: 'io.spring.dependency-management'
 apply plugin: 'war'
 
@@ -47,8 +46,8 @@ configurations {
 
 dependencies {
 	implementation('org.springframework.boot:spring-boot-starter-web')
-	implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:${kotlinVersion}")
+	implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
-	implementation("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
+	implementation("org.jetbrains.kotlin:kotlin-reflect")
 	providedRuntime('org.springframework.boot:spring-boot-starter-tomcat')
 	testImplementation('org.springframework.boot:spring-boot-starter-test')
 }

initializr-generator/src/test/resources/project/kotlin/standard/war-pom.xml.gen

@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.2.3.RELEASE</version>
+		<version>2.1.1.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
@@ -33,12 +33,10 @@
 		<dependency>
 			<groupId>org.jetbrains.kotlin</groupId>
 			<artifactId>kotlin-stdlib-jdk8</artifactId>
-			<version>${kotlin.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.jetbrains.kotlin</groupId>
 			<artifactId>kotlin-reflect</artifactId>
-			<version>${kotlin.version}</version>
 		</dependency>
 
 		<dependency>
@@ -64,7 +62,6 @@
 			<plugin>
 				<artifactId>kotlin-maven-plugin</artifactId>
 				<groupId>org.jetbrains.kotlin</groupId>
-				<version>${kotlin.version}</version>
 				<configuration>
 					<args>
 						<arg>-Xjsr305=strict</arg>
@@ -72,24 +69,7 @@
 					<compilerPlugins>
 						<plugin>spring</plugin>
 					</compilerPlugins>
-					<jvmTarget>1.8</jvmTarget>
 				</configuration>
-				<executions>
-					<execution>
-						<id>compile</id>
-						<phase>compile</phase>
-						<goals>
-							<goal>compile</goal>
-						</goals>
-					</execution>
-					<execution>
-						<id>test-compile</id>
-						<phase>test-compile</phase>
-						<goals>
-							<goal>test-compile</goal>
-						</goals>
-					</execution>
-				</executions>
 				<dependencies>
 					<dependency>
 						<groupId>org.jetbrains.kotlin</groupId>

initializr-generator/src/test/resources/project/maven/annotation-processor-dependency-pom.xml.gen

@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.2.3.RELEASE</version>
+		<version>2.1.1.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 

initializr-generator/src/test/resources/project/maven/bom-ordering-pom.xml.gen

@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.2.3.RELEASE</version>
+		<version>2.1.1.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 

initializr-generator/src/test/resources/project/maven/bom-property-pom.xml.gen

@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.2.3.RELEASE</version>
+		<version>2.1.1.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 

initializr-generator/src/test/resources/project/maven/compile-only-dependency-pom.xml.gen

@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.2.3.RELEASE</version>
+		<version>2.1.1.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 

initializr-generator/src/test/resources/project/maven/kotlin-java11-pom.xml.gen

@@ -14,14 +14,14 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.2.3.RELEASE</version>
+		<version>2.1.1.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<java.version>1.6</java.version>
+		<java.version>11</java.version>
 		<kotlin.version>1.1.1</kotlin.version>
 	</properties>
 
@@ -32,13 +32,11 @@
 		</dependency>
 		<dependency>
 			<groupId>org.jetbrains.kotlin</groupId>
-			<artifactId>kotlin-stdlib</artifactId>
+			<artifactId>kotlin-stdlib-jdk8</artifactId>
-			<version>${kotlin.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.jetbrains.kotlin</groupId>
 			<artifactId>kotlin-reflect</artifactId>
-			<version>${kotlin.version}</version>
 		</dependency>
 
 		<dependency>
@@ -59,7 +57,6 @@
 			<plugin>
 				<artifactId>kotlin-maven-plugin</artifactId>
 				<groupId>org.jetbrains.kotlin</groupId>
-				<version>${kotlin.version}</version>
 				<configuration>
 					<args>
 						<arg>-Xjsr305=strict</arg>
@@ -68,22 +65,6 @@
 						<plugin>spring</plugin>
 					</compilerPlugins>
 				</configuration>
-				<executions>
-					<execution>
-						<id>compile</id>
-						<phase>compile</phase>
-						<goals>
-							<goal>compile</goal>
-						</goals>
-					</execution>
-					<execution>
-						<id>test-compile</id>
-						<phase>test-compile</phase>
-						<goals>
-							<goal>test-compile</goal>
-						</goals>
-					</execution>
-				</executions>
 				<dependencies>
 					<dependency>
 						<groupId>org.jetbrains.kotlin</groupId>

initializr-generator/src/test/resources/project/maven/kotlin-java9-pom.xml.gen

@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-
-	<groupId>com.example</groupId>
-	<artifactId>demo</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
-	<packaging>jar</packaging>
-
-	<name>demo</name>
-	<description>Demo project for Spring Boot</description>
-
-	<parent>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.0.0.M6</version>
-		<relativePath/> <!-- lookup parent from repository -->
-	</parent>
-
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<java.version>9</java.version>
-		<kotlin.version>1.1.1</kotlin.version>
-	</properties>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jetbrains.kotlin</groupId>
-			<artifactId>kotlin-stdlib-jdk8</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jetbrains.kotlin</groupId>
-			<artifactId>kotlin-reflect</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
-
-	<build>
-		<sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>
-		<testSourceDirectory>${project.basedir}/src/test/kotlin</testSourceDirectory>
-		<plugins>
-			<plugin>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-maven-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<artifactId>kotlin-maven-plugin</artifactId>
-				<groupId>org.jetbrains.kotlin</groupId>
-				<configuration>
-					<args>
-						<arg>-Xjsr305=strict</arg>
-					</args>
-					<compilerPlugins>
-						<plugin>spring</plugin>
-					</compilerPlugins>
-				</configuration>
-				<dependencies>
-					<dependency>
-						<groupId>org.jetbrains.kotlin</groupId>
-						<artifactId>kotlin-maven-allopen</artifactId>
-						<version>${kotlin.version}</version>
-					</dependency>
-				</dependencies>
-			</plugin>
-		</plugins>
-	</build>
-
-	<repositories>
-		<repository>
-			<id>spring-snapshots</id>
-			<name>Spring Snapshots</name>
-			<url>https://repo.spring.io/snapshot</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>spring-milestones</id>
-			<name>Spring Milestones</name>
-			<url>https://repo.spring.io/milestone</url>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</repository>
-	</repositories>
-
-	<pluginRepositories>
-		<pluginRepository>
-			<id>spring-snapshots</id>
-			<name>Spring Snapshots</name>
-			<url>https://repo.spring.io/snapshot</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</pluginRepository>
-		<pluginRepository>
-			<id>spring-milestones</id>
-			<name>Spring Milestones</name>
-			<url>https://repo.spring.io/milestone</url>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</pluginRepository>
-	</pluginRepositories>
-
-
-</project>

initializr-generator/src/test/resources/project/maven/kotlin-springboot2-legacy-pom.xml.gen

@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-
-	<groupId>com.example</groupId>
-	<artifactId>demo</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
-	<packaging>jar</packaging>
-
-	<name>demo</name>
-	<description>Demo project for Spring Boot</description>
-
-	<parent>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.0.0.M5</version>
-		<relativePath/> <!-- lookup parent from repository -->
-	</parent>
-
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<java.version>1.8</java.version>
-		<kotlin.version>1.1.1</kotlin.version>
-	</properties>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jetbrains.kotlin</groupId>
-			<artifactId>kotlin-stdlib-jdk8</artifactId>
-			<version>${kotlin.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.jetbrains.kotlin</groupId>
-			<artifactId>kotlin-reflect</artifactId>
-			<version>${kotlin.version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
-
-	<build>
-		<sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>
-		<testSourceDirectory>${project.basedir}/src/test/kotlin</testSourceDirectory>
-		<plugins>
-			<plugin>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-maven-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<artifactId>kotlin-maven-plugin</artifactId>
-				<groupId>org.jetbrains.kotlin</groupId>
-				<version>${kotlin.version}</version>
-				<configuration>
-					<args>
-						<arg>-Xjsr305=strict</arg>
-					</args>
-					<compilerPlugins>
-						<plugin>spring</plugin>
-					</compilerPlugins>
-					<jvmTarget>1.8</jvmTarget>
-				</configuration>
-				<executions>
-					<execution>
-						<id>compile</id>
-						<phase>compile</phase>
-						<goals>
-							<goal>compile</goal>
-						</goals>
-					</execution>
-					<execution>
-						<id>test-compile</id>
-						<phase>test-compile</phase>
-						<goals>
-							<goal>test-compile</goal>
-						</goals>
-					</execution>
-				</executions>
-				<dependencies>
-					<dependency>
-						<groupId>org.jetbrains.kotlin</groupId>
-						<artifactId>kotlin-maven-allopen</artifactId>
-						<version>${kotlin.version}</version>
-					</dependency>
-				</dependencies>
-			</plugin>
-		</plugins>
-	</build>
-
-	<repositories>
-		<repository>
-			<id>spring-snapshots</id>
-			<name>Spring Snapshots</name>
-			<url>https://repo.spring.io/snapshot</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>spring-milestones</id>
-			<name>Spring Milestones</name>
-			<url>https://repo.spring.io/milestone</url>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</repository>
-	</repositories>
-
-	<pluginRepositories>
-		<pluginRepository>
-			<id>spring-snapshots</id>
-			<name>Spring Snapshots</name>
-			<url>https://repo.spring.io/snapshot</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</pluginRepository>
-		<pluginRepository>
-			<id>spring-milestones</id>
-			<name>Spring Milestones</name>
-			<url>https://repo.spring.io/milestone</url>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</pluginRepository>
-	</pluginRepositories>
-
-
-</project>

initializr-generator/src/test/resources/project/maven/kotlin-springboot2-pom.xml.gen

@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-
-	<groupId>com.example</groupId>
-	<artifactId>demo</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
-	<packaging>jar</packaging>
-
-	<name>demo</name>
-	<description>Demo project for Spring Boot</description>
-
-	<parent>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.0.0.M6</version>
-		<relativePath/> <!-- lookup parent from repository -->
-	</parent>
-
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<java.version>1.8</java.version>
-		<kotlin.version>1.1.1</kotlin.version>
-	</properties>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jetbrains.kotlin</groupId>
-			<artifactId>kotlin-stdlib-jdk8</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jetbrains.kotlin</groupId>
-			<artifactId>kotlin-reflect</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
-
-	<build>
-		<sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>
-		<testSourceDirectory>${project.basedir}/src/test/kotlin</testSourceDirectory>
-		<plugins>
-			<plugin>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-maven-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<artifactId>kotlin-maven-plugin</artifactId>
-				<groupId>org.jetbrains.kotlin</groupId>
-				<configuration>
-					<args>
-						<arg>-Xjsr305=strict</arg>
-					</args>
-					<compilerPlugins>
-						<plugin>spring</plugin>
-					</compilerPlugins>
-				</configuration>
-				<dependencies>
-					<dependency>
-						<groupId>org.jetbrains.kotlin</groupId>
-						<artifactId>kotlin-maven-allopen</artifactId>
-						<version>${kotlin.version}</version>
-					</dependency>
-				</dependencies>
-			</plugin>
-		</plugins>
-	</build>
-
-	<repositories>
-		<repository>
-			<id>spring-snapshots</id>
-			<name>Spring Snapshots</name>
-			<url>https://repo.spring.io/snapshot</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>spring-milestones</id>
-			<name>Spring Milestones</name>
-			<url>https://repo.spring.io/milestone</url>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</repository>
-	</repositories>
-
-	<pluginRepositories>
-		<pluginRepository>
-			<id>spring-snapshots</id>
-			<name>Spring Snapshots</name>
-			<url>https://repo.spring.io/snapshot</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</pluginRepository>
-		<pluginRepository>
-			<id>spring-milestones</id>
-			<name>Spring Milestones</name>
-			<url>https://repo.spring.io/milestone</url>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</pluginRepository>
-	</pluginRepositories>
-
-
-</project>

initializr-generator/src/test/resources/project/maven/version-override-pom.xml.gen

@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.2.3.RELEASE</version>
+		<version>2.1.1.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>