diff --git a/src/main/java/tech/jhipster/lite/generator/buildtool/maven/domain/Maven.java b/src/main/java/tech/jhipster/lite/generator/buildtool/maven/domain/Maven.java index 2b4b5bddc8b..3c6fba9c60d 100644 --- a/src/main/java/tech/jhipster/lite/generator/buildtool/maven/domain/Maven.java +++ b/src/main/java/tech/jhipster/lite/generator/buildtool/maven/domain/Maven.java @@ -90,7 +90,7 @@ public static String getParent(Parent parent, int indentation) { .append(VERSION_END) .append(System.lineSeparator()) .append(indent(2, indentation)) - .append("") + .append("") .append(System.lineSeparator()) .append(indent(1, indentation)) .append(PARENT_END); diff --git a/src/main/java/tech/jhipster/lite/generator/server/springboot/logging/domain/SpringBootLoggingDomainService.java b/src/main/java/tech/jhipster/lite/generator/server/springboot/logging/domain/SpringBootLoggingDomainService.java index 120929e9d33..ce0b176c3dd 100644 --- a/src/main/java/tech/jhipster/lite/generator/server/springboot/logging/domain/SpringBootLoggingDomainService.java +++ b/src/main/java/tech/jhipster/lite/generator/server/springboot/logging/domain/SpringBootLoggingDomainService.java @@ -35,7 +35,7 @@ private void addLoggerToConfiguration( String needleLogger ) { String loggerWithNeedle = - String.format("", packageName, level.toString()) + System.lineSeparator() + needleLogger; + String.format("", packageName, level.toString()) + System.lineSeparator() + " " + needleLogger; projectRepository.replaceText(project, getPath(folderConfig), fileLoggingConfig, needleLogger, loggerWithNeedle); } } diff --git a/src/main/resources/generator/buildtool/maven/pom.xml.mustache b/src/main/resources/generator/buildtool/maven/pom.xml.mustache index a155b074a77..f5054d97df3 100644 --- a/src/main/resources/generator/buildtool/maven/pom.xml.mustache +++ b/src/main/resources/generator/buildtool/maven/pom.xml.mustache @@ -1,4 +1,4 @@ - + - + ${project.basedir} **/*.exec @@ -243,8 +242,7 @@ - You are running an older version of Maven. JHipster requires at least Maven ${maven.version} - + You are running an older version of Maven. JHipster requires at least Maven ${maven.version} [${maven.version},) diff --git a/src/main/resources/generator/server/springboot/core/MainApp.java.mustache b/src/main/resources/generator/server/springboot/core/MainApp.java.mustache index e3df808c6b3..292e112a4ec 100644 --- a/src/main/resources/generator/server/springboot/core/MainApp.java.mustache +++ b/src/main/resources/generator/server/springboot/core/MainApp.java.mustache @@ -92,4 +92,3 @@ public class {{mainClass}}App { return hostAddress; } } - diff --git a/src/main/resources/generator/server/springboot/core/logback-spring.xml.mustache b/src/main/resources/generator/server/springboot/core/logback-spring.xml.mustache index 4b7346267a1..45942788659 100644 --- a/src/main/resources/generator/server/springboot/core/logback-spring.xml.mustache +++ b/src/main/resources/generator/server/springboot/core/logback-spring.xml.mustache @@ -1,8 +1,7 @@ - + - - + - + - - - + + + - + true - diff --git a/src/main/resources/generator/server/springboot/core/logback.xml.mustache b/src/main/resources/generator/server/springboot/core/logback.xml.mustache index 7fcb200a444..e9d09daa704 100644 --- a/src/main/resources/generator/server/springboot/core/logback.xml.mustache +++ b/src/main/resources/generator/server/springboot/core/logback.xml.mustache @@ -1,8 +1,7 @@ - + - - + - + - - - + + + WARN - + - diff --git a/src/test/java/tech/jhipster/lite/generator/buildtool/maven/application/MavenApplicationServiceIT.java b/src/test/java/tech/jhipster/lite/generator/buildtool/maven/application/MavenApplicationServiceIT.java index efb04b96431..12573cfd695 100644 --- a/src/test/java/tech/jhipster/lite/generator/buildtool/maven/application/MavenApplicationServiceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/buildtool/maven/application/MavenApplicationServiceIT.java @@ -38,7 +38,7 @@ void shouldAddParent() { "org.springframework.boot", "spring-boot-starter-parent", "2.5.3", - "", + "", "" ) ); diff --git a/src/test/java/tech/jhipster/lite/generator/buildtool/maven/domain/maven/MavenTest.java b/src/test/java/tech/jhipster/lite/generator/buildtool/maven/domain/maven/MavenTest.java index 967ac1f1e6b..b1195a549d2 100644 --- a/src/test/java/tech/jhipster/lite/generator/buildtool/maven/domain/maven/MavenTest.java +++ b/src/test/java/tech/jhipster/lite/generator/buildtool/maven/domain/maven/MavenTest.java @@ -21,7 +21,7 @@ void shouldGetParent() { " org.springframework.boot" + System.lineSeparator() + " spring-boot-starter-parent" + System.lineSeparator() + " 2.5.3" + System.lineSeparator() + - " " + System.lineSeparator() + + " " + System.lineSeparator() + " "; // @formatter:on Parent parent = Parent.builder().groupId("org.springframework.boot").artifactId("spring-boot-starter-parent").version("2.5.3").build(); @@ -37,7 +37,7 @@ void shouldGetParentWith4Indentations() { " org.springframework.boot" + System.lineSeparator() + " spring-boot-starter-parent" + System.lineSeparator() + " 2.5.3" + System.lineSeparator() + - " " + System.lineSeparator() + + " " + System.lineSeparator() + " "; // @formatter:on Parent parent = Parent.builder().groupId("org.springframework.boot").artifactId("spring-boot-starter-parent").version("2.5.3").build();