diff --git a/initializr-actuator/src/test/java/io/spring/initializr/actuate/metric/ProjectGenerationMetricsListenerTests.java b/initializr-actuator/src/test/java/io/spring/initializr/actuate/metric/ProjectGenerationMetricsListenerTests.java index 0bbe0de8..b012d0ac 100755 --- a/initializr-actuator/src/test/java/io/spring/initializr/actuate/metric/ProjectGenerationMetricsListenerTests.java +++ b/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 diff --git a/initializr-actuator/src/test/java/io/spring/initializr/actuate/stat/ProjectRequestDocumentFactoryTests.java b/initializr-actuator/src/test/java/io/spring/initializr/actuate/stat/ProjectRequestDocumentFactoryTests.java index 15ca97e8..7781f1db 100755 --- a/initializr-actuator/src/test/java/io/spring/initializr/actuate/stat/ProjectRequestDocumentFactoryTests.java +++ b/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"); diff --git a/initializr-generator/src/test/java/io/spring/initializr/generator/ProjectGeneratorBuildTests.java b/initializr-generator/src/test/java/io/spring/initializr/generator/ProjectGeneratorBuildTests.java index 52944d51..7e67d2b9 100755 --- a/initializr-generator/src/test/java/io/spring/initializr/generator/ProjectGeneratorBuildTests.java +++ b/initializr-generator/src/test/java/io/spring/initializr/generator/ProjectGeneratorBuildTests.java @@ -56,21 +56,21 @@ public class ProjectGeneratorBuildTests extends AbstractProjectGeneratorTests { } @Test - public void standardJarJava() { - testStandardJar("java"); + public void currentGenerationJarJava() { + testCurrentGenerationJar("java"); } @Test - public void standardJarGroovy() { - testStandardJar("groovy"); + public void currentGenerationJarGroovy() { + testCurrentGenerationJar("groovy"); } @Test - public void standardJarKotlin() { - testStandardJar("kotlin"); + public void currentGenerationJarKotlin() { + 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() { - testStandardWar("java"); + public void currentGenerationWarJava() { + testCurrentGenerationWar("java"); } @Test - public void standardWarGroovy() { - testStandardWar("groovy"); + public void currentGenerationWarGroovy() { + testCurrentGenerationWar("groovy"); } @Test - public void standardWarKotlin() { - testStandardWar("kotlin"); + public void currentGenerationWarKotlin() { + 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); diff --git a/initializr-generator/src/test/java/io/spring/initializr/generator/ProjectGeneratorLanguageTests.java b/initializr-generator/src/test/java/io/spring/initializr/generator/ProjectGeneratorLanguageTests.java index 11cd78df..30ae668c 100755 --- a/initializr-generator/src/test/java/io/spring/initializr/generator/ProjectGeneratorLanguageTests.java +++ b/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() { - 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) { + public void currentGenerationServletInitializer() { 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( - "project/" + this.language + "/" + expectedOutput - + "/ServletInitializer." + this.expectedExtension)); + .equalsTo(new ClassPathResource("project/" + this.language + "/standard/" + + "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 - + "/com/example/demo/DemoApplicationTests." + this.extension) - .equalsTo(new ClassPathResource("project/" + this.language - + "/standard/DemoApplicationTests." + 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)); + project.sourceCodeAssert("src/main/" + this.language + + "/com/example/demo/ServletInitializer." + this.extension) + .equalsTo(new ClassPathResource("project/" + this.language + "/previous/" + + "ServletInitializer." + this.expectedExtension)); } } diff --git a/initializr-generator/src/test/java/io/spring/initializr/metadata/InitializrMetadataBuilderTests.java b/initializr-generator/src/test/java/io/spring/initializr/metadata/InitializrMetadataBuilderTests.java index d81dbf51..171d8fb1 100755 --- a/initializr-generator/src/test/java/io/spring/initializr/metadata/InitializrMetadataBuilderTests.java +++ b/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(); diff --git a/initializr-generator/src/test/java/io/spring/initializr/test/metadata/InitializrMetadataTestBuilder.java b/initializr-generator/src/test/java/io/spring/initializr/test/metadata/InitializrMetadataTestBuilder.java index 09843c9c..06131163 100644 --- a/initializr-generator/src/test/java/io/spring/initializr/test/metadata/InitializrMetadataTestBuilder.java +++ b/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) - .addBootVersion("1.2.3.RELEASE", true) - .addBootVersion("1.3.0.BUILD-SNAPSHOT", false); + return addBootVersion("1.5.17.RELEASE", false) + .addBootVersion("2.0.3.RELEASE", false) + .addBootVersion("2.1.1.RELEASE", true) + .addBootVersion("2.2.0.BUILD-SNAPSHOT", false); } public InitializrMetadataTestBuilder addBootVersion(String id, boolean defaultValue) { diff --git a/initializr-generator/src/test/resources/metadata/config/test-bom.json b/initializr-generator/src/test/resources/metadata/config/test-bom.json index 448efecd..3f59048a 100644 --- a/initializr-generator/src/test/resources/metadata/config/test-bom.json +++ b/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", diff --git a/initializr-generator/src/test/resources/project/gradle/annotation-processor-dependency-build.gradle.gen b/initializr-generator/src/test/resources/project/gradle/annotation-processor-dependency-build.gradle.gen index 0239426e..4876fa8e 100644 --- a/initializr-generator/src/test/resources/project/gradle/annotation-processor-dependency-build.gradle.gen +++ b/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' diff --git a/initializr-generator/src/test/resources/project/gradle/bom-ordering-build.gradle.gen b/initializr-generator/src/test/resources/project/gradle/bom-ordering-build.gradle.gen index 76fb5a6d..5c8a0546 100644 --- a/initializr-generator/src/test/resources/project/gradle/bom-ordering-build.gradle.gen +++ b/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' diff --git a/initializr-generator/src/test/resources/project/gradle/bom-property-build.gradle.gen b/initializr-generator/src/test/resources/project/gradle/bom-property-build.gradle.gen index b30697b5..9597fb60 100644 --- a/initializr-generator/src/test/resources/project/gradle/bom-property-build.gradle.gen +++ b/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' diff --git a/initializr-generator/src/test/resources/project/gradle/compile-only-dependency-build.gradle.gen b/initializr-generator/src/test/resources/project/gradle/compile-only-dependency-build.gradle.gen index ef3acc54..774fc353 100644 --- a/initializr-generator/src/test/resources/project/gradle/compile-only-dependency-build.gradle.gen +++ b/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' diff --git a/initializr-generator/src/test/resources/project/gradle/kotlin-java9-build.gradle.gen b/initializr-generator/src/test/resources/project/gradle/kotlin-java11-build.gradle.gen similarity index 80% rename from initializr-generator/src/test/resources/project/gradle/kotlin-java9-build.gradle.gen rename to initializr-generator/src/test/resources/project/gradle/kotlin-java11-build.gradle.gen index d3ad7e7b..0933bde1 100644 --- a/initializr-generator/src/test/resources/project/gradle/kotlin-java9-build.gradle.gen +++ b/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" } } diff --git a/initializr-generator/src/test/resources/project/gradle/kotlin-java6-build.gradle.gen b/initializr-generator/src/test/resources/project/gradle/kotlin-java6-build.gradle.gen deleted file mode 100644 index eef832d1..00000000 --- a/initializr-generator/src/test/resources/project/gradle/kotlin-java6-build.gradle.gen +++ /dev/null @@ -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') -} diff --git a/initializr-generator/src/test/resources/project/gradle/kotlin-java7-build.gradle.gen b/initializr-generator/src/test/resources/project/gradle/kotlin-java7-build.gradle.gen deleted file mode 100644 index 22d7b7cd..00000000 --- a/initializr-generator/src/test/resources/project/gradle/kotlin-java7-build.gradle.gen +++ /dev/null @@ -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') -} diff --git a/initializr-generator/src/test/resources/project/gradle/kotlin-springboot2-build.gradle.gen b/initializr-generator/src/test/resources/project/gradle/kotlin-springboot2-build.gradle.gen deleted file mode 100644 index e1a89ed7..00000000 --- a/initializr-generator/src/test/resources/project/gradle/kotlin-springboot2-build.gradle.gen +++ /dev/null @@ -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') -} diff --git a/initializr-generator/src/test/resources/project/gradle/version-override-build.gradle.gen b/initializr-generator/src/test/resources/project/gradle/version-override-build.gradle.gen index 97d760fe..62969d8c 100644 --- a/initializr-generator/src/test/resources/project/gradle/version-override-build.gradle.gen +++ b/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' diff --git a/initializr-generator/src/test/resources/project/groovy/previous/DemoApplication.groovy.gen b/initializr-generator/src/test/resources/project/groovy/previous/DemoApplication.groovy.gen new file mode 100644 index 00000000..bc477b0b --- /dev/null +++ b/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 + } +} diff --git a/initializr-generator/src/test/resources/project/groovy/spring-boot-1.4/ServletInitializer.groovy.gen b/initializr-generator/src/test/resources/project/groovy/previous/ServletInitializer.groovy.gen similarity index 100% rename from initializr-generator/src/test/resources/project/groovy/spring-boot-1.4/ServletInitializer.groovy.gen rename to initializr-generator/src/test/resources/project/groovy/previous/ServletInitializer.groovy.gen diff --git a/initializr-generator/src/test/resources/project/groovy/previous/build.gradle.gen b/initializr-generator/src/test/resources/project/groovy/previous/build.gradle.gen new file mode 100644 index 00000000..d2f49305 --- /dev/null +++ b/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') +} diff --git a/initializr-generator/src/test/resources/project/groovy/previous/pom.xml.gen b/initializr-generator/src/test/resources/project/groovy/previous/pom.xml.gen new file mode 100644 index 00000000..b6ad7736 --- /dev/null +++ b/initializr-generator/src/test/resources/project/groovy/previous/pom.xml.gen @@ -0,0 +1,73 @@ + + + 4.0.0 + + com.example + demo + 0.0.1-SNAPSHOT + jar + + demo + Demo project for Spring Boot + + + org.springframework.boot + spring-boot-starter-parent + 1.5.18.RELEASE + + + + + UTF-8 + UTF-8 + 1.8 + + + + + org.springframework.boot + spring-boot-starter + + + org.codehaus.groovy + groovy + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + org.codehaus.gmavenplus + gmavenplus-plugin + 1.5 + + + + addSources + addTestSources + generateStubs + compile + testGenerateStubs + testCompile + removeStubs + removeTestStubs + + + + + + + + + diff --git a/initializr-generator/src/test/resources/project/groovy/spring-boot-1.4/DemoApplicationTests.groovy.gen b/initializr-generator/src/test/resources/project/groovy/spring-boot-1.4/DemoApplicationTests.groovy.gen deleted file mode 100644 index fe48ebf2..00000000 --- a/initializr-generator/src/test/resources/project/groovy/spring-boot-1.4/DemoApplicationTests.groovy.gen +++ /dev/null @@ -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() { - } - -} diff --git a/initializr-generator/src/test/resources/project/groovy/spring-boot-2.0/ServletInitializer.groovy.gen b/initializr-generator/src/test/resources/project/groovy/spring-boot-2.0/ServletInitializer.groovy.gen deleted file mode 100644 index b6eee448..00000000 --- a/initializr-generator/src/test/resources/project/groovy/spring-boot-2.0/ServletInitializer.groovy.gen +++ /dev/null @@ -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) - } - -} diff --git a/initializr-generator/src/test/resources/project/groovy/standard/DemoApplicationTests.groovy.gen b/initializr-generator/src/test/resources/project/groovy/standard/DemoApplicationTests.groovy.gen index 4aab1ee7..fe48ebf2 100644 --- a/initializr-generator/src/test/resources/project/groovy/standard/DemoApplicationTests.groovy.gen +++ b/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.test.context.junit4.SpringJUnit4ClassRunner +import org.springframework.boot.test.context.SpringBootTest +import org.springframework.test.context.junit4.SpringRunner -@RunWith(SpringJUnit4ClassRunner) -@SpringApplicationConfiguration(classes = DemoApplication) +@RunWith(SpringRunner) +@SpringBootTest class DemoApplicationTests { @Test diff --git a/initializr-generator/src/test/resources/project/groovy/standard/DemoApplicationTestsWeb.groovy.gen b/initializr-generator/src/test/resources/project/groovy/standard/DemoApplicationTestsWeb.groovy.gen index 1ed71e94..fe48ebf2 100644 --- a/initializr-generator/src/test/resources/project/groovy/standard/DemoApplicationTestsWeb.groovy.gen +++ b/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.test.context.junit4.SpringJUnit4ClassRunner -import org.springframework.test.context.web.WebAppConfiguration +import org.springframework.boot.test.context.SpringBootTest +import org.springframework.test.context.junit4.SpringRunner -@RunWith(SpringJUnit4ClassRunner) -@SpringApplicationConfiguration(classes = DemoApplication) -@WebAppConfiguration +@RunWith(SpringRunner) +@SpringBootTest class DemoApplicationTests { @Test diff --git a/initializr-generator/src/test/resources/project/groovy/standard/ServletInitializer.groovy.gen b/initializr-generator/src/test/resources/project/groovy/standard/ServletInitializer.groovy.gen index de0ac44f..b6eee448 100644 --- a/initializr-generator/src/test/resources/project/groovy/standard/ServletInitializer.groovy.gen +++ b/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 { diff --git a/initializr-generator/src/test/resources/project/groovy/standard/build.gradle.gen b/initializr-generator/src/test/resources/project/groovy/standard/build.gradle.gen index dfcbf474..1e5d7ba9 100644 --- a/initializr-generator/src/test/resources/project/groovy/standard/build.gradle.gen +++ b/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' diff --git a/initializr-generator/src/test/resources/project/groovy/standard/pom.xml.gen b/initializr-generator/src/test/resources/project/groovy/standard/pom.xml.gen index 30490817..20e4c2eb 100644 --- a/initializr-generator/src/test/resources/project/groovy/standard/pom.xml.gen +++ b/initializr-generator/src/test/resources/project/groovy/standard/pom.xml.gen @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.2.3.RELEASE + 2.1.1.RELEASE diff --git a/initializr-generator/src/test/resources/project/groovy/war/build.gradle.gen b/initializr-generator/src/test/resources/project/groovy/standard/war-build.gradle.gen similarity index 83% rename from initializr-generator/src/test/resources/project/groovy/war/build.gradle.gen rename to initializr-generator/src/test/resources/project/groovy/standard/war-build.gradle.gen index dca4e197..7e7c9dcb 100644 --- a/initializr-generator/src/test/resources/project/groovy/war/build.gradle.gen +++ b/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' diff --git a/initializr-generator/src/test/resources/project/groovy/war/pom.xml.gen b/initializr-generator/src/test/resources/project/groovy/standard/war-pom.xml.gen similarity index 98% rename from initializr-generator/src/test/resources/project/groovy/war/pom.xml.gen rename to initializr-generator/src/test/resources/project/groovy/standard/war-pom.xml.gen index 4380d886..e47057cc 100644 --- a/initializr-generator/src/test/resources/project/groovy/war/pom.xml.gen +++ b/initializr-generator/src/test/resources/project/groovy/standard/war-pom.xml.gen @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.2.3.RELEASE + 2.1.1.RELEASE diff --git a/initializr-generator/src/test/resources/project/java/previous/DemoApplication.java.gen b/initializr-generator/src/test/resources/project/java/previous/DemoApplication.java.gen new file mode 100644 index 00000000..e03ec75e --- /dev/null +++ b/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); + } +} diff --git a/initializr-generator/src/test/resources/project/java/spring-boot-1.4/ServletInitializer.java.gen b/initializr-generator/src/test/resources/project/java/previous/ServletInitializer.java.gen similarity index 100% rename from initializr-generator/src/test/resources/project/java/spring-boot-1.4/ServletInitializer.java.gen rename to initializr-generator/src/test/resources/project/java/previous/ServletInitializer.java.gen diff --git a/initializr-generator/src/test/resources/project/java/previous/build.gradle.gen b/initializr-generator/src/test/resources/project/java/previous/build.gradle.gen new file mode 100644 index 00000000..00a45dc6 --- /dev/null +++ b/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') +} diff --git a/initializr-generator/src/test/resources/project/java/previous/pom.xml.gen b/initializr-generator/src/test/resources/project/java/previous/pom.xml.gen new file mode 100644 index 00000000..db954653 --- /dev/null +++ b/initializr-generator/src/test/resources/project/java/previous/pom.xml.gen @@ -0,0 +1,50 @@ + + + 4.0.0 + + com.example + demo + 0.0.1-SNAPSHOT + jar + + demo + Demo project for Spring Boot + + + org.springframework.boot + spring-boot-starter-parent + 1.5.18.RELEASE + + + + + UTF-8 + UTF-8 + 1.8 + + + + + org.springframework.boot + spring-boot-starter + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + + diff --git a/initializr-generator/src/test/resources/project/java/spring-boot-1.4/DemoApplicationTests.java.gen b/initializr-generator/src/test/resources/project/java/spring-boot-1.4/DemoApplicationTests.java.gen deleted file mode 100644 index b76e7f2e..00000000 --- a/initializr-generator/src/test/resources/project/java/spring-boot-1.4/DemoApplicationTests.java.gen +++ /dev/null @@ -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() { - } - -} diff --git a/initializr-generator/src/test/resources/project/java/spring-boot-2.0/ServletInitializer.java.gen b/initializr-generator/src/test/resources/project/java/spring-boot-2.0/ServletInitializer.java.gen deleted file mode 100644 index 894117f9..00000000 --- a/initializr-generator/src/test/resources/project/java/spring-boot-2.0/ServletInitializer.java.gen +++ /dev/null @@ -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); - } - -} diff --git a/initializr-generator/src/test/resources/project/java/standard/DemoApplicationTests.java.gen b/initializr-generator/src/test/resources/project/java/standard/DemoApplicationTests.java.gen index 9e65bca6..b76e7f2e 100644 --- a/initializr-generator/src/test/resources/project/java/standard/DemoApplicationTests.java.gen +++ b/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.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; -@RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = DemoApplication.class) +@RunWith(SpringRunner.class) +@SpringBootTest public class DemoApplicationTests { @Test diff --git a/initializr-generator/src/test/resources/project/java/standard/DemoApplicationTestsWeb.java.gen b/initializr-generator/src/test/resources/project/java/standard/DemoApplicationTestsWeb.java.gen index eaf787eb..b76e7f2e 100644 --- a/initializr-generator/src/test/resources/project/java/standard/DemoApplicationTestsWeb.java.gen +++ b/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.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.web.WebAppConfiguration; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; -@RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = DemoApplication.class) -@WebAppConfiguration +@RunWith(SpringRunner.class) +@SpringBootTest public class DemoApplicationTests { @Test diff --git a/initializr-generator/src/test/resources/project/java/standard/ServletInitializer.java.gen b/initializr-generator/src/test/resources/project/java/standard/ServletInitializer.java.gen index 3e8bbfdf..894117f9 100644 --- a/initializr-generator/src/test/resources/project/java/standard/ServletInitializer.java.gen +++ b/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 { diff --git a/initializr-generator/src/test/resources/project/java/standard/build.gradle.gen b/initializr-generator/src/test/resources/project/java/standard/build.gradle.gen index f78fda23..3a46a601 100644 --- a/initializr-generator/src/test/resources/project/java/standard/build.gradle.gen +++ b/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' diff --git a/initializr-generator/src/test/resources/project/java/standard/pom.xml.gen b/initializr-generator/src/test/resources/project/java/standard/pom.xml.gen index 04710231..c7de6be6 100644 --- a/initializr-generator/src/test/resources/project/java/standard/pom.xml.gen +++ b/initializr-generator/src/test/resources/project/java/standard/pom.xml.gen @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.2.3.RELEASE + 2.1.1.RELEASE diff --git a/initializr-generator/src/test/resources/project/java/war/build.gradle.gen b/initializr-generator/src/test/resources/project/java/standard/war-build.gradle.gen similarity index 82% rename from initializr-generator/src/test/resources/project/java/war/build.gradle.gen rename to initializr-generator/src/test/resources/project/java/standard/war-build.gradle.gen index 48a3075e..a867a442 100644 --- a/initializr-generator/src/test/resources/project/java/war/build.gradle.gen +++ b/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' diff --git a/initializr-generator/src/test/resources/project/java/war/pom.xml.gen b/initializr-generator/src/test/resources/project/java/standard/war-pom.xml.gen similarity index 97% rename from initializr-generator/src/test/resources/project/java/war/pom.xml.gen rename to initializr-generator/src/test/resources/project/java/standard/war-pom.xml.gen index 0b4c7a21..1825d075 100644 --- a/initializr-generator/src/test/resources/project/java/war/pom.xml.gen +++ b/initializr-generator/src/test/resources/project/java/standard/war-pom.xml.gen @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.2.3.RELEASE + 2.1.1.RELEASE diff --git a/initializr-generator/src/test/resources/project/kotlin/spring-boot-2.0/DemoApplicationLegacy.kt.gen b/initializr-generator/src/test/resources/project/kotlin/previous/DemoApplication.kt.gen similarity index 100% rename from initializr-generator/src/test/resources/project/kotlin/spring-boot-2.0/DemoApplicationLegacy.kt.gen rename to initializr-generator/src/test/resources/project/kotlin/previous/DemoApplication.kt.gen diff --git a/initializr-generator/src/test/resources/project/kotlin/spring-boot-1.4/ServletInitializer.kt.gen b/initializr-generator/src/test/resources/project/kotlin/previous/ServletInitializer.kt.gen similarity index 100% rename from initializr-generator/src/test/resources/project/kotlin/spring-boot-1.4/ServletInitializer.kt.gen rename to initializr-generator/src/test/resources/project/kotlin/previous/ServletInitializer.kt.gen diff --git a/initializr-generator/src/test/resources/project/gradle/kotlin-springboot2-legacy-build.gradle.gen b/initializr-generator/src/test/resources/project/kotlin/previous/build.gradle.gen similarity index 79% rename from initializr-generator/src/test/resources/project/gradle/kotlin-springboot2-legacy-build.gradle.gen rename to initializr-generator/src/test/resources/project/kotlin/previous/build.gradle.gen index 9b1d214d..c0bafcd5 100644 --- a/initializr-generator/src/test/resources/project/gradle/kotlin-springboot2-legacy-build.gradle.gen +++ b/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" } } diff --git a/initializr-generator/src/test/resources/project/maven/kotlin-java7-pom.xml.gen b/initializr-generator/src/test/resources/project/kotlin/previous/pom.xml.gen similarity index 94% rename from initializr-generator/src/test/resources/project/maven/kotlin-java7-pom.xml.gen rename to initializr-generator/src/test/resources/project/kotlin/previous/pom.xml.gen index 0ac31789..879a870d 100644 --- a/initializr-generator/src/test/resources/project/maven/kotlin-java7-pom.xml.gen +++ b/initializr-generator/src/test/resources/project/kotlin/previous/pom.xml.gen @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 1.2.3.RELEASE + 1.5.18.RELEASE UTF-8 UTF-8 - 1.7 + 1.8 1.1.1 @@ -32,7 +32,7 @@ org.jetbrains.kotlin - kotlin-stdlib-jdk7 + kotlin-stdlib-jdk8 ${kotlin.version} @@ -67,6 +67,7 @@ spring + 1.8 diff --git a/initializr-generator/src/test/resources/project/kotlin/spring-boot-1.4/DemoApplicationTests.kt.gen b/initializr-generator/src/test/resources/project/kotlin/spring-boot-1.4/DemoApplicationTests.kt.gen deleted file mode 100644 index 50e7fbe2..00000000 --- a/initializr-generator/src/test/resources/project/kotlin/spring-boot-1.4/DemoApplicationTests.kt.gen +++ /dev/null @@ -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() { - } - -} diff --git a/initializr-generator/src/test/resources/project/kotlin/spring-boot-2.0/DemoApplication.kt.gen b/initializr-generator/src/test/resources/project/kotlin/spring-boot-2.0/DemoApplication.kt.gen deleted file mode 100644 index 9595baaf..00000000 --- a/initializr-generator/src/test/resources/project/kotlin/spring-boot-2.0/DemoApplication.kt.gen +++ /dev/null @@ -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) { - runApplication(*args) -} diff --git a/initializr-generator/src/test/resources/project/kotlin/spring-boot-2.0/ServletInitializer.kt.gen b/initializr-generator/src/test/resources/project/kotlin/spring-boot-2.0/ServletInitializer.kt.gen deleted file mode 100644 index aa993203..00000000 --- a/initializr-generator/src/test/resources/project/kotlin/spring-boot-2.0/ServletInitializer.kt.gen +++ /dev/null @@ -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) - } - -} diff --git a/initializr-generator/src/test/resources/project/kotlin/standard/DemoApplication.kt.gen b/initializr-generator/src/test/resources/project/kotlin/standard/DemoApplication.kt.gen index 8100bf90..9595baaf 100644 --- a/initializr-generator/src/test/resources/project/kotlin/standard/DemoApplication.kt.gen +++ b/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) { - SpringApplication.run(DemoApplication::class.java, *args) + runApplication(*args) } diff --git a/initializr-generator/src/test/resources/project/kotlin/standard/DemoApplicationTests.kt.gen b/initializr-generator/src/test/resources/project/kotlin/standard/DemoApplicationTests.kt.gen index d03543e9..50e7fbe2 100644 --- a/initializr-generator/src/test/resources/project/kotlin/standard/DemoApplicationTests.kt.gen +++ b/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.test.context.junit4.SpringJUnit4ClassRunner +import org.springframework.boot.test.context.SpringBootTest +import org.springframework.test.context.junit4.SpringRunner -@RunWith(SpringJUnit4ClassRunner::class) -@SpringApplicationConfiguration(classes = arrayOf(DemoApplication::class)) +@RunWith(SpringRunner::class) +@SpringBootTest class DemoApplicationTests { @Test diff --git a/initializr-generator/src/test/resources/project/kotlin/standard/DemoApplicationTestsWeb.kt.gen b/initializr-generator/src/test/resources/project/kotlin/standard/DemoApplicationTestsWeb.kt.gen index 88fa02ac..50e7fbe2 100644 --- a/initializr-generator/src/test/resources/project/kotlin/standard/DemoApplicationTestsWeb.kt.gen +++ b/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.test.context.junit4.SpringJUnit4ClassRunner -import org.springframework.test.context.web.WebAppConfiguration +import org.springframework.boot.test.context.SpringBootTest +import org.springframework.test.context.junit4.SpringRunner -@RunWith(SpringJUnit4ClassRunner::class) -@SpringApplicationConfiguration(classes = arrayOf(DemoApplication::class)) -@WebAppConfiguration +@RunWith(SpringRunner::class) +@SpringBootTest class DemoApplicationTests { @Test diff --git a/initializr-generator/src/test/resources/project/kotlin/standard/ServletInitializer.kt.gen b/initializr-generator/src/test/resources/project/kotlin/standard/ServletInitializer.kt.gen index d6aa2a5d..aa993203 100644 --- a/initializr-generator/src/test/resources/project/kotlin/standard/ServletInitializer.kt.gen +++ b/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() { diff --git a/initializr-generator/src/test/resources/project/kotlin/standard/build.gradle.gen b/initializr-generator/src/test/resources/project/kotlin/standard/build.gradle.gen index 920b1228..00f96f53 100644 --- a/initializr-generator/src/test/resources/project/kotlin/standard/build.gradle.gen +++ b/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-reflect:${kotlinVersion}") + implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") + implementation("org.jetbrains.kotlin:kotlin-reflect") testImplementation('org.springframework.boot:spring-boot-starter-test') } diff --git a/initializr-generator/src/test/resources/project/kotlin/standard/pom.xml.gen b/initializr-generator/src/test/resources/project/kotlin/standard/pom.xml.gen index d0d644cb..04c9f11a 100644 --- a/initializr-generator/src/test/resources/project/kotlin/standard/pom.xml.gen +++ b/initializr-generator/src/test/resources/project/kotlin/standard/pom.xml.gen @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.2.3.RELEASE + 2.1.1.RELEASE @@ -33,12 +33,10 @@ org.jetbrains.kotlin kotlin-stdlib-jdk8 - ${kotlin.version} org.jetbrains.kotlin kotlin-reflect - ${kotlin.version} @@ -59,7 +57,6 @@ kotlin-maven-plugin org.jetbrains.kotlin - ${kotlin.version} -Xjsr305=strict @@ -67,24 +64,7 @@ spring - 1.8 - - - compile - compile - - compile - - - - test-compile - test-compile - - test-compile - - - org.jetbrains.kotlin diff --git a/initializr-generator/src/test/resources/project/kotlin/war/build.gradle.gen b/initializr-generator/src/test/resources/project/kotlin/standard/war-build.gradle.gen similarity index 78% rename from initializr-generator/src/test/resources/project/kotlin/war/build.gradle.gen rename to initializr-generator/src/test/resources/project/kotlin/standard/war-build.gradle.gen index fcc3c8e9..33712de3 100644 --- a/initializr-generator/src/test/resources/project/kotlin/war/build.gradle.gen +++ b/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-reflect:${kotlinVersion}") + implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") + implementation("org.jetbrains.kotlin:kotlin-reflect") providedRuntime('org.springframework.boot:spring-boot-starter-tomcat') testImplementation('org.springframework.boot:spring-boot-starter-test') } diff --git a/initializr-generator/src/test/resources/project/kotlin/war/pom.xml.gen b/initializr-generator/src/test/resources/project/kotlin/standard/war-pom.xml.gen similarity index 82% rename from initializr-generator/src/test/resources/project/kotlin/war/pom.xml.gen rename to initializr-generator/src/test/resources/project/kotlin/standard/war-pom.xml.gen index 0ae5aaa2..cd8de2ba 100644 --- a/initializr-generator/src/test/resources/project/kotlin/war/pom.xml.gen +++ b/initializr-generator/src/test/resources/project/kotlin/standard/war-pom.xml.gen @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.2.3.RELEASE + 2.1.1.RELEASE @@ -33,12 +33,10 @@ org.jetbrains.kotlin kotlin-stdlib-jdk8 - ${kotlin.version} org.jetbrains.kotlin kotlin-reflect - ${kotlin.version} @@ -64,7 +62,6 @@ kotlin-maven-plugin org.jetbrains.kotlin - ${kotlin.version} -Xjsr305=strict @@ -72,24 +69,7 @@ spring - 1.8 - - - compile - compile - - compile - - - - test-compile - test-compile - - test-compile - - - org.jetbrains.kotlin diff --git a/initializr-generator/src/test/resources/project/maven/annotation-processor-dependency-pom.xml.gen b/initializr-generator/src/test/resources/project/maven/annotation-processor-dependency-pom.xml.gen index 2e59098d..369d1904 100644 --- a/initializr-generator/src/test/resources/project/maven/annotation-processor-dependency-pom.xml.gen +++ b/initializr-generator/src/test/resources/project/maven/annotation-processor-dependency-pom.xml.gen @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.2.3.RELEASE + 2.1.1.RELEASE diff --git a/initializr-generator/src/test/resources/project/maven/bom-ordering-pom.xml.gen b/initializr-generator/src/test/resources/project/maven/bom-ordering-pom.xml.gen index b61236c4..6cc597d6 100644 --- a/initializr-generator/src/test/resources/project/maven/bom-ordering-pom.xml.gen +++ b/initializr-generator/src/test/resources/project/maven/bom-ordering-pom.xml.gen @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.2.3.RELEASE + 2.1.1.RELEASE diff --git a/initializr-generator/src/test/resources/project/maven/bom-property-pom.xml.gen b/initializr-generator/src/test/resources/project/maven/bom-property-pom.xml.gen index c113fc98..c5476f66 100644 --- a/initializr-generator/src/test/resources/project/maven/bom-property-pom.xml.gen +++ b/initializr-generator/src/test/resources/project/maven/bom-property-pom.xml.gen @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.2.3.RELEASE + 2.1.1.RELEASE diff --git a/initializr-generator/src/test/resources/project/maven/compile-only-dependency-pom.xml.gen b/initializr-generator/src/test/resources/project/maven/compile-only-dependency-pom.xml.gen index d719b898..5b9194c5 100644 --- a/initializr-generator/src/test/resources/project/maven/compile-only-dependency-pom.xml.gen +++ b/initializr-generator/src/test/resources/project/maven/compile-only-dependency-pom.xml.gen @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.2.3.RELEASE + 2.1.1.RELEASE diff --git a/initializr-generator/src/test/resources/project/maven/kotlin-java6-pom.xml.gen b/initializr-generator/src/test/resources/project/maven/kotlin-java11-pom.xml.gen similarity index 79% rename from initializr-generator/src/test/resources/project/maven/kotlin-java6-pom.xml.gen rename to initializr-generator/src/test/resources/project/maven/kotlin-java11-pom.xml.gen index c36f350a..6a336403 100644 --- a/initializr-generator/src/test/resources/project/maven/kotlin-java6-pom.xml.gen +++ b/initializr-generator/src/test/resources/project/maven/kotlin-java11-pom.xml.gen @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 1.2.3.RELEASE + 2.1.1.RELEASE UTF-8 UTF-8 - 1.6 + 11 1.1.1 @@ -32,13 +32,11 @@ org.jetbrains.kotlin - kotlin-stdlib - ${kotlin.version} + kotlin-stdlib-jdk8 org.jetbrains.kotlin kotlin-reflect - ${kotlin.version} @@ -59,7 +57,6 @@ kotlin-maven-plugin org.jetbrains.kotlin - ${kotlin.version} -Xjsr305=strict @@ -68,22 +65,6 @@ spring - - - compile - compile - - compile - - - - test-compile - test-compile - - test-compile - - - org.jetbrains.kotlin diff --git a/initializr-generator/src/test/resources/project/maven/kotlin-java9-pom.xml.gen b/initializr-generator/src/test/resources/project/maven/kotlin-java9-pom.xml.gen deleted file mode 100644 index 144136d2..00000000 --- a/initializr-generator/src/test/resources/project/maven/kotlin-java9-pom.xml.gen +++ /dev/null @@ -1,118 +0,0 @@ - - - 4.0.0 - - com.example - demo - 0.0.1-SNAPSHOT - jar - - demo - Demo project for Spring Boot - - - org.springframework.boot - spring-boot-starter-parent - 2.0.0.M6 - - - - - UTF-8 - UTF-8 - 9 - 1.1.1 - - - - - org.springframework.boot - spring-boot-starter - - - org.jetbrains.kotlin - kotlin-stdlib-jdk8 - - - org.jetbrains.kotlin - kotlin-reflect - - - - org.springframework.boot - spring-boot-starter-test - test - - - - - ${project.basedir}/src/main/kotlin - ${project.basedir}/src/test/kotlin - - - org.springframework.boot - spring-boot-maven-plugin - - - kotlin-maven-plugin - org.jetbrains.kotlin - - - -Xjsr305=strict - - - spring - - - - - org.jetbrains.kotlin - kotlin-maven-allopen - ${kotlin.version} - - - - - - - - - spring-snapshots - Spring Snapshots - https://repo.spring.io/snapshot - - true - - - - spring-milestones - Spring Milestones - https://repo.spring.io/milestone - - false - - - - - - - spring-snapshots - Spring Snapshots - https://repo.spring.io/snapshot - - true - - - - spring-milestones - Spring Milestones - https://repo.spring.io/milestone - - false - - - - - - diff --git a/initializr-generator/src/test/resources/project/maven/kotlin-springboot2-legacy-pom.xml.gen b/initializr-generator/src/test/resources/project/maven/kotlin-springboot2-legacy-pom.xml.gen deleted file mode 100644 index 221687e4..00000000 --- a/initializr-generator/src/test/resources/project/maven/kotlin-springboot2-legacy-pom.xml.gen +++ /dev/null @@ -1,138 +0,0 @@ - - - 4.0.0 - - com.example - demo - 0.0.1-SNAPSHOT - jar - - demo - Demo project for Spring Boot - - - org.springframework.boot - spring-boot-starter-parent - 2.0.0.M5 - - - - - UTF-8 - UTF-8 - 1.8 - 1.1.1 - - - - - org.springframework.boot - spring-boot-starter - - - org.jetbrains.kotlin - kotlin-stdlib-jdk8 - ${kotlin.version} - - - org.jetbrains.kotlin - kotlin-reflect - ${kotlin.version} - - - - org.springframework.boot - spring-boot-starter-test - test - - - - - ${project.basedir}/src/main/kotlin - ${project.basedir}/src/test/kotlin - - - org.springframework.boot - spring-boot-maven-plugin - - - kotlin-maven-plugin - org.jetbrains.kotlin - ${kotlin.version} - - - -Xjsr305=strict - - - spring - - 1.8 - - - - compile - compile - - compile - - - - test-compile - test-compile - - test-compile - - - - - - org.jetbrains.kotlin - kotlin-maven-allopen - ${kotlin.version} - - - - - - - - - spring-snapshots - Spring Snapshots - https://repo.spring.io/snapshot - - true - - - - spring-milestones - Spring Milestones - https://repo.spring.io/milestone - - false - - - - - - - spring-snapshots - Spring Snapshots - https://repo.spring.io/snapshot - - true - - - - spring-milestones - Spring Milestones - https://repo.spring.io/milestone - - false - - - - - - diff --git a/initializr-generator/src/test/resources/project/maven/kotlin-springboot2-pom.xml.gen b/initializr-generator/src/test/resources/project/maven/kotlin-springboot2-pom.xml.gen deleted file mode 100644 index 0af8560a..00000000 --- a/initializr-generator/src/test/resources/project/maven/kotlin-springboot2-pom.xml.gen +++ /dev/null @@ -1,118 +0,0 @@ - - - 4.0.0 - - com.example - demo - 0.0.1-SNAPSHOT - jar - - demo - Demo project for Spring Boot - - - org.springframework.boot - spring-boot-starter-parent - 2.0.0.M6 - - - - - UTF-8 - UTF-8 - 1.8 - 1.1.1 - - - - - org.springframework.boot - spring-boot-starter - - - org.jetbrains.kotlin - kotlin-stdlib-jdk8 - - - org.jetbrains.kotlin - kotlin-reflect - - - - org.springframework.boot - spring-boot-starter-test - test - - - - - ${project.basedir}/src/main/kotlin - ${project.basedir}/src/test/kotlin - - - org.springframework.boot - spring-boot-maven-plugin - - - kotlin-maven-plugin - org.jetbrains.kotlin - - - -Xjsr305=strict - - - spring - - - - - org.jetbrains.kotlin - kotlin-maven-allopen - ${kotlin.version} - - - - - - - - - spring-snapshots - Spring Snapshots - https://repo.spring.io/snapshot - - true - - - - spring-milestones - Spring Milestones - https://repo.spring.io/milestone - - false - - - - - - - spring-snapshots - Spring Snapshots - https://repo.spring.io/snapshot - - true - - - - spring-milestones - Spring Milestones - https://repo.spring.io/milestone - - false - - - - - - diff --git a/initializr-generator/src/test/resources/project/maven/version-override-pom.xml.gen b/initializr-generator/src/test/resources/project/maven/version-override-pom.xml.gen index ff3d2efd..ed5c98d9 100644 --- a/initializr-generator/src/test/resources/project/maven/version-override-pom.xml.gen +++ b/initializr-generator/src/test/resources/project/maven/version-override-pom.xml.gen @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.2.3.RELEASE + 2.1.1.RELEASE