Merge pull request #10681 from kwoyke/JAVA-5190

JAVA-5190: Fix spring-boot-runtime config and tests

spring-boot-modules/pom.xml

@@ -34,6 +34,7 @@
         <module>spring-boot-ctx-fluent</module>
         <module>spring-boot-deployment</module>
         <module>spring-boot-di</module>
+        <module>spring-boot-disable-logging</module>
         <module>spring-boot-camel</module>
         <module>spring-boot-ci-cd</module>
         <!-- <module>spring-boot-cli</module> --> <!-- Not a maven project -->

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)

spring-boot-modules/spring-boot-disable-logging/disabling-console-jul/pom.xml

@@ -8,7 +8,7 @@
 
     <parent>
         <groupId>com.baeldung.spring-boot-modules</groupId>
-        <artifactId>spring-boot-runtime</artifactId>
+        <artifactId>spring-boot-disable-logging</artifactId>
         <version>1.0.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>

spring-boot-modules/spring-boot-disable-logging/disabling-console-log4j2/pom.xml

@@ -8,7 +8,7 @@
 
     <parent>
         <groupId>com.baeldung.spring-boot-modules</groupId>
-        <artifactId>spring-boot-runtime</artifactId>
+        <artifactId>spring-boot-disable-logging</artifactId>
         <version>1.0.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>

spring-boot-modules/spring-boot-disable-logging/disabling-console-logback/pom.xml

@@ -8,7 +8,7 @@
 
     <parent>
         <groupId>com.baeldung.spring-boot-modules</groupId>
-        <artifactId>spring-boot-runtime</artifactId>
+        <artifactId>spring-boot-disable-logging</artifactId>
         <version>1.0.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>

spring-boot-modules/spring-boot-disable-logging/pom.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>com.baeldung.spring-boot-modules</groupId>
+        <artifactId>spring-boot-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../</relativePath>
+    </parent>
+
+    <artifactId>spring-boot-disable-logging</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <name>spring-boot-disable-logging</name>
+
+    <modules>
+        <module>disabling-console-jul</module>
+        <module>disabling-console-log4j2</module>
+        <module>disabling-console-logback</module>
+    </modules>
+</project>

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)

spring-boot-modules/spring-boot-runtime/pom.xml

@@ -11,19 +11,12 @@
     </parent>
 
     <artifactId>spring-boot-runtime</artifactId>
-    <packaging>pom</packaging>
+    <packaging>jar</packaging>
 
     <name>spring-boot-runtime</name>
-    <description>Demo project for Spring Boot</description>
-
-    <modules>
-        <module>disabling-console-jul</module>
-        <module>disabling-console-log4j2</module>
-        <module>disabling-console-logback</module>
-    </modules>
+    <description>Demo project for Spring Boot Runtime</description>
 
     <dependencies>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
@@ -40,18 +33,6 @@
             <scope>provided</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <!-- https://mvnrepository.com/artifact/commons-io/commons-io -->
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>${commons-io.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
@@ -71,11 +52,25 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-security</artifactId>
         </dependency>
+
         <dependency>
-            <groupId>de.codecentric</groupId>
-            <artifactId>spring-boot-admin-starter-client</artifactId>
-            <version>${spring-boot-admin-starter-client.version}</version>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter</artifactId>
+            <version>${springcloud.version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>${commons-io.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-test</artifactId>
@@ -106,12 +101,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-context</artifactId>
-            <version>${springcloud.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
@@ -120,63 +109,12 @@
 
     </dependencies>
 
-    <build>
-        <finalName>${project.artifactId}</finalName>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-                <excludes>
-                    <exclude>**/conf.properties</exclude>
-                </excludes>
-            </resource>
-        </resources>
-    </build>
-
-    <profiles>
-        <profile>
-            <id>autoconfiguration</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <phase>integration-test</phase>
-                                <goals>
-                                    <goal>test</goal>
-                                </goals>
-                                <configuration>
-                                    <excludes>
-                                        <exclude>**/*LiveTest.java</exclude>
-                                        <exclude>**/*IntegrationTest.java</exclude>
-                                        <exclude>**/*IntTest.java</exclude>
-                                    </excludes>
-                                    <includes>
-                                        <include>**/AutoconfigurationTest.java</include>
-                                    </includes>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <configuration>
-                            <systemPropertyVariables>
-                                <test.mime>json</test.mime>
-                            </systemPropertyVariables>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
     <properties>
         <jpa.version>2.2</jpa.version>
         <guava.version>18.0</guava.version>
         <subethasmtp.version>3.1.7</subethasmtp.version>
-        <springcloud.version>2.0.2.RELEASE</springcloud.version>
+        <springcloud.version>3.0.2</springcloud.version>
         <httpclient.version>4.5.8</httpclient.version>
-        <spring-boot-admin-starter-client.version>2.1.6</spring-boot-admin-starter-client.version>
     </properties>
 
 </project>

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;

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/*/");
     }
 }