From e31a018da15481557c0d7eb16cdc6b1a6cdbc6e5 Mon Sep 17 00:00:00 2001
From: rathnapandi <rathnapandi.n@gmail.com>
Date: Tue, 22 Aug 2023 10:51:34 -0700
Subject: [PATCH] - cleanup pom file

---
 distribution/pom.xml          | 21 ++++++++++++------
 modules/apim-cli/pom.xml      |  3 ++-
 modules/apis/pom.xml          |  2 ++
 modules/apps/pom.xml          |  3 +++
 modules/organizations/pom.xml |  3 +++
 modules/settings/pom.xml      |  2 ++
 modules/spectoconfig/pom.xml  |  2 ++
 modules/users/pom.xml         |  2 ++
 pom.xml                       | 41 +----------------------------------
 9 files changed, 31 insertions(+), 48 deletions(-)

diff --git a/distribution/pom.xml b/distribution/pom.xml
index a00210f08..8e20b0aaa 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -19,31 +19,38 @@
 		<dependency>
 			<groupId>com.github.axway-api-management-plus.apim-cli</groupId>
 			<artifactId>apimcli-apim-adapter</artifactId>
-		</dependency>
+            <version>${project.version}</version>
+        </dependency>
 		<dependency>
 			<groupId>com.github.axway-api-management-plus.apim-cli</groupId>
 			<artifactId>apimcli-apis</artifactId>
-		</dependency>
+            <version>${project.version}</version>
+        </dependency>
 		<dependency>
 			<groupId>com.github.axway-api-management-plus.apim-cli</groupId>
 			<artifactId>apimcli-apps</artifactId>
-		</dependency>
+            <version>${project.version}</version>
+        </dependency>
 		<dependency>
 			<groupId>com.github.axway-api-management-plus.apim-cli</groupId>
 			<artifactId>apimcli-organizations</artifactId>
-		</dependency>
+            <version>${project.version}</version>
+        </dependency>
 		<dependency>
 			<groupId>com.github.axway-api-management-plus.apim-cli</groupId>
 			<artifactId>apimcli-users</artifactId>
-		</dependency>
+            <version>${project.version}</version>
+        </dependency>
 		<dependency>
 			<groupId>com.github.axway-api-management-plus.apim-cli</groupId>
 			<artifactId>apimcli-settings</artifactId>
-		</dependency>
+            <version>${project.version}</version>
+        </dependency>
 		<dependency>
 			<groupId>com.github.axway-api-management-plus.apim-cli</groupId>
 			<artifactId>apimcli-spectoconfig</artifactId>
-		</dependency>
+            <version>${project.version}</version>
+        </dependency>
 	</dependencies>
 
 	<build>
diff --git a/modules/apim-cli/pom.xml b/modules/apim-cli/pom.xml
index 8533de015..3784e96b0 100644
--- a/modules/apim-cli/pom.xml
+++ b/modules/apim-cli/pom.xml
@@ -18,7 +18,8 @@
 		<dependency>
 			<groupId>com.github.axway-api-management-plus.apim-cli</groupId>
 			<artifactId>apimcli-apim-adapter</artifactId>
-		</dependency>
+            <version>${project.version}</version>
+        </dependency>
 		<dependency>
 			<groupId>org.testng</groupId>
 			<artifactId>testng</artifactId>
diff --git a/modules/apis/pom.xml b/modules/apis/pom.xml
index 7517325f4..b25ca2e47 100644
--- a/modules/apis/pom.xml
+++ b/modules/apis/pom.xml
@@ -18,10 +18,12 @@
         <dependency>
             <groupId>com.github.axway-api-management-plus.apim-cli</groupId>
             <artifactId>apimcli-apim-adapter</artifactId>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>com.github.axway-api-management-plus.apim-cli</groupId>
             <artifactId>apimcli-tool</artifactId>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
