Remove default packaging from generated pom

Closes gh-780

initializr-generator/src/main/java/io/spring/initializr/generator/ProjectGenerator.java

@@ -382,6 +382,7 @@ public class ProjectGenerator {
 			model.put("mavenParentArtifactId", parentPom.getArtifactId());
 			model.put("mavenParentVersion", parentPom.getVersion());
 			model.put("includeSpringBootBom", parentPom.isIncludeSpringBootBom());
+			model.put("defaultPackaging", "jar".equals(request.getPackaging()));
 		}
 
 		model.put("repositoryValues", request.getRepositories().entrySet());

initializr-generator/src/main/resources/templates/starter-pom.xml

@@ -10,8 +10,8 @@
 	</parent>
 	<groupId>{{groupId}}</groupId>
 	<artifactId>{{artifactId}}</artifactId>
-	<version>{{version}}</version>
+	<version>{{version}}</version>{{^defaultPackaging}}
-	<packaging>{{packaging}}</packaging>
+	<packaging>{{packaging}}</packaging>{{/defaultPackaging}}
 	<name>{{name}}</name>
 	<description>{{description}}</description>
 

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

@@ -139,8 +139,14 @@ public class PomAssert {
 
 	public PomAssert hasPackaging(String packaging) {
 		try {
-			assertThat(this.eng.evaluate(createRootNodeXPath("packaging"), this.doc))
+			String path = createRootNodeXPath("packaging");
-					.isEqualTo(packaging);
+			if ("jar".equals(packaging)) {
+				assertThat(this.eng.getMatchingNodes(path, this.doc).getLength())
+						.isEqualTo(0);
+			}
+			else {
+				assertThat(this.eng.evaluate(path, this.doc)).isEqualTo(packaging);
+			}
 		}
 		catch (XpathException ex) {
 			throw new IllegalStateException("Cannot find path", ex);

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

@@ -11,7 +11,6 @@
 	<groupId>com.example</groupId>
 	<artifactId>demo</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
-	<packaging>jar</packaging>
 	<name>demo</name>
 	<description>Demo project for Spring Boot</description>
 

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

@@ -11,7 +11,6 @@
 	<groupId>com.example</groupId>
 	<artifactId>demo</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
-	<packaging>jar</packaging>
 	<name>demo</name>
 	<description>Demo project for Spring Boot</description>
 

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

@@ -11,7 +11,6 @@
 	<groupId>com.example</groupId>
 	<artifactId>demo</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
-	<packaging>jar</packaging>
 	<name>demo</name>
 	<description>Demo project for Spring Boot</description>
 

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

@@ -11,7 +11,6 @@
 	<groupId>com.example</groupId>
 	<artifactId>demo</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
-	<packaging>jar</packaging>
 	<name>demo</name>
 	<description>Demo project for Spring Boot</description>
 

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

@@ -11,7 +11,6 @@
 	<groupId>com.example</groupId>
 	<artifactId>demo</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
-	<packaging>jar</packaging>
 	<name>demo</name>
 	<description>Demo project for Spring Boot</description>
 

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

@@ -11,7 +11,6 @@
 	<groupId>com.example</groupId>
 	<artifactId>demo</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
-	<packaging>jar</packaging>
 	<name>demo</name>
 	<description>Demo project for Spring Boot</description>
 

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

@@ -11,7 +11,6 @@
 	<groupId>com.example</groupId>
 	<artifactId>demo</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
-	<packaging>jar</packaging>
 	<name>demo</name>
 	<description>Demo project for Spring Boot</description>
 

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

@@ -11,7 +11,6 @@
 	<groupId>com.example</groupId>
 	<artifactId>demo</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
-	<packaging>jar</packaging>
 	<name>demo</name>
 	<description>Demo project for Spring Boot</description>
 

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

@@ -11,7 +11,6 @@
 	<groupId>com.example</groupId>
 	<artifactId>demo</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
-	<packaging>jar</packaging>
 	<name>demo</name>
 	<description>Demo project for Spring Boot</description>
 

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

@@ -11,7 +11,6 @@
 	<groupId>com.example</groupId>
 	<artifactId>demo</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
-	<packaging>jar</packaging>
 	<name>demo</name>
 	<description>Demo project for Spring Boot</description>
 

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

@@ -11,7 +11,6 @@
 	<groupId>com.example</groupId>
 	<artifactId>demo</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
-	<packaging>jar</packaging>
 	<name>demo</name>
 	<description>Demo project for Spring Boot</description>
 

initializr-generator/src/test/resources/project/maven/repositories-milestone-pom.xml.gen

@@ -11,7 +11,6 @@
 	<groupId>com.example</groupId>
 	<artifactId>demo</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
-	<packaging>jar</packaging>
 	<name>demo</name>
 	<description>Demo project for Spring Boot</description>
 

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

@@ -11,7 +11,6 @@
 	<groupId>com.example</groupId>
 	<artifactId>demo</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
-	<packaging>jar</packaging>
 	<name>demo</name>
 	<description>Demo project for Spring Boot</description>
 

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

@@ -11,7 +11,6 @@
 	<groupId>com.example</groupId>
 	<artifactId>demo</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
-	<packaging>jar</packaging>
 	<name>demo</name>
 	<description>Demo project for Spring Boot</description>