From 553d83c1e92319e252620a217137a57207e990ce Mon Sep 17 00:00:00 2001
From: kameshsr <kameshsr1338@gmail.com>
Date: Thu, 17 Oct 2024 13:33:02 +0530
Subject: [PATCH] MOSIP-32458 Removed glowroot

Signed-off-by: kameshsr <kameshsr1338@gmail.com>
---
 resident/resident-service/Dockerfile | 18 +-----------------
 resident/resident-service/pom.xml    | 10 ++++++++++
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/resident/resident-service/Dockerfile b/resident/resident-service/Dockerfile
index 6bc3ce73bb5..07b036e3933 100644
--- a/resident/resident-service/Dockerfile
+++ b/resident/resident-service/Dockerfile
@@ -84,22 +84,6 @@ USER ${container_user_uid}:${container_user_gid}
 
 EXPOSE 8099
 
-CMD if [ "$is_glowroot_env" = "present" ]; then \
-    wget "${artifactory_url_env}"/artifactory/libs-release-local/io/mosip/testing/glowroot.zip ; \
-    wget "${iam_adapter_url_env}" -O "${loader_path_env}"/kernel-auth-adapter.jar; \
-    unzip glowroot.zip ; \
-    rm -rf glowroot.zip ; \
-    sed -i 's/<service_name>/resident-service/g' glowroot/glowroot.properties ; \
-    wget -q --show-progress "${artifactory_url_env}"/artifactory/libs-release-local/io/mosip/kernel/kernel-ref-idobjectvalidator/kernel-ref-idobjectvalidator.jar -O "${loader_path_env}"/kernel-ref-idobjectvalidator.jar ; \
-    wget -q --show-progress "${artifactory_url_env}"/artifactory/libs-release-local/icu4j/icu4j.jar -O "${loader_path_env}"/icu4j.jar ; \
-    wget -q --show-progress "${artifactory_url_env}"/artifactory/libs-release-local/icu4j/kernel-transliteration-icu4j.jar -O "${loader_path_env}"/kernel-transliteration-icu4j.jar ; \
-    java -Dloader.path="${loader_path_env}" -jar -javaagent:glowroot/glowroot.jar -Dspring.cloud.config.label="${spring_config_label_env}" -Dspring.profiles.active="${active_profile_env}" -Dspring.cloud.config.uri="${spring_config_url_env}" resident-service.jar ; \
-    else \
-    wget "${iam_adapter_url_env}" -O "${loader_path_env}"/kernel-auth-adapter.jar; \
-    wget -q --show-progress "${artifactory_url_env}"/artifactory/libs-release-local/io/mosip/kernel/kernel-ref-idobjectvalidator/kernel-ref-idobjectvalidator.jar -O "${loader_path_env}"/kernel-ref-idobjectvalidator.jar ; \
-    wget -q --show-progress "${artifactory_url_env}"/artifactory/libs-release-local/icu4j/icu4j.jar -O "${loader_path_env}"/icu4j.jar ; \
-    wget -q --show-progress "${artifactory_url_env}"/artifactory/libs-release-local/icu4j/kernel-transliteration-icu4j.jar -O "${loader_path_env}"/kernel-transliteration-icu4j.jar ; \
-    java -Dloader.path="${loader_path_env}" -jar -Dspring.cloud.config.label="${spring_config_label_env}" -Dspring.profiles.active="${active_profile_env}" -Dspring.cloud.config.uri="${spring_config_url_env}" resident-service.jar ; \
-    fi
+CMD java -Dloader.path="${loader_path_env}" -jar -Dspring.cloud.config.label="${spring_config_label_env}" -Dspring.profiles.active="${active_profile_env}" -Dspring.cloud.config.uri="${spring_config_url_env}" resident-service.jar ; \
 
 #CMD ["java","-Dspring.cloud.config.label=${spring_config_label_env}","-Dspring.profiles.active=${active_profile_env}","-Dspring.cloud.config.uri=${spring_config_url_env}","-jar","-javaagent:/home/Glowroot/glowroot.jar","resident-service.jar"]
diff --git a/resident/resident-service/pom.xml b/resident/resident-service/pom.xml
index 0bfa9a8242a..a5b16e42b95 100644
--- a/resident/resident-service/pom.xml
+++ b/resident/resident-service/pom.xml
@@ -316,6 +316,16 @@
             <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
             <version>2.6.0</version>
         </dependency>
+        <dependency>
+            <groupId>io.mosip.kernel</groupId>
+            <artifactId>kernel-auth-adapter</artifactId>
+            <version>1.2.1-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>io.mosip.kernel</groupId>
+            <artifactId>kernel-ref-idobjectvalidator</artifactId>
+            <version>1.2.1-SNAPSHOT</version>
+        </dependency>
     </dependencies>
     <build>
         <plugins>