From 50ac200bbe50791ea57fa3f6eba33b7392a2bae2 Mon Sep 17 00:00:00 2001
From: manan164 <1897158+manan164@users.noreply.github.com>
Date: Wed, 7 Feb 2024 10:50:18 +0530
Subject: [PATCH] fix log4j and prometheus issue

---
 archive/build.gradle | 2 +-
 server/build.gradle  | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/archive/build.gradle b/archive/build.gradle
index f63b8f2..0bb65dd 100644
--- a/archive/build.gradle
+++ b/archive/build.gradle
@@ -13,7 +13,7 @@ dependencies {
     implementation "com.fasterxml.jackson.core:jackson-core"
 
     //Metrics
-    implementation "io.micrometer:micrometer-registry-prometheus:1.7.5"
+    implementation "io.micrometer:micrometer-registry-prometheus:1.11.4"
     implementation "io.micrometer:micrometer-core:1.7.5"
     implementation "com.netflix.spectator:spectator-reg-micrometer:${versions.revSpectator}"
     implementation "com.netflix.spectator:spectator-reg-metrics3:${versions.revSpectator}"
diff --git a/server/build.gradle b/server/build.gradle
index 86cf102..7d8d5bf 100644
--- a/server/build.gradle
+++ b/server/build.gradle
@@ -22,7 +22,9 @@ dependencies {
     implementation "org.conductoross:conductor-kafka:${versions.revConductor}"
     implementation "org.conductoross:conductor-metrics:${versions.revConductor}"
 
-    implementation "io.orkes.queues:orkes-conductor-queues:${versions.revOrkesQueues}"
+    implementation ("io.orkes.queues:orkes-conductor-queues:${versions.revOrkesQueues}") {
+        exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j"
+    }
     implementation project(":orkes-conductor-archive")
     implementation project(":orkes-conductor-persistence")
 
@@ -48,7 +50,7 @@ dependencies {
     developmentOnly 'org.springframework.boot:spring-boot-devtools'
 
     runtimeOnly 'com.netflix.spectator:spectator-reg-micrometer'
-    implementation "io.micrometer:micrometer-registry-prometheus:1.7.5"
+    implementation "io.micrometer:micrometer-registry-prometheus:1.11.4"
     implementation "io.micrometer:micrometer-core:1.11.4"