From b7b1e2be2304738f8bab6bf5ee8a7ac9069d2cce Mon Sep 17 00:00:00 2001
From: Loredana Crusoveanu <lore.crusoveanu@gmail.com>
Date: Fri, 29 Mar 2024 20:36:33 +0200
Subject: [PATCH] JAVA-25483 add global logback config (#15829)

---
 libraries-server/pom.xml                        |  1 +
 logback-config.xml => logback-config-global.xml |  0
 pom.xml                                         | 17 +++++------------
 3 files changed, 6 insertions(+), 12 deletions(-)
 rename logback-config.xml => logback-config-global.xml (100%)

diff --git a/libraries-server/pom.xml b/libraries-server/pom.xml
index 66d6295f7c..bb1ffb1e49 100644
--- a/libraries-server/pom.xml
+++ b/libraries-server/pom.xml
@@ -97,6 +97,7 @@
         <smack.version>4.3.1</smack.version>
         <eclipse.paho.client.mqttv3.version>1.2.0</eclipse.paho.client.mqttv3.version>
         <nanohttpd.version>2.3.1</nanohttpd.version>
+        <logback.configurationFileName>logback.xml</logback.configurationFileName>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/logback-config.xml b/logback-config-global.xml
similarity index 100%
rename from logback-config.xml
rename to logback-config-global.xml
diff --git a/pom.xml b/pom.xml
index c56d7d4c13..d9c7e439b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -118,6 +118,9 @@
                         <exclude>**/JdbcTest.java</exclude>
                         <exclude>**/*LiveTest.java</exclude>
                     </excludes>
+                    <systemPropertyVariables>
+                        <logback.configurationFile>${tutorialsproject.basedir}/${logback.configurationFileName}</logback.configurationFile>
+                    </systemPropertyVariables>
                 </configuration>
                 <dependencies>
                     <dependency>
@@ -318,9 +321,6 @@
                                 <exclude>**/JdbcTest.java</exclude>
                                 <exclude>**/*LiveTest.java</exclude>
                             </excludes>
-                            <systemPropertyVariables>
-                                <logback.configurationFile>${tutorialsproject.basedir}/logback-config.xml</logback.configurationFile>
-                            </systemPropertyVariables>
                         </configuration>
                     </plugin>
 
@@ -388,9 +388,6 @@
                                 <exclude>**/*JdbcTest.java</exclude>
                                 <exclude>**/*LiveTest.java</exclude>
                             </excludes>
-                            <systemPropertyVariables>
-                                <logback.configurationFile>${tutorialsproject.basedir}/logback-config.xml</logback.configurationFile>
-                            </systemPropertyVariables>
                         </configuration>
                     </plugin>
 
@@ -471,9 +468,6 @@
                                 <include>**/*IntegrationTest.java</include>
                                 <include>**/*IntTest.java</include>
                             </includes>
-                            <systemPropertyVariables>
-                                <logback.configurationFile>${tutorialsproject.basedir}/logback-config.xml</logback.configurationFile>
-                            </systemPropertyVariables>
                         </configuration>
                     </plugin>
                 </plugins>
@@ -530,9 +524,6 @@
                                 <include>**/*IntegrationTest.java</include>
                                 <include>**/*IntTest.java</include>
                             </includes>
-                            <systemPropertyVariables>
-                                <logback.configurationFile>${tutorialsproject.basedir}/logback-config.xml</logback.configurationFile>
-                            </systemPropertyVariables>
                         </configuration>
                     </plugin>
                 </plugins>
@@ -1198,6 +1189,8 @@
         <h2.version>2.1.214</h2.version>
         <guava.version>33.0.0-jre</guava.version>
         <maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
+
+        <logback.configurationFileName>logback-config-global.xml</logback.configurationFileName>
     </properties>
 
 </project>