From 4810d8aac20b318e5dc132ac6403c3120778a5da Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Tue, 22 Jan 2019 20:54:19 +0100
Subject: [PATCH] Harmonize .gitignore generation

---
 .../src/main/resources/templates/gitignore.tmpl           | 8 ++++----
 .../src/test/resources/project/gradle/gitignore.gen       | 2 +-
 .../src/test/resources/project/maven/gitignore.gen        | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/initializr-generator/src/main/resources/templates/gitignore.tmpl b/initializr-generator/src/main/resources/templates/gitignore.tmpl
index f9845ed9..bf88cef0 100644
--- a/initializr-generator/src/main/resources/templates/gitignore.tmpl
+++ b/initializr-generator/src/main/resources/templates/gitignore.tmpl
@@ -28,10 +28,10 @@
 
 ### NetBeans ###
 /nbproject/private/
-{{#mavenBuild}}
-/build/
-{{/mavenBuild}}
 /nbbuild/
 /dist/
 /nbdist/
-/.nb-gradle/
\ No newline at end of file
+/.nb-gradle/
+{{#mavenBuild}}
+/build/
+{{/mavenBuild}}
diff --git a/initializr-generator/src/test/resources/project/gradle/gitignore.gen b/initializr-generator/src/test/resources/project/gradle/gitignore.gen
index 9243c63d..d6819a47 100644
--- a/initializr-generator/src/test/resources/project/gradle/gitignore.gen
+++ b/initializr-generator/src/test/resources/project/gradle/gitignore.gen
@@ -23,4 +23,4 @@
 /nbbuild/
 /dist/
 /nbdist/
-/.nb-gradle/
\ No newline at end of file
+/.nb-gradle/
diff --git a/initializr-generator/src/test/resources/project/maven/gitignore.gen b/initializr-generator/src/test/resources/project/maven/gitignore.gen
index 82eca336..c456c4a3 100644
--- a/initializr-generator/src/test/resources/project/maven/gitignore.gen
+++ b/initializr-generator/src/test/resources/project/maven/gitignore.gen
@@ -18,8 +18,8 @@
 
 ### NetBeans ###
 /nbproject/private/
-/build/
 /nbbuild/
 /dist/
 /nbdist/
-/.nb-gradle/
\ No newline at end of file
+/.nb-gradle/
+/build/