From dc69a352e9d15f8cf45c219efa160779d012b6b9 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 15 Sep 2017 13:12:11 +0200 Subject: [PATCH] Add group to generated gradle projects Closes gh-478 --- .../src/main/resources/templates/starter-build.gradle | 1 + .../spring/initializr/generator/ProjectGeneratorBuildTests.java | 2 +- .../test/resources/project/gradle/bom-ordering-build.gradle.gen | 1 + .../test/resources/project/gradle/bom-property-build.gradle.gen | 1 + .../project/gradle/compile-only-dependency-build.gradle.gen | 1 + .../test/resources/project/gradle/kotlin-java6-build.gradle.gen | 1 + .../test/resources/project/gradle/kotlin-java7-build.gradle.gen | 1 + .../resources/project/gradle/version-override-build.gradle.gen | 1 + .../src/test/resources/project/groovy/standard/build.gradle.gen | 1 + .../src/test/resources/project/groovy/war/build.gradle.gen | 1 + .../src/test/resources/project/java/standard/build.gradle.gen | 1 + .../src/test/resources/project/java/war/build.gradle.gen | 1 + .../src/test/resources/project/kotlin/standard/build.gradle.gen | 1 + .../src/test/resources/project/kotlin/war/build.gradle.gen | 1 + 14 files changed, 14 insertions(+), 1 deletion(-) diff --git a/initializr-generator/src/main/resources/templates/starter-build.gradle b/initializr-generator/src/main/resources/templates/starter-build.gradle index 62f21099..73602099 100644 --- a/initializr-generator/src/main/resources/templates/starter-build.gradle +++ b/initializr-generator/src/main/resources/templates/starter-build.gradle @@ -44,6 +44,7 @@ apply plugin: 'io.spring.dependency-management' apply plugin: 'war' {{/war}} +group = '{{groupId}}' version = '{{version}}' sourceCompatibility = {{javaVersion}}{{#kotlin}}{{#isJava8}} compileKotlin { 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 c8431ee9..9a4047bd 100644 --- a/initializr-generator/src/test/java/io/spring/initializr/generator/ProjectGeneratorBuildTests.java +++ b/initializr-generator/src/test/java/io/spring/initializr/generator/ProjectGeneratorBuildTests.java @@ -83,7 +83,7 @@ public class ProjectGeneratorBuildTests extends AbstractProjectGeneratorTests { @Test public void standardWarGroovy() { - testStandardWar("java"); + testStandardWar("groovy"); } @Test 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 00e39a99..c9322375 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 @@ -16,6 +16,7 @@ apply plugin: 'eclipse' apply plugin: 'spring-boot' apply plugin: 'io.spring.dependency-management' +group = 'com.example' version = '0.0.1-SNAPSHOT' sourceCompatibility = 1.8 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 74e1a542..e5f74aec 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 @@ -16,6 +16,7 @@ apply plugin: 'eclipse' apply plugin: 'spring-boot' apply plugin: 'io.spring.dependency-management' +group = 'com.example' version = '0.0.1-SNAPSHOT' sourceCompatibility = 1.8 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 530bfe54..6bc0d8de 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 @@ -16,6 +16,7 @@ apply plugin: 'eclipse' apply plugin: 'spring-boot' apply plugin: 'io.spring.dependency-management' +group = 'com.example' version = '0.0.1-SNAPSHOT' sourceCompatibility = 1.8 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 index 1370a39e..bf8534b3 100644 --- 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 @@ -20,6 +20,7 @@ apply plugin: 'eclipse' apply plugin: 'spring-boot' apply plugin: 'io.spring.dependency-management' +group = 'com.example' version = '0.0.1-SNAPSHOT' sourceCompatibility = 1.6 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 index ba96e009..cb17a3b1 100644 --- 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 @@ -20,6 +20,7 @@ apply plugin: 'eclipse' apply plugin: 'spring-boot' apply plugin: 'io.spring.dependency-management' +group = 'com.example' version = '0.0.1-SNAPSHOT' sourceCompatibility = 1.7 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 1929cdcd..5f0ca112 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 @@ -16,6 +16,7 @@ apply plugin: 'eclipse' apply plugin: 'spring-boot' apply plugin: 'io.spring.dependency-management' +group = 'com.example' version = '0.0.1-SNAPSHOT' sourceCompatibility = 1.8 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 29d5cef0..46b00095 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 @@ -16,6 +16,7 @@ apply plugin: 'eclipse' apply plugin: 'spring-boot' apply plugin: 'io.spring.dependency-management' +group = 'com.example' version = '0.0.1-SNAPSHOT' sourceCompatibility = 1.8 diff --git a/initializr-generator/src/test/resources/project/groovy/war/build.gradle.gen b/initializr-generator/src/test/resources/project/groovy/war/build.gradle.gen index ffaac661..47e468a4 100644 --- a/initializr-generator/src/test/resources/project/groovy/war/build.gradle.gen +++ b/initializr-generator/src/test/resources/project/groovy/war/build.gradle.gen @@ -17,6 +17,7 @@ apply plugin: 'spring-boot' apply plugin: 'io.spring.dependency-management' apply plugin: 'war' +group = 'com.example' version = '0.0.1-SNAPSHOT' sourceCompatibility = 1.8 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 770c8ac7..85900f91 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 @@ -16,6 +16,7 @@ apply plugin: 'eclipse' apply plugin: 'spring-boot' apply plugin: 'io.spring.dependency-management' +group = 'com.example' version = '0.0.1-SNAPSHOT' sourceCompatibility = 1.8 diff --git a/initializr-generator/src/test/resources/project/java/war/build.gradle.gen b/initializr-generator/src/test/resources/project/java/war/build.gradle.gen index 33bdac44..4740022b 100644 --- a/initializr-generator/src/test/resources/project/java/war/build.gradle.gen +++ b/initializr-generator/src/test/resources/project/java/war/build.gradle.gen @@ -17,6 +17,7 @@ apply plugin: 'spring-boot' apply plugin: 'io.spring.dependency-management' apply plugin: 'war' +group = 'com.example' version = '0.0.1-SNAPSHOT' sourceCompatibility = 1.8 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 3efc7fda..38882147 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 @@ -20,6 +20,7 @@ apply plugin: 'eclipse' apply plugin: 'spring-boot' apply plugin: 'io.spring.dependency-management' +group = 'com.example' version = '0.0.1-SNAPSHOT' sourceCompatibility = 1.8 compileKotlin { diff --git a/initializr-generator/src/test/resources/project/kotlin/war/build.gradle.gen b/initializr-generator/src/test/resources/project/kotlin/war/build.gradle.gen index 6acf2de6..790a35b4 100644 --- a/initializr-generator/src/test/resources/project/kotlin/war/build.gradle.gen +++ b/initializr-generator/src/test/resources/project/kotlin/war/build.gradle.gen @@ -21,6 +21,7 @@ apply plugin: 'spring-boot' apply plugin: 'io.spring.dependency-management' apply plugin: 'war' +group = 'com.example' version = '0.0.1-SNAPSHOT' sourceCompatibility = 1.8 compileKotlin {