From 4635cad814b71765520d03565bf56888f9e0c434 Mon Sep 17 00:00:00 2001 From: Krzysztof Woyke Date: Mon, 19 Apr 2021 22:24:05 +0200 Subject: [PATCH 1/3] JAVA-5190: Fix spring-boot-runtime config and tests --- .../spring-boot-runtime/pom.xml | 102 ++++-------------- .../log/config/CustomWebAppInitializer.java | 2 + .../web/log/config/TaxiFareMVCConfig.java | 2 +- 3 files changed, 23 insertions(+), 83 deletions(-) diff --git a/spring-boot-modules/spring-boot-runtime/pom.xml b/spring-boot-modules/spring-boot-runtime/pom.xml index ce6fa7ea93..54bae61520 100644 --- a/spring-boot-modules/spring-boot-runtime/pom.xml +++ b/spring-boot-modules/spring-boot-runtime/pom.xml @@ -11,19 +11,12 @@ spring-boot-runtime - pom + jar spring-boot-runtime - Demo project for Spring Boot - - - disabling-console-jul - disabling-console-log4j2 - disabling-console-logback - + Demo project for Spring Boot Runtime - org.springframework.boot spring-boot-starter-web @@ -40,18 +33,6 @@ provided - - org.springframework.boot - spring-boot-starter-test - test - - - - commons-io - commons-io - ${commons-io.version} - - org.springframework.boot spring-boot-starter-data-jpa @@ -71,11 +52,25 @@ org.springframework.boot spring-boot-starter-security + - de.codecentric - spring-boot-admin-starter-client - ${spring-boot-admin-starter-client.version} + org.springframework.cloud + spring-cloud-starter + ${springcloud.version} + + + org.springframework.boot + spring-boot-starter-test + test + + + + commons-io + commons-io + ${commons-io.version} + + org.springframework.security spring-security-test @@ -106,12 +101,6 @@ test - - org.springframework.cloud - spring-cloud-context - ${springcloud.version} - - org.apache.httpcomponents httpclient @@ -120,63 +109,12 @@ - - ${project.artifactId} - - - src/main/resources - true - - **/conf.properties - - - - - - - - autoconfiguration - - - - org.apache.maven.plugins - maven-surefire-plugin - - - integration-test - - test - - - - **/*LiveTest.java - **/*IntegrationTest.java - **/*IntTest.java - - - **/AutoconfigurationTest.java - - - - - - - json - - - - - - - - 2.2 18.0 3.1.7 - 2.0.2.RELEASE + 3.0.2 4.5.8 - 2.1.6 diff --git a/spring-boot-modules/spring-boot-runtime/src/main/java/com/baeldung/web/log/config/CustomWebAppInitializer.java b/spring-boot-modules/spring-boot-runtime/src/main/java/com/baeldung/web/log/config/CustomWebAppInitializer.java index f51bb52990..0f19c6dc48 100644 --- a/spring-boot-modules/spring-boot-runtime/src/main/java/com/baeldung/web/log/config/CustomWebAppInitializer.java +++ b/spring-boot-modules/spring-boot-runtime/src/main/java/com/baeldung/web/log/config/CustomWebAppInitializer.java @@ -2,6 +2,8 @@ package com.baeldung.web.log.config; import javax.servlet.ServletContext; import javax.servlet.ServletException; +import javax.servlet.ServletRegistration; + import org.springframework.web.context.ContextLoaderListener; import org.springframework.web.context.support.AnnotationConfigWebApplicationContext; import org.springframework.web.servlet.DispatcherServlet; diff --git a/spring-boot-modules/spring-boot-runtime/src/main/java/com/baeldung/web/log/config/TaxiFareMVCConfig.java b/spring-boot-modules/spring-boot-runtime/src/main/java/com/baeldung/web/log/config/TaxiFareMVCConfig.java index fb0c1d1d48..fda8a845e9 100644 --- a/spring-boot-modules/spring-boot-runtime/src/main/java/com/baeldung/web/log/config/TaxiFareMVCConfig.java +++ b/spring-boot-modules/spring-boot-runtime/src/main/java/com/baeldung/web/log/config/TaxiFareMVCConfig.java @@ -14,6 +14,6 @@ public class TaxiFareMVCConfig implements WebMvcConfigurer { @Override public void addInterceptors(InterceptorRegistry registry) { - registry.addInterceptor(taxiFareRequestInterceptor).addPathPatterns("/**/taxifare/**/"); + registry.addInterceptor(taxiFareRequestInterceptor).addPathPatterns("/taxifare/*/"); } } From bc5e528661c7d4d76a64a56a6165828617875001 Mon Sep 17 00:00:00 2001 From: Krzysztof Woyke Date: Wed, 21 Apr 2021 13:47:55 +0200 Subject: [PATCH 2/3] JAVA-5190: Create a new spring-boot-disable-logging module --- .../spring-boot-disable-logging/README.md | 8 +++++++ .../disabling-console-jul/.gitignore | 0 .../disabling-console-jul/pom.xml | 2 +- .../properties/DisablingConsoleJulApp.java | 0 .../DisabledConsoleRestController.java | 0 .../src/main/resources/application.properties | 0 .../src/main/resources/logging.properties | 0 .../disabling-console-log4j2/.gitignore | 0 .../disabling-console-log4j2/pom.xml | 2 +- .../log4j2/xml/DisablingConsoleLog4j2App.java | 0 .../DisabledConsoleRestController.java | 0 .../src/main/resources/log4j2.xml | 0 .../disabling-console-logback/.gitignore | 0 .../disabling-console-logback/pom.xml | 2 +- .../xml/DisablingConsoleLogbackApp.java | 0 .../DisabledConsoleRestController.java | 0 .../src/main/resources/application.properties | 0 .../src/main/resources/logback-spring.xml | 0 .../spring-boot-disable-logging/pom.xml | 24 +++++++++++++++++++ .../spring-boot-runtime/README.md | 1 - 20 files changed, 35 insertions(+), 4 deletions(-) create mode 100644 spring-boot-modules/spring-boot-disable-logging/README.md rename spring-boot-modules/{spring-boot-runtime => spring-boot-disable-logging}/disabling-console-jul/.gitignore (100%) rename spring-boot-modules/{spring-boot-runtime => spring-boot-disable-logging}/disabling-console-jul/pom.xml (96%) rename spring-boot-modules/{spring-boot-runtime => spring-boot-disable-logging}/disabling-console-jul/src/main/java/com/baeldung/springbootlogging/disablingconsole/jul/properties/DisablingConsoleJulApp.java (100%) rename spring-boot-modules/{spring-boot-runtime => spring-boot-disable-logging}/disabling-console-jul/src/main/java/com/baeldung/springbootlogging/disablingconsole/jul/properties/controllers/DisabledConsoleRestController.java (100%) rename spring-boot-modules/{spring-boot-runtime => spring-boot-disable-logging}/disabling-console-jul/src/main/resources/application.properties (100%) rename spring-boot-modules/{spring-boot-runtime => spring-boot-disable-logging}/disabling-console-jul/src/main/resources/logging.properties (100%) rename spring-boot-modules/{spring-boot-runtime => spring-boot-disable-logging}/disabling-console-log4j2/.gitignore (100%) rename spring-boot-modules/{spring-boot-runtime => spring-boot-disable-logging}/disabling-console-log4j2/pom.xml (95%) rename spring-boot-modules/{spring-boot-runtime => spring-boot-disable-logging}/disabling-console-log4j2/src/main/java/com/baeldung/springbootlogging/disablingconsole/log4j2/xml/DisablingConsoleLog4j2App.java (100%) rename spring-boot-modules/{spring-boot-runtime => spring-boot-disable-logging}/disabling-console-log4j2/src/main/java/com/baeldung/springbootlogging/disablingconsole/log4j2/xml/controllers/DisabledConsoleRestController.java (100%) rename spring-boot-modules/{spring-boot-runtime => spring-boot-disable-logging}/disabling-console-log4j2/src/main/resources/log4j2.xml (100%) rename spring-boot-modules/{spring-boot-runtime => spring-boot-disable-logging}/disabling-console-logback/.gitignore (100%) rename spring-boot-modules/{spring-boot-runtime => spring-boot-disable-logging}/disabling-console-logback/pom.xml (91%) rename spring-boot-modules/{spring-boot-runtime => spring-boot-disable-logging}/disabling-console-logback/src/main/java/com/baeldung/springbootlogging/disablingconsole/logback/xml/DisablingConsoleLogbackApp.java (100%) rename spring-boot-modules/{spring-boot-runtime => spring-boot-disable-logging}/disabling-console-logback/src/main/java/com/baeldung/springbootlogging/disablingconsole/logback/xml/controllers/DisabledConsoleRestController.java (100%) rename spring-boot-modules/{spring-boot-runtime => spring-boot-disable-logging}/disabling-console-logback/src/main/resources/application.properties (100%) rename spring-boot-modules/{spring-boot-runtime => spring-boot-disable-logging}/disabling-console-logback/src/main/resources/logback-spring.xml (100%) create mode 100644 spring-boot-modules/spring-boot-disable-logging/pom.xml diff --git a/spring-boot-modules/spring-boot-disable-logging/README.md b/spring-boot-modules/spring-boot-disable-logging/README.md new file mode 100644 index 0000000000..348c0f6dba --- /dev/null +++ b/spring-boot-modules/spring-boot-disable-logging/README.md @@ -0,0 +1,8 @@ +## Spring Boot Disable Logging + +This module contains articles about disabling logging in Spring Boot + + +### Relevant Articles: + +- [How to Disable Console Logging in Spring Boot](https://www.baeldung.com/spring-boot-disable-console-logging) diff --git a/spring-boot-modules/spring-boot-runtime/disabling-console-jul/.gitignore b/spring-boot-modules/spring-boot-disable-logging/disabling-console-jul/.gitignore similarity index 100% rename from spring-boot-modules/spring-boot-runtime/disabling-console-jul/.gitignore rename to spring-boot-modules/spring-boot-disable-logging/disabling-console-jul/.gitignore diff --git a/spring-boot-modules/spring-boot-runtime/disabling-console-jul/pom.xml b/spring-boot-modules/spring-boot-disable-logging/disabling-console-jul/pom.xml similarity index 96% rename from spring-boot-modules/spring-boot-runtime/disabling-console-jul/pom.xml rename to spring-boot-modules/spring-boot-disable-logging/disabling-console-jul/pom.xml index 77629ffdd1..798332e809 100644 --- a/spring-boot-modules/spring-boot-runtime/disabling-console-jul/pom.xml +++ b/spring-boot-modules/spring-boot-disable-logging/disabling-console-jul/pom.xml @@ -8,7 +8,7 @@ com.baeldung.spring-boot-modules - spring-boot-runtime + spring-boot-disable-logging 1.0.0-SNAPSHOT ../ diff --git a/spring-boot-modules/spring-boot-runtime/disabling-console-jul/src/main/java/com/baeldung/springbootlogging/disablingconsole/jul/properties/DisablingConsoleJulApp.java b/spring-boot-modules/spring-boot-disable-logging/disabling-console-jul/src/main/java/com/baeldung/springbootlogging/disablingconsole/jul/properties/DisablingConsoleJulApp.java similarity index 100% rename from spring-boot-modules/spring-boot-runtime/disabling-console-jul/src/main/java/com/baeldung/springbootlogging/disablingconsole/jul/properties/DisablingConsoleJulApp.java rename to spring-boot-modules/spring-boot-disable-logging/disabling-console-jul/src/main/java/com/baeldung/springbootlogging/disablingconsole/jul/properties/DisablingConsoleJulApp.java diff --git a/spring-boot-modules/spring-boot-runtime/disabling-console-jul/src/main/java/com/baeldung/springbootlogging/disablingconsole/jul/properties/controllers/DisabledConsoleRestController.java b/spring-boot-modules/spring-boot-disable-logging/disabling-console-jul/src/main/java/com/baeldung/springbootlogging/disablingconsole/jul/properties/controllers/DisabledConsoleRestController.java similarity index 100% rename from spring-boot-modules/spring-boot-runtime/disabling-console-jul/src/main/java/com/baeldung/springbootlogging/disablingconsole/jul/properties/controllers/DisabledConsoleRestController.java rename to spring-boot-modules/spring-boot-disable-logging/disabling-console-jul/src/main/java/com/baeldung/springbootlogging/disablingconsole/jul/properties/controllers/DisabledConsoleRestController.java diff --git a/spring-boot-modules/spring-boot-runtime/disabling-console-jul/src/main/resources/application.properties b/spring-boot-modules/spring-boot-disable-logging/disabling-console-jul/src/main/resources/application.properties similarity index 100% rename from spring-boot-modules/spring-boot-runtime/disabling-console-jul/src/main/resources/application.properties rename to spring-boot-modules/spring-boot-disable-logging/disabling-console-jul/src/main/resources/application.properties diff --git a/spring-boot-modules/spring-boot-runtime/disabling-console-jul/src/main/resources/logging.properties b/spring-boot-modules/spring-boot-disable-logging/disabling-console-jul/src/main/resources/logging.properties similarity index 100% rename from spring-boot-modules/spring-boot-runtime/disabling-console-jul/src/main/resources/logging.properties rename to spring-boot-modules/spring-boot-disable-logging/disabling-console-jul/src/main/resources/logging.properties diff --git a/spring-boot-modules/spring-boot-runtime/disabling-console-log4j2/.gitignore b/spring-boot-modules/spring-boot-disable-logging/disabling-console-log4j2/.gitignore similarity index 100% rename from spring-boot-modules/spring-boot-runtime/disabling-console-log4j2/.gitignore rename to spring-boot-modules/spring-boot-disable-logging/disabling-console-log4j2/.gitignore diff --git a/spring-boot-modules/spring-boot-runtime/disabling-console-log4j2/pom.xml b/spring-boot-modules/spring-boot-disable-logging/disabling-console-log4j2/pom.xml similarity index 95% rename from spring-boot-modules/spring-boot-runtime/disabling-console-log4j2/pom.xml rename to spring-boot-modules/spring-boot-disable-logging/disabling-console-log4j2/pom.xml index fd57eccbbf..f3f7fdf473 100644 --- a/spring-boot-modules/spring-boot-runtime/disabling-console-log4j2/pom.xml +++ b/spring-boot-modules/spring-boot-disable-logging/disabling-console-log4j2/pom.xml @@ -8,7 +8,7 @@ com.baeldung.spring-boot-modules - spring-boot-runtime + spring-boot-disable-logging 1.0.0-SNAPSHOT ../ diff --git a/spring-boot-modules/spring-boot-runtime/disabling-console-log4j2/src/main/java/com/baeldung/springbootlogging/disablingconsole/log4j2/xml/DisablingConsoleLog4j2App.java b/spring-boot-modules/spring-boot-disable-logging/disabling-console-log4j2/src/main/java/com/baeldung/springbootlogging/disablingconsole/log4j2/xml/DisablingConsoleLog4j2App.java similarity index 100% rename from spring-boot-modules/spring-boot-runtime/disabling-console-log4j2/src/main/java/com/baeldung/springbootlogging/disablingconsole/log4j2/xml/DisablingConsoleLog4j2App.java rename to spring-boot-modules/spring-boot-disable-logging/disabling-console-log4j2/src/main/java/com/baeldung/springbootlogging/disablingconsole/log4j2/xml/DisablingConsoleLog4j2App.java diff --git a/spring-boot-modules/spring-boot-runtime/disabling-console-log4j2/src/main/java/com/baeldung/springbootlogging/disablingconsole/log4j2/xml/controllers/DisabledConsoleRestController.java b/spring-boot-modules/spring-boot-disable-logging/disabling-console-log4j2/src/main/java/com/baeldung/springbootlogging/disablingconsole/log4j2/xml/controllers/DisabledConsoleRestController.java similarity index 100% rename from spring-boot-modules/spring-boot-runtime/disabling-console-log4j2/src/main/java/com/baeldung/springbootlogging/disablingconsole/log4j2/xml/controllers/DisabledConsoleRestController.java rename to spring-boot-modules/spring-boot-disable-logging/disabling-console-log4j2/src/main/java/com/baeldung/springbootlogging/disablingconsole/log4j2/xml/controllers/DisabledConsoleRestController.java diff --git a/spring-boot-modules/spring-boot-runtime/disabling-console-log4j2/src/main/resources/log4j2.xml b/spring-boot-modules/spring-boot-disable-logging/disabling-console-log4j2/src/main/resources/log4j2.xml similarity index 100% rename from spring-boot-modules/spring-boot-runtime/disabling-console-log4j2/src/main/resources/log4j2.xml rename to spring-boot-modules/spring-boot-disable-logging/disabling-console-log4j2/src/main/resources/log4j2.xml diff --git a/spring-boot-modules/spring-boot-runtime/disabling-console-logback/.gitignore b/spring-boot-modules/spring-boot-disable-logging/disabling-console-logback/.gitignore similarity index 100% rename from spring-boot-modules/spring-boot-runtime/disabling-console-logback/.gitignore rename to spring-boot-modules/spring-boot-disable-logging/disabling-console-logback/.gitignore diff --git a/spring-boot-modules/spring-boot-runtime/disabling-console-logback/pom.xml b/spring-boot-modules/spring-boot-disable-logging/disabling-console-logback/pom.xml similarity index 91% rename from spring-boot-modules/spring-boot-runtime/disabling-console-logback/pom.xml rename to spring-boot-modules/spring-boot-disable-logging/disabling-console-logback/pom.xml index 8cb0e24bb7..741eae4ba4 100644 --- a/spring-boot-modules/spring-boot-runtime/disabling-console-logback/pom.xml +++ b/spring-boot-modules/spring-boot-disable-logging/disabling-console-logback/pom.xml @@ -8,7 +8,7 @@ com.baeldung.spring-boot-modules - spring-boot-runtime + spring-boot-disable-logging 1.0.0-SNAPSHOT ../ diff --git a/spring-boot-modules/spring-boot-runtime/disabling-console-logback/src/main/java/com/baeldung/springbootlogging/disablingconsole/logback/xml/DisablingConsoleLogbackApp.java b/spring-boot-modules/spring-boot-disable-logging/disabling-console-logback/src/main/java/com/baeldung/springbootlogging/disablingconsole/logback/xml/DisablingConsoleLogbackApp.java similarity index 100% rename from spring-boot-modules/spring-boot-runtime/disabling-console-logback/src/main/java/com/baeldung/springbootlogging/disablingconsole/logback/xml/DisablingConsoleLogbackApp.java rename to spring-boot-modules/spring-boot-disable-logging/disabling-console-logback/src/main/java/com/baeldung/springbootlogging/disablingconsole/logback/xml/DisablingConsoleLogbackApp.java diff --git a/spring-boot-modules/spring-boot-runtime/disabling-console-logback/src/main/java/com/baeldung/springbootlogging/disablingconsole/logback/xml/controllers/DisabledConsoleRestController.java b/spring-boot-modules/spring-boot-disable-logging/disabling-console-logback/src/main/java/com/baeldung/springbootlogging/disablingconsole/logback/xml/controllers/DisabledConsoleRestController.java similarity index 100% rename from spring-boot-modules/spring-boot-runtime/disabling-console-logback/src/main/java/com/baeldung/springbootlogging/disablingconsole/logback/xml/controllers/DisabledConsoleRestController.java rename to spring-boot-modules/spring-boot-disable-logging/disabling-console-logback/src/main/java/com/baeldung/springbootlogging/disablingconsole/logback/xml/controllers/DisabledConsoleRestController.java diff --git a/spring-boot-modules/spring-boot-runtime/disabling-console-logback/src/main/resources/application.properties b/spring-boot-modules/spring-boot-disable-logging/disabling-console-logback/src/main/resources/application.properties similarity index 100% rename from spring-boot-modules/spring-boot-runtime/disabling-console-logback/src/main/resources/application.properties rename to spring-boot-modules/spring-boot-disable-logging/disabling-console-logback/src/main/resources/application.properties diff --git a/spring-boot-modules/spring-boot-runtime/disabling-console-logback/src/main/resources/logback-spring.xml b/spring-boot-modules/spring-boot-disable-logging/disabling-console-logback/src/main/resources/logback-spring.xml similarity index 100% rename from spring-boot-modules/spring-boot-runtime/disabling-console-logback/src/main/resources/logback-spring.xml rename to spring-boot-modules/spring-boot-disable-logging/disabling-console-logback/src/main/resources/logback-spring.xml diff --git a/spring-boot-modules/spring-boot-disable-logging/pom.xml b/spring-boot-modules/spring-boot-disable-logging/pom.xml new file mode 100644 index 0000000000..020592ee29 --- /dev/null +++ b/spring-boot-modules/spring-boot-disable-logging/pom.xml @@ -0,0 +1,24 @@ + + + 4.0.0 + + + com.baeldung.spring-boot-modules + spring-boot-modules + 1.0.0-SNAPSHOT + ../ + + + spring-boot-disable-logging + 1.0.0-SNAPSHOT + pom + + spring-boot-disable-logging + + + disabling-console-jul + disabling-console-log4j2 + disabling-console-logback + + diff --git a/spring-boot-modules/spring-boot-runtime/README.md b/spring-boot-modules/spring-boot-runtime/README.md index 271093421c..a36a17fa8e 100644 --- a/spring-boot-modules/spring-boot-runtime/README.md +++ b/spring-boot-modules/spring-boot-runtime/README.md @@ -6,7 +6,6 @@ This module contains articles about administering a Spring Boot runtime - [Shutdown a Spring Boot Application](https://www.baeldung.com/spring-boot-shutdown) - [Programmatically Restarting a Spring Boot Application](https://www.baeldung.com/java-restart-spring-boot-app) - [Logging HTTP Requests with Spring Boot Actuator HTTP Tracing](https://www.baeldung.com/spring-boot-actuator-http) - - [How to Disable Console Logging in Spring Boot](https://www.baeldung.com/spring-boot-disable-console-logging) - [Spring Boot Embedded Tomcat Logs](https://www.baeldung.com/spring-boot-embedded-tomcat-logs) - [Project Configuration with Spring](https://www.baeldung.com/project-configuration-with-spring) - [CORS with Spring](https://www.baeldung.com/spring-cors) From 84deee0e1e47db4480065cc06206764d55e5beb0 Mon Sep 17 00:00:00 2001 From: Krzysztof Woyke Date: Wed, 21 Apr 2021 14:49:07 +0200 Subject: [PATCH 3/3] JAVA-5190: Add spring-boot-disable-logging to the spring-boot-modules pom.xml --- spring-boot-modules/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/spring-boot-modules/pom.xml b/spring-boot-modules/pom.xml index 0288b03928..38100a333d 100644 --- a/spring-boot-modules/pom.xml +++ b/spring-boot-modules/pom.xml @@ -34,6 +34,7 @@ spring-boot-ctx-fluent spring-boot-deployment spring-boot-di + spring-boot-disable-logging spring-boot-camel spring-boot-ci-cd