Avoid overriding baseName for jar/war task

Closes gh-381

initializr-generator/src/main/resources/templates/starter-build.gradle

@@ -41,11 +41,7 @@ apply plugin: 'io.spring.dependency-management'
 apply plugin: 'war'
 {{/war}}
 
-{{#war}}war{{/war}}{{^war}}jar{{/war}} {
+version = '{{version}}'
-	baseName = '{{artifactId}}'
-	version = '{{version}}'
-}
-
 sourceCompatibility = {{javaVersion}}
 
 repositories {

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

@@ -168,8 +168,8 @@ public class ProjectGeneratorTests extends AbstractProjectGeneratorTests {
 		request.setType("gradle-project");
 		generateProject(request).isJavaWarProject().isGradleProject().gradleBuildAssert()
 				// This is tagged as web facet so it brings the web one
-				.contains("compile('org.foo:thymeleaf')").contains("war {")
+				.contains("apply plugin: 'war'")
-				.contains("compile('org.foo:thymeleaf')").contains("apply plugin: 'war'")
+				.contains("compile('org.foo:thymeleaf')")
 				.doesNotContain(
 						"compile('org.springframework.boot:spring-boot-starter-web')")
 				.contains(

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

@@ -38,8 +38,7 @@ public class GradleBuildAssert {
 	 * Validate that this generated gradle build validates against its request.
 	 */
 	public GradleBuildAssert validateProjectRequest(ProjectRequest request) {
-		return hasArtifactId(request.getArtifactId()).hasVersion(request.getVersion())
+		return hasVersion(request.getVersion()).hasBootVersion(request.getBootVersion())
-				.hasBootVersion(request.getBootVersion())
 				.hasJavaVersion(request.getJavaVersion());
 	}
 

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

@@ -16,11 +16,7 @@ apply plugin: 'eclipse'
 apply plugin: 'spring-boot'
 apply plugin: 'io.spring.dependency-management'
 
-jar {
+version = '0.0.1-SNAPSHOT'
-	baseName = 'demo'
-	version = '0.0.1-SNAPSHOT'
-}
-
 sourceCompatibility = 1.8
 
 repositories {

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

@@ -16,11 +16,7 @@ apply plugin: 'eclipse'
 apply plugin: 'spring-boot'
 apply plugin: 'io.spring.dependency-management'
 
-jar {
+version = '0.0.1-SNAPSHOT'
-	baseName = 'demo'
-	version = '0.0.1-SNAPSHOT'
-}
-
 sourceCompatibility = 1.8
 
 repositories {

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

@@ -16,11 +16,7 @@ apply plugin: 'eclipse'
 apply plugin: 'spring-boot'
 apply plugin: 'io.spring.dependency-management'
 
-jar {
+version = '0.0.1-SNAPSHOT'
-	baseName = 'demo'
-	version = '0.0.1-SNAPSHOT'
-}
-
 sourceCompatibility = 1.8
 
 repositories {

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

@@ -16,11 +16,7 @@ apply plugin: 'eclipse'
 apply plugin: 'spring-boot'
 apply plugin: 'io.spring.dependency-management'
 
-jar {
+version = '0.0.1-SNAPSHOT'
-	baseName = 'demo'
-	version = '0.0.1-SNAPSHOT'
-}
-
 sourceCompatibility = 1.8
 
 repositories {

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

@@ -16,11 +16,7 @@ apply plugin: 'eclipse'
 apply plugin: 'spring-boot'
 apply plugin: 'io.spring.dependency-management'
 
-jar {
+version = '0.0.1-SNAPSHOT'
-	baseName = 'demo'
-	version = '0.0.1-SNAPSHOT'
-}
-
 sourceCompatibility = 1.8
 
 repositories {

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

@@ -17,11 +17,7 @@ apply plugin: 'spring-boot'
 apply plugin: 'io.spring.dependency-management'
 apply plugin: 'war'
 
-war {
+version = '0.0.1-SNAPSHOT'
-	baseName = 'demo'
-	version = '0.0.1-SNAPSHOT'
-}
-
 sourceCompatibility = 1.8
 
 repositories {

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

@@ -16,11 +16,7 @@ apply plugin: 'eclipse'
 apply plugin: 'spring-boot'
 apply plugin: 'io.spring.dependency-management'
 
-jar {
+version = '0.0.1-SNAPSHOT'
-	baseName = 'demo'
-	version = '0.0.1-SNAPSHOT'
-}
-
 sourceCompatibility = 1.8
 
 repositories {

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

@@ -17,11 +17,7 @@ apply plugin: 'spring-boot'
 apply plugin: 'io.spring.dependency-management'
 apply plugin: 'war'
 
-war {
+version = '0.0.1-SNAPSHOT'
-	baseName = 'demo'
-	version = '0.0.1-SNAPSHOT'
-}
-
 sourceCompatibility = 1.8
 
 repositories {

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

@@ -20,11 +20,7 @@ apply plugin: 'eclipse'
 apply plugin: 'spring-boot'
 apply plugin: 'io.spring.dependency-management'
 
-jar {
+version = '0.0.1-SNAPSHOT'
-	baseName = 'demo'
-	version = '0.0.1-SNAPSHOT'
-}
-
 sourceCompatibility = 1.8
 
 repositories {

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

@@ -21,11 +21,7 @@ apply plugin: 'spring-boot'
 apply plugin: 'io.spring.dependency-management'
 apply plugin: 'war'
 
-war {
+version = '0.0.1-SNAPSHOT'
-	baseName = 'demo'
-	version = '0.0.1-SNAPSHOT'
-}
-
 sourceCompatibility = 1.8
 
 repositories {