From 8e6b5e9cf551656707d8138af7f353e260179312 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 11 Dec 2018 10:25:05 +0100 Subject: [PATCH] Remove default packaging from generated pom Closes gh-780 --- .../spring/initializr/generator/ProjectGenerator.java | 1 + .../src/main/resources/templates/starter-pom.xml | 4 ++-- .../io/spring/initializr/test/generator/PomAssert.java | 10 ++++++++-- .../test/resources/project/groovy/previous/pom.xml.gen | 1 - .../test/resources/project/groovy/standard/pom.xml.gen | 1 - .../test/resources/project/java/previous/pom.xml.gen | 1 - .../test/resources/project/java/standard/pom.xml.gen | 1 - .../test/resources/project/kotlin/previous/pom.xml.gen | 1 - .../test/resources/project/kotlin/standard/pom.xml.gen | 1 - .../maven/annotation-processor-dependency-pom.xml.gen | 1 - .../resources/project/maven/bom-ordering-pom.xml.gen | 1 - .../resources/project/maven/bom-property-pom.xml.gen | 1 - .../project/maven/compile-only-dependency-pom.xml.gen | 1 - .../resources/project/maven/kotlin-java11-pom.xml.gen | 1 - .../project/maven/repositories-milestone-pom.xml.gen | 1 - .../resources/project/maven/repositories-pom.xml.gen | 1 - .../project/maven/version-override-pom.xml.gen | 1 - 17 files changed, 11 insertions(+), 18 deletions(-) diff --git a/initializr-generator/src/main/java/io/spring/initializr/generator/ProjectGenerator.java b/initializr-generator/src/main/java/io/spring/initializr/generator/ProjectGenerator.java index c7144db2..13f245ad 100644 --- a/initializr-generator/src/main/java/io/spring/initializr/generator/ProjectGenerator.java +++ b/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()); diff --git a/initializr-generator/src/main/resources/templates/starter-pom.xml b/initializr-generator/src/main/resources/templates/starter-pom.xml index e78810ad..8a86ed73 100644 --- a/initializr-generator/src/main/resources/templates/starter-pom.xml +++ b/initializr-generator/src/main/resources/templates/starter-pom.xml @@ -10,8 +10,8 @@ {{groupId}} {{artifactId}} - {{version}} - {{packaging}} + {{version}}{{^defaultPackaging}} + {{packaging}}{{/defaultPackaging}} {{name}} {{description}} diff --git a/initializr-generator/src/test/java/io/spring/initializr/test/generator/PomAssert.java b/initializr-generator/src/test/java/io/spring/initializr/test/generator/PomAssert.java index 86d08c68..c5d3d106 100644 --- a/initializr-generator/src/test/java/io/spring/initializr/test/generator/PomAssert.java +++ b/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)) - .isEqualTo(packaging); + String path = createRootNodeXPath("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); 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 index fcba330d..97819fd3 100644 --- a/initializr-generator/src/test/resources/project/groovy/previous/pom.xml.gen +++ b/initializr-generator/src/test/resources/project/groovy/previous/pom.xml.gen @@ -11,7 +11,6 @@ com.example demo 0.0.1-SNAPSHOT - jar demo Demo project for Spring Boot 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 9c4247ce..16035658 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 @@ -11,7 +11,6 @@ com.example demo 0.0.1-SNAPSHOT - jar demo Demo project for Spring Boot 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 index 0e3f80a8..89e1fe8d 100644 --- a/initializr-generator/src/test/resources/project/java/previous/pom.xml.gen +++ b/initializr-generator/src/test/resources/project/java/previous/pom.xml.gen @@ -11,7 +11,6 @@ com.example demo 0.0.1-SNAPSHOT - jar demo Demo project for Spring Boot 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 0fa05132..cc70ca31 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 @@ -11,7 +11,6 @@ com.example demo 0.0.1-SNAPSHOT - jar demo Demo project for Spring Boot diff --git a/initializr-generator/src/test/resources/project/kotlin/previous/pom.xml.gen b/initializr-generator/src/test/resources/project/kotlin/previous/pom.xml.gen index 9a20bddf..2c90aecc 100644 --- a/initializr-generator/src/test/resources/project/kotlin/previous/pom.xml.gen +++ b/initializr-generator/src/test/resources/project/kotlin/previous/pom.xml.gen @@ -11,7 +11,6 @@ com.example demo 0.0.1-SNAPSHOT - jar demo Demo project for Spring Boot 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 a5b7f656..c5365398 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 @@ -11,7 +11,6 @@ com.example demo 0.0.1-SNAPSHOT - jar demo Demo project for Spring Boot 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 4b75b1ea..d02e5c59 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 @@ -11,7 +11,6 @@ com.example demo 0.0.1-SNAPSHOT - jar demo Demo project for Spring Boot 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 4a66f3be..55b12130 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 @@ -11,7 +11,6 @@ com.example demo 0.0.1-SNAPSHOT - jar demo Demo project for Spring Boot 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 e3667924..1efe27ad 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 @@ -11,7 +11,6 @@ com.example demo 0.0.1-SNAPSHOT - jar demo Demo project for Spring Boot 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 46f2dec0..3cdf6861 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 @@ -11,7 +11,6 @@ com.example demo 0.0.1-SNAPSHOT - jar demo Demo project for Spring Boot diff --git a/initializr-generator/src/test/resources/project/maven/kotlin-java11-pom.xml.gen b/initializr-generator/src/test/resources/project/maven/kotlin-java11-pom.xml.gen index 8e0caef3..c73bcd1d 100644 --- a/initializr-generator/src/test/resources/project/maven/kotlin-java11-pom.xml.gen +++ b/initializr-generator/src/test/resources/project/maven/kotlin-java11-pom.xml.gen @@ -11,7 +11,6 @@ com.example demo 0.0.1-SNAPSHOT - jar demo Demo project for Spring Boot diff --git a/initializr-generator/src/test/resources/project/maven/repositories-milestone-pom.xml.gen b/initializr-generator/src/test/resources/project/maven/repositories-milestone-pom.xml.gen index 5f8f22e5..b201d23d 100644 --- a/initializr-generator/src/test/resources/project/maven/repositories-milestone-pom.xml.gen +++ b/initializr-generator/src/test/resources/project/maven/repositories-milestone-pom.xml.gen @@ -11,7 +11,6 @@ com.example demo 0.0.1-SNAPSHOT - jar demo Demo project for Spring Boot diff --git a/initializr-generator/src/test/resources/project/maven/repositories-pom.xml.gen b/initializr-generator/src/test/resources/project/maven/repositories-pom.xml.gen index 1542ee26..c06470a2 100644 --- a/initializr-generator/src/test/resources/project/maven/repositories-pom.xml.gen +++ b/initializr-generator/src/test/resources/project/maven/repositories-pom.xml.gen @@ -11,7 +11,6 @@ com.example demo 0.0.1-SNAPSHOT - jar demo Demo project for Spring Boot 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 926e202a..0c72776c 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 @@ -11,7 +11,6 @@ com.example demo 0.0.1-SNAPSHOT - jar demo Demo project for Spring Boot