From 0da54ad5515d51c914f72e71a34585086d8d633c Mon Sep 17 00:00:00 2001
From: Chandrashekar Sankarapu <sankarapu@google.com>
Date: Mon, 4 Mar 2024 23:17:56 +0530
Subject: [PATCH] Fix for logback version upgrade (#969)

* Fix for logback version upgrade

* Addressing the review comments

* Review comments

* Review comments
---
 bunsen/pom.xml    |  2 +-
 pipelines/pom.xml | 30 +++++++++++++++++++++++++++---
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/bunsen/pom.xml b/bunsen/pom.xml
index 47c4d80e6..1c2d9bda2 100644
--- a/bunsen/pom.xml
+++ b/bunsen/pom.xml
@@ -37,7 +37,7 @@
     <maven-javadoc.plugin.version>3.6.3</maven-javadoc.plugin.version>
     <maven-project-info-reports.plugin.version>3.5.0</maven-project-info-reports.plugin.version>
     <slf4j.version>2.0.12</slf4j.version>
-    <logback.version>1.4.12</logback.version>
+    <logback.version>1.5.0</logback.version>
   </properties>
 
   <modules>
diff --git a/pipelines/pom.xml b/pipelines/pom.xml
index de7bc6cbf..ba45b6d5b 100644
--- a/pipelines/pom.xml
+++ b/pipelines/pom.xml
@@ -44,7 +44,7 @@
     <bunsen.version>0.5.14-SNAPSHOT</bunsen.version>
     <junit.version>4.13.2</junit.version>
     <slf4j.version>2.0.12</slf4j.version>
-    <logback.version>1.4.11</logback.version>
+    <logback.version>1.5.0</logback.version>
     <hapifhirVersion>6.10.4</hapifhirVersion>
     <hamcrest.version>2.2</hamcrest.version>
     <mockito.version>5.2.0</mockito.version>
@@ -92,6 +92,32 @@
         <artifactId>jcommander</artifactId>
         <version>${jcommander.version}</version>
       </dependency>
+
+      <!-- In the controller module, we import the pom of the artifact -
+       org.springframework.boot:spring-boot-dependencies to inherit the dependencyManagement
+       section of it. The logback versions defined below will take precedence over the versions
+       defined in the org.springframework.boot:spring-boot-dependencies artifact because the direct
+       dependency takes precedence other the transitive dependency. -->
+      <dependency>
+        <groupId>ch.qos.logback</groupId>
+        <artifactId>logback-classic</artifactId>
+        <version>${logback.version}</version>
+        <scope>runtime</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>ch.qos.logback</groupId>
+        <artifactId>logback-core</artifactId>
+        <version>${logback.version}</version>
+        <scope>runtime</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>ch.qos.logback</groupId>
+        <artifactId>logback-access</artifactId>
+        <version>${logback.version}</version>
+        <scope>runtime</scope>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -105,8 +131,6 @@
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
-      <version>${logback.version}</version>
-      <scope>runtime</scope>
     </dependency>
 
     <!-- Test deps -->