Merge branch 'main' into dependabot-staging-main

Author: pcalouche

README.md

@@ -177,9 +177,7 @@ also protected, so an application is free to extend it to modify the existing be
 ### Logging Auto Configuration
 
 This autoconfiguration is enabled by default if the `pcalouche-spring-boot-starter-app` is on the classpath. The
-`pcalouche-spring-boot-starter-app` includes `pcalouche-spring-boot-starter-logging` which bundles . It's only
-configurable behavior is setting `springforge.logging.json-format=true` to enable logging in JSON format. This is useful
-for consumption by various monitoring tools.
+`pcalouche-spring-boot-starter-app` includes `pcalouche-spring-boot-starter-logging` which bundles [Logstash](https://github.com/logfellow/logstash-logback-encoder/blob/main/pom.xml) to make advanced logging features available in applications.
 
 ## The Spring Forge Libraries
 

autoconfigure/src/main/java/dev/pcalouche/springforge/autoconfigure/logging/LoggingAutoConfiguration.java

@@ -1,2 +1 @@
-dev.pcalouche.springforge.autoconfigure.controlleradvice.CommonControllerAdviceAutoConfiguration
-dev.pcalouche.springforge.autoconfigure.logging.LoggingAutoConfiguration
+dev.pcalouche.springforge.autoconfigure.controlleradvice.CommonControllerAdviceAutoConfiguration

autoconfigure/src/main/java/dev/pcalouche/springforge/autoconfigure/logging/LoggingProperties.java

@@ -24,7 +24,5 @@
   <logger name="com.github.dockerjava" level="WARN"/>
   <logger name="com.github.dockerjava.zerodep.shaded.org.apache.hc.client5.http.wire" level="OFF"/>
   <!-- End recommended test logging for test containers -->
-  <!-- This one is noisy in tests too. -->
-  <logger name="de.flapdoodle.embed.mongo" level="WARN"/>
 
 </configuration>

autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1,33 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-
-  <!-- sets some suggested spring boot defaults -->
+  <!-- Sets some suggested Spring Boot defaults -->
   <include resource="org/springframework/boot/logging/logback/defaults.xml"/>
-  <springProperty name="app_name" source="spring.application.name"/>
-
-  <!--
-    When springforge.logging.json-format in the Spring properties is set to true, the logs will be
-    in Logstash JSON format. Otherwise, the logs will be standard colorized Spring Boot logging.
-    The springProperty attribute makes the eh.logging.json-format spring property accessible here.
-  -->
-  <springProperty name="springforge_logging_json_format" source="springforge.logging.json-format"/>
-  <if condition='p("springforge_logging_json_format").equals("true")'>
-    <then>
-      <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder class="net.logstash.logback.encoder.LogstashEncoder">
-          <fieldNames>
-            <timestamp>ts</timestamp>
-          </fieldNames>
-          <timeZone>UTC</timeZone>
-          <customFields>{"app_name":"${app_name}"}</customFields>
-        </encoder>
-      </appender>
-    </then>
-    <else>
-      <!-- includes an appender named CONSOLE -->
-      <include resource="org/springframework/boot/logging/logback/console-appender.xml"/>
-    </else>
-  </if>
+  <include resource="org/springframework/boot/logging/logback/console-appender.xml"/>
 
   <!-- register all appenders -->
   <root level="INFO">

autoconfigure/src/test/java/dev/pcalouche/springforge/autoconfigure/logging/LoggingAutoConfigurationTest.java

@@ -26,11 +26,6 @@
       <groupId>net.logstash.logback</groupId>
       <artifactId>logstash-logback-encoder</artifactId>
     </dependency>
-    <!-- This is needed for logback "Conditional Processing". See https://logback.qos.ch/manual/configuration.html#conditional -->
-    <dependency>
-      <groupId>org.codehaus.janino</groupId>
-      <artifactId>janino</artifactId>
-    </dependency>
   </dependencies>
 
 </project>