From 5293d9dd630deb6a07599b330a3c7ff3c13c192f Mon Sep 17 00:00:00 2001
From: Rahul Ramesh <rahul.ramesh@thoughtworks.com>
Date: Thu, 26 Oct 2023 12:16:49 +0530
Subject: [PATCH] [Parvathy, Rahul] | Refactor. Dependency Clean Up

---
 openerp-atomfeed-service/pom.xml | 55 +++++++++-----------------------
 pom.xml                          | 32 +++++++++----------
 2 files changed, 31 insertions(+), 56 deletions(-)

diff --git a/openerp-atomfeed-service/pom.xml b/openerp-atomfeed-service/pom.xml
index 50f6319f..75b0339a 100644
--- a/openerp-atomfeed-service/pom.xml
+++ b/openerp-atomfeed-service/pom.xml
@@ -8,38 +8,28 @@
         <version>0.94-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-
     <groupId>org.bahmni.openerp</groupId>
     <artifactId>openerp-atomfeed-service</artifactId>
     <version>0.94-SNAPSHOT</version>
     <packaging>war</packaging>
-
     <name>openerp-atomfeed-service</name>
     <url>http://maven.apache.org</url>
-
     <dependencies>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpcore</artifactId>
             <version>${httpcore.version}</version>
         </dependency>
-        
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
             <version>2.4</version>
         </dependency>
-        <!-- Spring core & mvc -->
         <dependency>
             <groupId>org.ict4h</groupId>
             <artifactId>atomfeed-client</artifactId>
             <version>${atomfeed.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.bahmni.module</groupId>
-            <artifactId>web-clients</artifactId>
-            <version>${web-clients.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.ict4h</groupId>
             <artifactId>atomfeed-spring-server</artifactId>
@@ -57,7 +47,6 @@
             <artifactId>atomfeed-server</artifactId>
             <version>${atomfeed.version}</version>
             <type>test-jar</type>
-
         </dependency>
         <dependency>
             <groupId>org.postgresql</groupId>
@@ -68,15 +57,6 @@
             <artifactId>aspectjweaver</artifactId>
             <version>1.7.1</version>
         </dependency>
-        <!--
-        Make all spring dependencies provided
-        -->
-        
-        <dependency>
-            <groupId>org.quartz-scheduler</groupId>
-            <artifactId>quartz</artifactId>
-            <version>${quartz.version}</version>
-        </dependency>
         <!-- CGLib for @Configuration -->
         <dependency>
             <groupId>cglib</groupId>
@@ -84,8 +64,6 @@
             <version>${cglib.version}</version>
             <scope>runtime</scope>
         </dependency>
-
-
         <!-- Servlet Spec -->
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -125,6 +103,21 @@
             <version>1.3</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>javax.mail</groupId>
+            <artifactId>mail</artifactId>
+            <version>1.4.1</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>${javax.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.bahmni.module</groupId>
+            <artifactId>web-clients</artifactId>
+            <version>${web-clients.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.bahmni.module</groupId>
             <artifactId>mail-appender</artifactId>
@@ -137,23 +130,7 @@
             <version>0.94-SNAPSHOT</version>
             <type>jar</type>
         </dependency>
-        <dependency>
-            <groupId>javax.mail</groupId>
-            <artifactId>mail</artifactId>
-            <version>1.4.1</version>
-        </dependency>
-        <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
-            <version>${javax.version}</version>
-        </dependency>
-        <dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-quartz</artifactId>
-			<version>3.1.5</version>
-		</dependency>
     </dependencies>
-
     <build>
         <finalName>openerp-atomfeed-service</finalName>
         <plugins>
@@ -192,8 +169,6 @@
             </plugin>
         </plugins>
     </build>
-
-
     <profiles>
         <profile>
             <id>Windows</id>
diff --git a/pom.xml b/pom.xml
index a7261c33..c909267c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,8 +21,8 @@
 	<properties>
 		<java.version>17</java.version>
         <cglib.version>2.2.2</cglib.version>
-        <quartz.version>2.3.2</quartz.version>
         <atomfeed.version>1.10.1</atomfeed.version>
+		<psql.version>42.2.23</psql.version>
         <!--<db.server>10.4.33.112</db.server>-->
         <db.server>localhost</db.server>
         <db.name>odoo</db.name>
@@ -30,15 +30,21 @@
         <db.user>postgres</db.user>
         <db.password>postgres</db.password>
         <db.schema>public</db.schema>
-        <jackson.version>2.13.1</jackson.version>
-        <httpcore.version>4.4.5</httpcore.version>
-        <httpClient.version>4.5.2</httpClient.version>
+		<httpClient.version>4.5.2</httpClient.version>
         <servlet-api.version>3.0.1</servlet-api.version>
         <log4j.version>2.17.1</log4j.version>
         <web-clients.version>0.94.3</web-clients.version>
 		<javax.version>1.3.2</javax.version>
     </properties>
 	<dependencies>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-quartz</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-data-jpa</artifactId>
@@ -47,7 +53,11 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
-
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>com.h2database</groupId>
 			<artifactId>h2</artifactId>
@@ -56,24 +66,14 @@
 		<dependency>
 			<groupId>org.postgresql</groupId>
 			<artifactId>postgresql</artifactId>
-			<version>42.6.0</version>
+			<version>${psql.version}</version>
 			<scope>runtime</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
             <groupId>javax.annotation</groupId>
             <artifactId>javax.annotation-api</artifactId>
             <version>${javax.version}</version>
         </dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-quartz</artifactId>
-			<version>3.1.5</version>
-		</dependency>
 		<dependency>
 			<groupId>org.apache.velocity</groupId>
 			<artifactId>velocity</artifactId>