From 59935b81752be6f6380557cae064a59f78a7b321 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 11 Nov 2022 08:21:21 +0100 Subject: [PATCH] Make sure that core Gradle plugins are applied first Closes gh-1343 --- .../spring/build/BuildCustomizer.java | 39 ++++++++++++++++++- .../GradleProjectGenerationConfiguration.java | 16 +++++++- .../groovy/GroovyGradleBuildCustomizer.java | 34 ---------------- ...ationDefaultContributorsConfiguration.java | 15 ------- ...tsProjectGenerationConfigurationTests.java | 2 +- ...leProjectGenerationConfigurationTests.java | 12 +++++- .../GroovyGradleBuildCustomizerTests.java | 39 ------------------- ...tion-processor-dependency-build.gradle.gen | 2 +- ...-processor-dependency-build.gradle.kts.gen | 2 +- .../gradle/bom-ordering-build.gradle.gen | 2 +- .../gradle/bom-ordering-build.gradle.kts.gen | 2 +- .../gradle/bom-property-build.gradle.gen | 2 +- .../gradle/bom-property-build.gradle.kts.gen | 2 +- .../compile-only-dependency-build.gradle.gen | 2 +- ...mpile-only-dependency-build.gradle.kts.gen | 2 +- .../gradle/repositories-build.gradle.gen | 2 +- .../gradle/repositories-build.gradle.kts.gen | 2 +- .../repositories-milestone-build.gradle.gen | 2 +- ...epositories-milestone-build.gradle.kts.gen | 2 +- .../gradle/version-override-build.gradle.gen | 2 +- .../version-override-build.gradle.kts.gen | 2 +- .../project/groovy/next/build.gradle.gen | 2 +- .../project/groovy/next/build.gradle.kts.gen | 2 +- .../project/groovy/standard/build.gradle.gen | 2 +- .../groovy/standard/build.gradle.kts.gen | 2 +- .../groovy/standard/war-build.gradle.gen | 4 +- .../groovy/standard/war-build.gradle.kts.gen | 4 +- .../project/java/standard/build.gradle.gen | 2 +- .../java/standard/build.gradle.kts.gen | 2 +- .../java/standard/war-build.gradle.gen | 4 +- .../java/standard/war-build.gradle.kts.gen | 4 +- .../kotlin/standard/war-build.gradle.gen | 2 +- .../kotlin/standard/war-build.gradle.kts.gen | 2 +- 33 files changed, 94 insertions(+), 123 deletions(-) delete mode 100644 initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/code/groovy/GroovyGradleBuildCustomizer.java delete mode 100644 initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/groovy/GroovyGradleBuildCustomizerTests.java diff --git a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/BuildCustomizer.java b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/BuildCustomizer.java index 797c248f..ba67cb9c 100644 --- a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/BuildCustomizer.java +++ b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/BuildCustomizer.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2019 the original author or authors. + * Copyright 2012-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,6 +16,8 @@ package io.spring.initializr.generator.spring.build; +import java.util.function.Consumer; + import io.spring.initializr.generator.buildsystem.Build; import org.springframework.core.Ordered; @@ -38,4 +40,39 @@ public interface BuildCustomizer extends Ordered { return 0; } + /** + * Create a {@link BuildCustomizer} that is ordered with the specified {@code order} + * value. + * @param order the order of the customizer + * @param customizer the customizer + * @param the type of the build + * @return a {@link BuildCustomizer} with the specified order + */ + static BuildCustomizer ordered(int order, Consumer customizer) { + return new OrderedBuildCustomizer<>(order, customizer); + } + + class OrderedBuildCustomizer implements BuildCustomizer { + + private final int order; + + private final Consumer customizer; + + public OrderedBuildCustomizer(int order, Consumer customizer) { + this.order = order; + this.customizer = customizer; + } + + @Override + public void customize(B build) { + this.customizer.accept(build); + } + + @Override + public int getOrder() { + return this.order; + } + + } + } diff --git a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/gradle/GradleProjectGenerationConfiguration.java b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/gradle/GradleProjectGenerationConfiguration.java index 7788255c..2a0cd8e8 100644 --- a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/gradle/GradleProjectGenerationConfiguration.java +++ b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/gradle/GradleProjectGenerationConfiguration.java @@ -31,6 +31,7 @@ import io.spring.initializr.generator.condition.ConditionalOnLanguage; import io.spring.initializr.generator.condition.ConditionalOnPackaging; import io.spring.initializr.generator.condition.ConditionalOnPlatformVersion; import io.spring.initializr.generator.io.IndentingWriterFactory; +import io.spring.initializr.generator.language.groovy.GroovyLanguage; import io.spring.initializr.generator.language.java.JavaLanguage; import io.spring.initializr.generator.packaging.war.WarPackaging; import io.spring.initializr.generator.project.ProjectDescription; @@ -42,6 +43,7 @@ import io.spring.initializr.metadata.InitializrMetadata; import org.springframework.beans.factory.ObjectProvider; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.core.Ordered; /** * Configuration for contributions specific to the generation of a project that will use @@ -54,6 +56,10 @@ import org.springframework.context.annotation.Configuration; @ConditionalOnBuildSystem(GradleBuildSystem.ID) public class GradleProjectGenerationConfiguration { + private static final int LANGUAGE_PLUGINS_ORDER = Ordered.HIGHEST_PRECEDENCE + 5; + + private static final int PACKAGING_PLUGINS_ORDER = Ordered.HIGHEST_PRECEDENCE + 10; + private static final int TEST_ORDER = 100; private final IndentingWriterFactory indentingWriterFactory; @@ -91,13 +97,19 @@ public class GradleProjectGenerationConfiguration { @Bean @ConditionalOnLanguage(JavaLanguage.ID) public BuildCustomizer javaPluginContributor() { - return (build) -> build.plugins().add("java"); + return BuildCustomizer.ordered(LANGUAGE_PLUGINS_ORDER, (build) -> build.plugins().add("java")); + } + + @Bean + @ConditionalOnLanguage(GroovyLanguage.ID) + public BuildCustomizer groovyPluginContributor() { + return BuildCustomizer.ordered(LANGUAGE_PLUGINS_ORDER, (build) -> build.plugins().add("groovy")); } @Bean @ConditionalOnPackaging(WarPackaging.ID) public BuildCustomizer warPluginContributor() { - return (build) -> build.plugins().add("war"); + return BuildCustomizer.ordered(PACKAGING_PLUGINS_ORDER, (build) -> build.plugins().add("war")); } @Bean diff --git a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/code/groovy/GroovyGradleBuildCustomizer.java b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/code/groovy/GroovyGradleBuildCustomizer.java deleted file mode 100644 index e0c063fc..00000000 --- a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/code/groovy/GroovyGradleBuildCustomizer.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright 2012-2019 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package io.spring.initializr.generator.spring.code.groovy; - -import io.spring.initializr.generator.buildsystem.gradle.GradleBuild; -import io.spring.initializr.generator.spring.build.BuildCustomizer; - -/** - * {@link BuildCustomizer} for Groovy projects build with Gradle. - * - * @author Stephane Nicoll - */ -class GroovyGradleBuildCustomizer implements BuildCustomizer { - - @Override - public void customize(GradleBuild build) { - build.plugins().add("groovy"); - } - -} diff --git a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/code/groovy/GroovyProjectGenerationDefaultContributorsConfiguration.java b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/code/groovy/GroovyProjectGenerationDefaultContributorsConfiguration.java index ec9ba40b..326ef4b2 100644 --- a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/code/groovy/GroovyProjectGenerationDefaultContributorsConfiguration.java +++ b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/code/groovy/GroovyProjectGenerationDefaultContributorsConfiguration.java @@ -19,7 +19,6 @@ package io.spring.initializr.generator.spring.code.groovy; import java.lang.reflect.Modifier; import io.spring.initializr.generator.buildsystem.Build; -import io.spring.initializr.generator.buildsystem.gradle.GradleBuildSystem; import io.spring.initializr.generator.buildsystem.maven.MavenBuildSystem; import io.spring.initializr.generator.condition.ConditionalOnBuildSystem; import io.spring.initializr.generator.condition.ConditionalOnPackaging; @@ -116,18 +115,4 @@ class GroovyProjectGenerationDefaultContributorsConfiguration { } - /** - * Configuration for Groovy projects built with Gradle. - */ - @Configuration - @ConditionalOnBuildSystem(GradleBuildSystem.ID) - static class GroovyGradleProjectConfiguration { - - @Bean - GroovyGradleBuildCustomizer groovyBuildCustomizer() { - return new GroovyGradleBuildCustomizer(); - } - - } - } diff --git a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/gradle/GradleKtsProjectGenerationConfigurationTests.java b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/gradle/GradleKtsProjectGenerationConfigurationTests.java index fc7a8179..d0f6720b 100644 --- a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/gradle/GradleKtsProjectGenerationConfigurationTests.java +++ b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/gradle/GradleKtsProjectGenerationConfigurationTests.java @@ -113,9 +113,9 @@ class GradleKtsProjectGenerationConfigurationTests { assertThat(project).textFile("build.gradle.kts") .containsExactly(// @formatter:off "plugins {", + " java", " id(\"org.springframework.boot\") version \"2.4.0\"", " id(\"io.spring.dependency-management\") version \"1.0.6.RELEASE\"", - " java", "}", "", "group = \"com.example\"", diff --git a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/gradle/GradleProjectGenerationConfigurationTests.java b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/gradle/GradleProjectGenerationConfigurationTests.java index 368c3ffb..ced1a7b9 100644 --- a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/gradle/GradleProjectGenerationConfigurationTests.java +++ b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/gradle/GradleProjectGenerationConfigurationTests.java @@ -24,6 +24,7 @@ import io.spring.initializr.generator.buildsystem.Dependency; import io.spring.initializr.generator.buildsystem.DependencyScope; import io.spring.initializr.generator.buildsystem.gradle.GradleBuildSystem; import io.spring.initializr.generator.buildsystem.gradle.GroovyDslGradleBuildWriter; +import io.spring.initializr.generator.language.groovy.GroovyLanguage; import io.spring.initializr.generator.language.java.JavaLanguage; import io.spring.initializr.generator.packaging.war.WarPackaging; import io.spring.initializr.generator.project.MutableProjectDescription; @@ -110,9 +111,9 @@ class GradleProjectGenerationConfigurationTests { assertThat(project).textFile("build.gradle").containsExactly( // @formatter:off "plugins {", + " id 'java'", " id 'org.springframework.boot' version '2.4.0'", " id 'io.spring.dependency-management' version '1.0.6.RELEASE'", - " id 'java'", "}", "", "group = 'com.example'", @@ -134,6 +135,15 @@ class GradleProjectGenerationConfigurationTests { "}"); // @formatter:on } + @Test + void groovyPluginIsAppliedWhenBuildingProjectThatUsesGroovyLanguage() { + MutableProjectDescription description = new MutableProjectDescription(); + description.setPlatformVersion(Version.parse("2.4.0.RELEASE")); + description.setLanguage(new GroovyLanguage()); + ProjectStructure project = this.projectTester.generate(description); + assertThat(project).textFile("build.gradle").lines().containsOnlyOnce(" id 'groovy'"); + } + @Test void warPluginIsAppliedWhenBuildingProjectThatUsesWarPackaging() { MutableProjectDescription description = new MutableProjectDescription(); diff --git a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/groovy/GroovyGradleBuildCustomizerTests.java b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/groovy/GroovyGradleBuildCustomizerTests.java deleted file mode 100644 index ca60d7d2..00000000 --- a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/groovy/GroovyGradleBuildCustomizerTests.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright 2012-2020 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package io.spring.initializr.generator.spring.code.groovy; - -import io.spring.initializr.generator.buildsystem.gradle.GradleBuild; -import org.junit.jupiter.api.Test; - -import static org.assertj.core.api.Assertions.assertThat; - -/** - * Tests for {@link GroovyGradleBuildCustomizer}. - * - * @author Stephane Nicoll - */ -class GroovyGradleBuildCustomizerTests { - - @Test - void groovyPluginIsConfigured() { - GradleBuild build = new GradleBuild(); - new GroovyGradleBuildCustomizer().customize(build); - assertThat(build.plugins().values()).singleElement() - .satisfies((plugin) -> assertThat(plugin.getId()).isEqualTo("groovy")); - } - -} diff --git a/initializr-generator-spring/src/test/resources/project/gradle/annotation-processor-dependency-build.gradle.gen b/initializr-generator-spring/src/test/resources/project/gradle/annotation-processor-dependency-build.gradle.gen index 930dcea3..f348fa12 100644 --- a/initializr-generator-spring/src/test/resources/project/gradle/annotation-processor-dependency-build.gradle.gen +++ b/initializr-generator-spring/src/test/resources/project/gradle/annotation-processor-dependency-build.gradle.gen @@ -1,7 +1,7 @@ plugins { + id 'java' id 'org.springframework.boot' version '2.4.1' id 'io.spring.dependency-management' version '1.0.6.RELEASE' - id 'java' } group = 'com.example' diff --git a/initializr-generator-spring/src/test/resources/project/gradle/annotation-processor-dependency-build.gradle.kts.gen b/initializr-generator-spring/src/test/resources/project/gradle/annotation-processor-dependency-build.gradle.kts.gen index 0382e01a..703b8ab8 100644 --- a/initializr-generator-spring/src/test/resources/project/gradle/annotation-processor-dependency-build.gradle.kts.gen +++ b/initializr-generator-spring/src/test/resources/project/gradle/annotation-processor-dependency-build.gradle.kts.gen @@ -1,7 +1,7 @@ plugins { + java id("org.springframework.boot") version "2.4.1" id("io.spring.dependency-management") version "1.0.6.RELEASE" - java } group = "com.example" diff --git a/initializr-generator-spring/src/test/resources/project/gradle/bom-ordering-build.gradle.gen b/initializr-generator-spring/src/test/resources/project/gradle/bom-ordering-build.gradle.gen index 378d482a..52fb817c 100644 --- a/initializr-generator-spring/src/test/resources/project/gradle/bom-ordering-build.gradle.gen +++ b/initializr-generator-spring/src/test/resources/project/gradle/bom-ordering-build.gradle.gen @@ -1,7 +1,7 @@ plugins { + id 'java' id 'org.springframework.boot' version '2.4.1' id 'io.spring.dependency-management' version '1.0.6.RELEASE' - id 'java' } group = 'com.example' diff --git a/initializr-generator-spring/src/test/resources/project/gradle/bom-ordering-build.gradle.kts.gen b/initializr-generator-spring/src/test/resources/project/gradle/bom-ordering-build.gradle.kts.gen index 2d2fe50a..1f64ec9c 100644 --- a/initializr-generator-spring/src/test/resources/project/gradle/bom-ordering-build.gradle.kts.gen +++ b/initializr-generator-spring/src/test/resources/project/gradle/bom-ordering-build.gradle.kts.gen @@ -1,7 +1,7 @@ plugins { + java id("org.springframework.boot") version "2.4.1" id("io.spring.dependency-management") version "1.0.6.RELEASE" - java } group = "com.example" diff --git a/initializr-generator-spring/src/test/resources/project/gradle/bom-property-build.gradle.gen b/initializr-generator-spring/src/test/resources/project/gradle/bom-property-build.gradle.gen index 25d0be1d..ca9b137b 100644 --- a/initializr-generator-spring/src/test/resources/project/gradle/bom-property-build.gradle.gen +++ b/initializr-generator-spring/src/test/resources/project/gradle/bom-property-build.gradle.gen @@ -1,7 +1,7 @@ plugins { + id 'java' id 'org.springframework.boot' version '2.4.1' id 'io.spring.dependency-management' version '1.0.6.RELEASE' - id 'java' } group = 'com.example' diff --git a/initializr-generator-spring/src/test/resources/project/gradle/bom-property-build.gradle.kts.gen b/initializr-generator-spring/src/test/resources/project/gradle/bom-property-build.gradle.kts.gen index f0b93403..78de4599 100644 --- a/initializr-generator-spring/src/test/resources/project/gradle/bom-property-build.gradle.kts.gen +++ b/initializr-generator-spring/src/test/resources/project/gradle/bom-property-build.gradle.kts.gen @@ -1,7 +1,7 @@ plugins { + java id("org.springframework.boot") version "2.4.1" id("io.spring.dependency-management") version "1.0.6.RELEASE" - java } group = "com.example" diff --git a/initializr-generator-spring/src/test/resources/project/gradle/compile-only-dependency-build.gradle.gen b/initializr-generator-spring/src/test/resources/project/gradle/compile-only-dependency-build.gradle.gen index 3f0b8d04..39772f55 100644 --- a/initializr-generator-spring/src/test/resources/project/gradle/compile-only-dependency-build.gradle.gen +++ b/initializr-generator-spring/src/test/resources/project/gradle/compile-only-dependency-build.gradle.gen @@ -1,7 +1,7 @@ plugins { + id 'java' id 'org.springframework.boot' version '2.4.1' id 'io.spring.dependency-management' version '1.0.6.RELEASE' - id 'java' } group = 'com.example' diff --git a/initializr-generator-spring/src/test/resources/project/gradle/compile-only-dependency-build.gradle.kts.gen b/initializr-generator-spring/src/test/resources/project/gradle/compile-only-dependency-build.gradle.kts.gen index 7f4e2678..cd1586d9 100644 --- a/initializr-generator-spring/src/test/resources/project/gradle/compile-only-dependency-build.gradle.kts.gen +++ b/initializr-generator-spring/src/test/resources/project/gradle/compile-only-dependency-build.gradle.kts.gen @@ -1,7 +1,7 @@ plugins { + java id("org.springframework.boot") version "2.4.1" id("io.spring.dependency-management") version "1.0.6.RELEASE" - java } group = "com.example" diff --git a/initializr-generator-spring/src/test/resources/project/gradle/repositories-build.gradle.gen b/initializr-generator-spring/src/test/resources/project/gradle/repositories-build.gradle.gen index 3f9828ea..44423279 100644 --- a/initializr-generator-spring/src/test/resources/project/gradle/repositories-build.gradle.gen +++ b/initializr-generator-spring/src/test/resources/project/gradle/repositories-build.gradle.gen @@ -1,7 +1,7 @@ plugins { + id 'java' id 'org.springframework.boot' version '2.4.1' id 'io.spring.dependency-management' version '1.0.6.RELEASE' - id 'java' } group = 'com.example' diff --git a/initializr-generator-spring/src/test/resources/project/gradle/repositories-build.gradle.kts.gen b/initializr-generator-spring/src/test/resources/project/gradle/repositories-build.gradle.kts.gen index ad376935..2c7a9573 100644 --- a/initializr-generator-spring/src/test/resources/project/gradle/repositories-build.gradle.kts.gen +++ b/initializr-generator-spring/src/test/resources/project/gradle/repositories-build.gradle.kts.gen @@ -1,7 +1,7 @@ plugins { + java id("org.springframework.boot") version "2.4.1" id("io.spring.dependency-management") version "1.0.6.RELEASE" - java } group = "com.example" diff --git a/initializr-generator-spring/src/test/resources/project/gradle/repositories-milestone-build.gradle.gen b/initializr-generator-spring/src/test/resources/project/gradle/repositories-milestone-build.gradle.gen index 4e1cd0d1..12fb53df 100644 --- a/initializr-generator-spring/src/test/resources/project/gradle/repositories-milestone-build.gradle.gen +++ b/initializr-generator-spring/src/test/resources/project/gradle/repositories-milestone-build.gradle.gen @@ -1,7 +1,7 @@ plugins { + id 'java' id 'org.springframework.boot' version '2.4.0-M1' id 'io.spring.dependency-management' version '1.0.6.RELEASE' - id 'java' } group = 'com.example' diff --git a/initializr-generator-spring/src/test/resources/project/gradle/repositories-milestone-build.gradle.kts.gen b/initializr-generator-spring/src/test/resources/project/gradle/repositories-milestone-build.gradle.kts.gen index 65a720ba..2c2e88c4 100644 --- a/initializr-generator-spring/src/test/resources/project/gradle/repositories-milestone-build.gradle.kts.gen +++ b/initializr-generator-spring/src/test/resources/project/gradle/repositories-milestone-build.gradle.kts.gen @@ -1,7 +1,7 @@ plugins { + java id("org.springframework.boot") version "2.4.0-M1" id("io.spring.dependency-management") version "1.0.6.RELEASE" - java } group = "com.example" diff --git a/initializr-generator-spring/src/test/resources/project/gradle/version-override-build.gradle.gen b/initializr-generator-spring/src/test/resources/project/gradle/version-override-build.gradle.gen index 3bba6fcb..797c0ab8 100644 --- a/initializr-generator-spring/src/test/resources/project/gradle/version-override-build.gradle.gen +++ b/initializr-generator-spring/src/test/resources/project/gradle/version-override-build.gradle.gen @@ -1,7 +1,7 @@ plugins { + id 'java' id 'org.springframework.boot' version '2.4.1' id 'io.spring.dependency-management' version '1.0.6.RELEASE' - id 'java' } group = 'com.example' diff --git a/initializr-generator-spring/src/test/resources/project/gradle/version-override-build.gradle.kts.gen b/initializr-generator-spring/src/test/resources/project/gradle/version-override-build.gradle.kts.gen index afc545bf..3f96b259 100644 --- a/initializr-generator-spring/src/test/resources/project/gradle/version-override-build.gradle.kts.gen +++ b/initializr-generator-spring/src/test/resources/project/gradle/version-override-build.gradle.kts.gen @@ -1,7 +1,7 @@ plugins { + java id("org.springframework.boot") version "2.4.1" id("io.spring.dependency-management") version "1.0.6.RELEASE" - java } group = "com.example" diff --git a/initializr-generator-spring/src/test/resources/project/groovy/next/build.gradle.gen b/initializr-generator-spring/src/test/resources/project/groovy/next/build.gradle.gen index 1da69a99..2cbad42c 100644 --- a/initializr-generator-spring/src/test/resources/project/groovy/next/build.gradle.gen +++ b/initializr-generator-spring/src/test/resources/project/groovy/next/build.gradle.gen @@ -1,7 +1,7 @@ plugins { + id 'groovy' id 'org.springframework.boot' version '3.0.0' id 'io.spring.dependency-management' version '1.0.6.RELEASE' - id 'groovy' } group = 'com.example' diff --git a/initializr-generator-spring/src/test/resources/project/groovy/next/build.gradle.kts.gen b/initializr-generator-spring/src/test/resources/project/groovy/next/build.gradle.kts.gen index b205eba3..c92ad510 100644 --- a/initializr-generator-spring/src/test/resources/project/groovy/next/build.gradle.kts.gen +++ b/initializr-generator-spring/src/test/resources/project/groovy/next/build.gradle.kts.gen @@ -1,7 +1,7 @@ plugins { + groovy id("org.springframework.boot") version "3.0.0" id("io.spring.dependency-management") version "1.0.6.RELEASE" - groovy } group = "com.example" diff --git a/initializr-generator-spring/src/test/resources/project/groovy/standard/build.gradle.gen b/initializr-generator-spring/src/test/resources/project/groovy/standard/build.gradle.gen index de4ceb8e..70b44f22 100644 --- a/initializr-generator-spring/src/test/resources/project/groovy/standard/build.gradle.gen +++ b/initializr-generator-spring/src/test/resources/project/groovy/standard/build.gradle.gen @@ -1,7 +1,7 @@ plugins { + id 'groovy' id 'org.springframework.boot' version '2.4.1' id 'io.spring.dependency-management' version '1.0.6.RELEASE' - id 'groovy' } group = 'com.example' diff --git a/initializr-generator-spring/src/test/resources/project/groovy/standard/build.gradle.kts.gen b/initializr-generator-spring/src/test/resources/project/groovy/standard/build.gradle.kts.gen index fd3ee4eb..c408c004 100644 --- a/initializr-generator-spring/src/test/resources/project/groovy/standard/build.gradle.kts.gen +++ b/initializr-generator-spring/src/test/resources/project/groovy/standard/build.gradle.kts.gen @@ -1,7 +1,7 @@ plugins { + groovy id("org.springframework.boot") version "2.4.1" id("io.spring.dependency-management") version "1.0.6.RELEASE" - groovy } group = "com.example" diff --git a/initializr-generator-spring/src/test/resources/project/groovy/standard/war-build.gradle.gen b/initializr-generator-spring/src/test/resources/project/groovy/standard/war-build.gradle.gen index aa3af28a..8996f233 100644 --- a/initializr-generator-spring/src/test/resources/project/groovy/standard/war-build.gradle.gen +++ b/initializr-generator-spring/src/test/resources/project/groovy/standard/war-build.gradle.gen @@ -1,8 +1,8 @@ plugins { + id 'groovy' + id 'war' id 'org.springframework.boot' version '2.4.1' id 'io.spring.dependency-management' version '1.0.6.RELEASE' - id 'war' - id 'groovy' } group = 'com.example' diff --git a/initializr-generator-spring/src/test/resources/project/groovy/standard/war-build.gradle.kts.gen b/initializr-generator-spring/src/test/resources/project/groovy/standard/war-build.gradle.kts.gen index 135215e8..ae0db278 100644 --- a/initializr-generator-spring/src/test/resources/project/groovy/standard/war-build.gradle.kts.gen +++ b/initializr-generator-spring/src/test/resources/project/groovy/standard/war-build.gradle.kts.gen @@ -1,8 +1,8 @@ plugins { + groovy + war id("org.springframework.boot") version "2.4.1" id("io.spring.dependency-management") version "1.0.6.RELEASE" - war - groovy } group = "com.example" diff --git a/initializr-generator-spring/src/test/resources/project/java/standard/build.gradle.gen b/initializr-generator-spring/src/test/resources/project/java/standard/build.gradle.gen index 6eecd854..09a48f63 100644 --- a/initializr-generator-spring/src/test/resources/project/java/standard/build.gradle.gen +++ b/initializr-generator-spring/src/test/resources/project/java/standard/build.gradle.gen @@ -1,7 +1,7 @@ plugins { + id 'java' id 'org.springframework.boot' version '2.4.1' id 'io.spring.dependency-management' version '1.0.6.RELEASE' - id 'java' } group = 'com.example' diff --git a/initializr-generator-spring/src/test/resources/project/java/standard/build.gradle.kts.gen b/initializr-generator-spring/src/test/resources/project/java/standard/build.gradle.kts.gen index e7cab753..164c2623 100644 --- a/initializr-generator-spring/src/test/resources/project/java/standard/build.gradle.kts.gen +++ b/initializr-generator-spring/src/test/resources/project/java/standard/build.gradle.kts.gen @@ -1,7 +1,7 @@ plugins { + java id("org.springframework.boot") version "2.4.1" id("io.spring.dependency-management") version "1.0.6.RELEASE" - java } group = "com.example" diff --git a/initializr-generator-spring/src/test/resources/project/java/standard/war-build.gradle.gen b/initializr-generator-spring/src/test/resources/project/java/standard/war-build.gradle.gen index 706341ea..cf6bb1b6 100644 --- a/initializr-generator-spring/src/test/resources/project/java/standard/war-build.gradle.gen +++ b/initializr-generator-spring/src/test/resources/project/java/standard/war-build.gradle.gen @@ -1,8 +1,8 @@ plugins { - id 'org.springframework.boot' version '2.4.1' - id 'io.spring.dependency-management' version '1.0.6.RELEASE' id 'java' id 'war' + id 'org.springframework.boot' version '2.4.1' + id 'io.spring.dependency-management' version '1.0.6.RELEASE' } group = 'com.example' diff --git a/initializr-generator-spring/src/test/resources/project/java/standard/war-build.gradle.kts.gen b/initializr-generator-spring/src/test/resources/project/java/standard/war-build.gradle.kts.gen index b943391b..1aca7305 100644 --- a/initializr-generator-spring/src/test/resources/project/java/standard/war-build.gradle.kts.gen +++ b/initializr-generator-spring/src/test/resources/project/java/standard/war-build.gradle.kts.gen @@ -1,8 +1,8 @@ plugins { - id("org.springframework.boot") version "2.4.1" - id("io.spring.dependency-management") version "1.0.6.RELEASE" java war + id("org.springframework.boot") version "2.4.1" + id("io.spring.dependency-management") version "1.0.6.RELEASE" } group = "com.example" diff --git a/initializr-generator-spring/src/test/resources/project/kotlin/standard/war-build.gradle.gen b/initializr-generator-spring/src/test/resources/project/kotlin/standard/war-build.gradle.gen index 86837fd3..f2552295 100644 --- a/initializr-generator-spring/src/test/resources/project/kotlin/standard/war-build.gradle.gen +++ b/initializr-generator-spring/src/test/resources/project/kotlin/standard/war-build.gradle.gen @@ -1,9 +1,9 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { + id 'war' id 'org.springframework.boot' version '2.4.1' id 'io.spring.dependency-management' version '1.0.6.RELEASE' - id 'war' id 'org.jetbrains.kotlin.jvm' version '1.1.1' id 'org.jetbrains.kotlin.plugin.spring' version '1.1.1' } diff --git a/initializr-generator-spring/src/test/resources/project/kotlin/standard/war-build.gradle.kts.gen b/initializr-generator-spring/src/test/resources/project/kotlin/standard/war-build.gradle.kts.gen index 91d93e6b..a7efd021 100644 --- a/initializr-generator-spring/src/test/resources/project/kotlin/standard/war-build.gradle.kts.gen +++ b/initializr-generator-spring/src/test/resources/project/kotlin/standard/war-build.gradle.kts.gen @@ -1,9 +1,9 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { + war id("org.springframework.boot") version "2.4.1" id("io.spring.dependency-management") version "1.0.6.RELEASE" - war kotlin("jvm") version "1.1.1" kotlin("plugin.spring") version "1.1.1" }