diff --git a/modules/apps/pom.xml b/modules/apps/pom.xml
index 02fecc37f..4fc189a1d 100644
--- a/modules/apps/pom.xml
+++ b/modules/apps/pom.xml
@@ -18,14 +18,17 @@
         <dependency>
             <groupId>com.github.axway-api-management-plus.apim-cli</groupId>
             <artifactId>apimcli-tool</artifactId>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>com.github.axway-api-management-plus.apim-cli</groupId>
             <artifactId>apimcli-apim-adapter</artifactId>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>com.github.axway-api-management-plus.apim-cli</groupId>
             <artifactId>apimcli-apis</artifactId>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
diff --git a/modules/organizations/pom.xml b/modules/organizations/pom.xml
index 37f6af99c..331b46ff9 100644
--- a/modules/organizations/pom.xml
+++ b/modules/organizations/pom.xml
@@ -18,14 +18,17 @@
         <dependency>
             <groupId>com.github.axway-api-management-plus.apim-cli</groupId>
             <artifactId>apimcli-tool</artifactId>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>com.github.axway-api-management-plus.apim-cli</groupId>
             <artifactId>apimcli-apim-adapter</artifactId>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>com.github.axway-api-management-plus.apim-cli</groupId>
             <artifactId>apimcli-apis</artifactId>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
diff --git a/modules/settings/pom.xml b/modules/settings/pom.xml
index a29bab176..43692373e 100644
--- a/modules/settings/pom.xml
+++ b/modules/settings/pom.xml
@@ -18,10 +18,12 @@
         <dependency>
             <groupId>com.github.axway-api-management-plus.apim-cli</groupId>
             <artifactId>apimcli-apim-adapter</artifactId>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>com.github.axway-api-management-plus.apim-cli</groupId>
             <artifactId>apimcli-tool</artifactId>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
diff --git a/modules/spectoconfig/pom.xml b/modules/spectoconfig/pom.xml
index 44de0cbe5..491aedb4b 100644
--- a/modules/spectoconfig/pom.xml
+++ b/modules/spectoconfig/pom.xml
@@ -15,10 +15,12 @@
         <dependency>
             <groupId>com.github.axway-api-management-plus.apim-cli</groupId>
             <artifactId>apimcli-apim-adapter</artifactId>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>com.github.axway-api-management-plus.apim-cli</groupId>
             <artifactId>apimcli-tool</artifactId>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.testng</groupId>
diff --git a/modules/users/pom.xml b/modules/users/pom.xml
index f91452166..c714b89f5 100644
--- a/modules/users/pom.xml
+++ b/modules/users/pom.xml
@@ -18,10 +18,12 @@
         <dependency>
             <groupId>com.github.axway-api-management-plus.apim-cli</groupId>
             <artifactId>apimcli-apim-adapter</artifactId>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>com.github.axway-api-management-plus.apim-cli</groupId>
             <artifactId>apimcli-tool</artifactId>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
diff --git a/pom.xml b/pom.xml
index 88ef63ba6..3efe5874b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,6 +52,7 @@
         <skip.integration.tests>true</skip.integration.tests>
         <skip.unit.tests>false</skip.unit.tests>
         <sonar.organization>axway-api-management-plus</sonar.organization>
+        <sonar.sourceEncoding>UTF-8</sonar.sourceEncoding>
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>
         <wiremock.version>2.35.0</wiremock.version>
         <citrus.version>3.4.0</citrus.version>
@@ -86,46 +87,6 @@
     </modules>
     <dependencyManagement>
         <dependencies>
-            <dependency>
-                <groupId>com.github.axway-api-management-plus.apim-cli</groupId>
-                <artifactId>apimcli-apim-adapter</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.github.axway-api-management-plus.apim-cli</groupId>
-                <artifactId>apimcli-apis</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.github.axway-api-management-plus.apim-cli</groupId>
-                <artifactId>apimcli-apps</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.github.axway-api-management-plus.apim-cli</groupId>
-                <artifactId>apimcli-organizations</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.github.axway-api-management-plus.apim-cli</groupId>
-                <artifactId>apimcli-users</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.github.axway-api-management-plus.apim-cli</groupId>
-                <artifactId>apimcli-tool</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.github.axway-api-management-plus.apim-cli</groupId>
-                <artifactId>apimcli-settings</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.github.axway-api-management-plus.apim-cli</groupId>
-                <artifactId>apimcli-spectoconfig</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpclient</artifactId>