From 4a75ad6b2103ea48dce127ae7b211c49af6aa6ae Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 5 Dec 2018 16:36:40 +0100 Subject: [PATCH] Polish Maven pom structure --- .../src/main/resources/templates/starter-pom.xml | 15 ++++++--------- .../resources/project/groovy/previous/pom.xml.gen | 15 ++++++--------- .../resources/project/groovy/standard/pom.xml.gen | 15 ++++++--------- .../project/groovy/standard/war-pom.xml.gen | 15 ++++++--------- .../resources/project/java/previous/pom.xml.gen | 15 ++++++--------- .../resources/project/java/standard/pom.xml.gen | 15 ++++++--------- .../project/java/standard/war-pom.xml.gen | 15 ++++++--------- .../resources/project/kotlin/previous/pom.xml.gen | 15 ++++++--------- .../resources/project/kotlin/standard/pom.xml.gen | 15 ++++++--------- .../project/kotlin/standard/war-pom.xml.gen | 15 ++++++--------- .../annotation-processor-dependency-pom.xml.gen | 15 ++++++--------- .../project/maven/bom-ordering-pom.xml.gen | 15 ++++++--------- .../project/maven/bom-property-pom.xml.gen | 15 ++++++--------- .../maven/compile-only-dependency-pom.xml.gen | 15 ++++++--------- .../project/maven/kotlin-java11-pom.xml.gen | 15 ++++++--------- .../project/maven/version-override-pom.xml.gen | 15 ++++++--------- 16 files changed, 96 insertions(+), 144 deletions(-) diff --git a/initializr-generator/src/main/resources/templates/starter-pom.xml b/initializr-generator/src/main/resources/templates/starter-pom.xml index b2b1f66f..8e8f3e1a 100644 --- a/initializr-generator/src/main/resources/templates/starter-pom.xml +++ b/initializr-generator/src/main/resources/templates/starter-pom.xml @@ -2,21 +2,18 @@ 4.0.0 - - {{groupId}} - {{artifactId}} - {{version}} - {{packaging}} - - {{name}} - {{description}} - {{mavenParentGroupId}} {{mavenParentArtifactId}} {{mavenParentVersion}} + {{groupId}} + {{artifactId}} + {{version}} + {{packaging}} + {{name}} + {{description}} {{#buildPropertiesMaven}} 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 b6ad7736..2f117a8e 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 @@ -2,21 +2,18 @@ 4.0.0 - - com.example - demo - 0.0.1-SNAPSHOT - jar - - demo - Demo project for Spring Boot - org.springframework.boot spring-boot-starter-parent 1.5.18.RELEASE + com.example + demo + 0.0.1-SNAPSHOT + jar + demo + Demo project for Spring Boot UTF-8 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 20e4c2eb..10d878b3 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 @@ -2,21 +2,18 @@ 4.0.0 - - com.example - demo - 0.0.1-SNAPSHOT - jar - - demo - Demo project for Spring Boot - org.springframework.boot spring-boot-starter-parent 2.1.1.RELEASE + com.example + demo + 0.0.1-SNAPSHOT + jar + demo + Demo project for Spring Boot UTF-8 diff --git a/initializr-generator/src/test/resources/project/groovy/standard/war-pom.xml.gen b/initializr-generator/src/test/resources/project/groovy/standard/war-pom.xml.gen index e47057cc..39665d96 100644 --- a/initializr-generator/src/test/resources/project/groovy/standard/war-pom.xml.gen +++ b/initializr-generator/src/test/resources/project/groovy/standard/war-pom.xml.gen @@ -2,21 +2,18 @@ 4.0.0 - - com.example - demo - 0.0.1-SNAPSHOT - war - - demo - Demo project for Spring Boot - org.springframework.boot spring-boot-starter-parent 2.1.1.RELEASE + com.example + demo + 0.0.1-SNAPSHOT + war + demo + Demo project for Spring Boot UTF-8 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 db954653..96237665 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 @@ -2,21 +2,18 @@ 4.0.0 - - com.example - demo - 0.0.1-SNAPSHOT - jar - - demo - Demo project for Spring Boot - org.springframework.boot spring-boot-starter-parent 1.5.18.RELEASE + com.example + demo + 0.0.1-SNAPSHOT + jar + demo + Demo project for Spring Boot UTF-8 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 c7de6be6..a138933e 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 @@ -2,21 +2,18 @@ 4.0.0 - - com.example - demo - 0.0.1-SNAPSHOT - jar - - demo - Demo project for Spring Boot - org.springframework.boot spring-boot-starter-parent 2.1.1.RELEASE + com.example + demo + 0.0.1-SNAPSHOT + jar + demo + Demo project for Spring Boot UTF-8 diff --git a/initializr-generator/src/test/resources/project/java/standard/war-pom.xml.gen b/initializr-generator/src/test/resources/project/java/standard/war-pom.xml.gen index 1825d075..abb8dee2 100644 --- a/initializr-generator/src/test/resources/project/java/standard/war-pom.xml.gen +++ b/initializr-generator/src/test/resources/project/java/standard/war-pom.xml.gen @@ -2,21 +2,18 @@ 4.0.0 - - com.example - demo - 0.0.1-SNAPSHOT - war - - demo - Demo project for Spring Boot - org.springframework.boot spring-boot-starter-parent 2.1.1.RELEASE + com.example + demo + 0.0.1-SNAPSHOT + war + demo + Demo project for Spring Boot UTF-8 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 879a870d..079e4ca1 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 @@ -2,21 +2,18 @@ 4.0.0 - - com.example - demo - 0.0.1-SNAPSHOT - jar - - demo - Demo project for Spring Boot - org.springframework.boot spring-boot-starter-parent 1.5.18.RELEASE + com.example + demo + 0.0.1-SNAPSHOT + jar + demo + Demo project for Spring Boot UTF-8 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 04c9f11a..abc0d13a 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 @@ -2,21 +2,18 @@ 4.0.0 - - com.example - demo - 0.0.1-SNAPSHOT - jar - - demo - Demo project for Spring Boot - org.springframework.boot spring-boot-starter-parent 2.1.1.RELEASE + com.example + demo + 0.0.1-SNAPSHOT + jar + demo + Demo project for Spring Boot UTF-8 diff --git a/initializr-generator/src/test/resources/project/kotlin/standard/war-pom.xml.gen b/initializr-generator/src/test/resources/project/kotlin/standard/war-pom.xml.gen index cd8de2ba..a9a79918 100644 --- a/initializr-generator/src/test/resources/project/kotlin/standard/war-pom.xml.gen +++ b/initializr-generator/src/test/resources/project/kotlin/standard/war-pom.xml.gen @@ -2,21 +2,18 @@ 4.0.0 - - com.example - demo - 0.0.1-SNAPSHOT - war - - demo - Demo project for Spring Boot - org.springframework.boot spring-boot-starter-parent 2.1.1.RELEASE + com.example + demo + 0.0.1-SNAPSHOT + war + demo + Demo project for Spring Boot UTF-8 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 369d1904..21892565 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 @@ -2,21 +2,18 @@ 4.0.0 - - com.example - demo - 0.0.1-SNAPSHOT - jar - - demo - Demo project for Spring Boot - org.springframework.boot spring-boot-starter-parent 2.1.1.RELEASE + com.example + demo + 0.0.1-SNAPSHOT + jar + demo + Demo project for Spring Boot UTF-8 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 6cc597d6..c5f0cef9 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 @@ -2,21 +2,18 @@ 4.0.0 - - com.example - demo - 0.0.1-SNAPSHOT - jar - - demo - Demo project for Spring Boot - org.springframework.boot spring-boot-starter-parent 2.1.1.RELEASE + com.example + demo + 0.0.1-SNAPSHOT + jar + demo + Demo project for Spring Boot UTF-8 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 c5476f66..a56923a2 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 @@ -2,21 +2,18 @@ 4.0.0 - - com.example - demo - 0.0.1-SNAPSHOT - jar - - demo - Demo project for Spring Boot - org.springframework.boot spring-boot-starter-parent 2.1.1.RELEASE + com.example + demo + 0.0.1-SNAPSHOT + jar + demo + Demo project for Spring Boot UTF-8 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 5b9194c5..941f4818 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 @@ -2,21 +2,18 @@ 4.0.0 - - com.example - demo - 0.0.1-SNAPSHOT - jar - - demo - Demo project for Spring Boot - org.springframework.boot spring-boot-starter-parent 2.1.1.RELEASE + com.example + demo + 0.0.1-SNAPSHOT + jar + demo + Demo project for Spring Boot UTF-8 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 6a336403..82523684 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 @@ -2,21 +2,18 @@ 4.0.0 - - com.example - demo - 0.0.1-SNAPSHOT - jar - - demo - Demo project for Spring Boot - org.springframework.boot spring-boot-starter-parent 2.1.1.RELEASE + com.example + demo + 0.0.1-SNAPSHOT + jar + demo + Demo project for Spring Boot UTF-8 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 ed5c98d9..f7f1d53e 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 @@ -2,21 +2,18 @@ 4.0.0 - - com.example - demo - 0.0.1-SNAPSHOT - jar - - demo - Demo project for Spring Boot - org.springframework.boot spring-boot-starter-parent 2.1.1.RELEASE + com.example + demo + 0.0.1-SNAPSHOT + jar + demo + Demo project for Spring Boot UTF-8