lsm/initializr
1
0
Fork 0
mirror of https://gitee.com/dcren/initializr.git synced 2025-04-05 17:38:06 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove default packaging from generated pom

Browse Source 
Closes gh-780
This commit is contained in:
Stephane Nicoll 2018-12-11 10:25:05 +01:00
parent c3079c5609
commit 8e6b5e9cf5
17 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
initializr-generator/src/main/java/io/spring/initializr/generator/ProjectGenerator.java
View File

@ -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());

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

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

10
initializr-generator/src/test/java/io/spring/initializr/test/generator/PomAssert.java
View File

@ -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);

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

@ -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>

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

@ -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>

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

@ -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>

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

@ -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>

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

@ -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>

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

@ -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>

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

@ -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>

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

@ -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>

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

@ -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>

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

@ -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>

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

@ -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>

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

@ -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>

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

@ -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>

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

@ -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>