From 3b97190402fd1ddcc25260a112b34434a0ec7212 Mon Sep 17 00:00:00 2001
From: Darshan Jain <nnd.darshan@gmail.com>
Date: Mon, 11 Mar 2024 17:12:07 +0530
Subject: [PATCH] OT-1147: Updated pom.xml and settings.xml to use
 elimu-codeartifact (#420)

Co-authored-by: djain <djain@elimu.io>
---
 a2d2-api/pom.xml        |  8 ++++----
 a2d2-settings.xml       | 30 +++++++++++++++---------------
 deploy.sh               |  4 ++--
 fhir-helpers/pom.xml    | 12 ++++++------
 generic-helpers/pom.xml |  2 +-
 oauth-helpers/pom.xml   |  2 +-
 pom.xml                 | 30 +++++-------------------------
 task-utilities/pom.xml  |  6 +++---
 8 files changed, 37 insertions(+), 57 deletions(-)

diff --git a/a2d2-api/pom.xml b/a2d2-api/pom.xml
index 9aef0081..0206c385 100644
--- a/a2d2-api/pom.xml
+++ b/a2d2-api/pom.xml
@@ -310,7 +310,7 @@
 		<dependency>
 			<groupId>io.elimu.a2d2</groupId>
 			<artifactId>generic-helpers</artifactId>
-			<version>0.0.17</version>
+			<version>0.0.18</version>
 			<scope>test</scope>
 		</dependency>
 		<!-- web development, including Tomcat and spring-webmvc -->
@@ -653,9 +653,9 @@
 	</dependencies>
 	<distributionManagement>
 		<repository>
-			<id>elimu-a2d2-api</id>
-			<name>elimu-a2d2-api</name>
-			<url>https://elimu-435911253355.d.codeartifact.us-west-2.amazonaws.com/maven/a2d2-api/</url>
+			<id>elimu-elimu-codeartifact</id>
+			<name>elimu-elimu-codeartifact</name>
+			<url>https://elimu-435911253355.d.codeartifact.us-west-2.amazonaws.com/maven/elimu-codeartifact/</url>
 		</repository>
 	</distributionManagement>
 	<build>
diff --git a/a2d2-settings.xml b/a2d2-settings.xml
index 84779370..b6d0f9bb 100644
--- a/a2d2-settings.xml
+++ b/a2d2-settings.xml
@@ -19,18 +19,6 @@
                 </repository>
             </repositories>
         </profile>
-        <profile>
-            <id>elimu-a2d2-api</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <repositories>
-                <repository>
-                    <id>elimu-a2d2-api</id>
-                    <url>https://elimu-435911253355.d.codeartifact.us-west-2.amazonaws.com/maven/a2d2-api/</url>
-                </repository>
-            </repositories>
-        </profile>
         <profile>
             <id>elimu-java-commons</id>
             <activation>
@@ -55,20 +43,32 @@
                 </repository>
             </repositories>
         </profile>
+        <profile>
+            <id>elimu-elimu-codeartifact</id>
+            <activation>
+            <activeByDefault>true</activeByDefault>
+            </activation>
+            <repositories>
+            <repository>
+                <id>elimu-elimu-codeartifact</id>
+                <url>https://elimu-435911253355.d.codeartifact.us-west-2.amazonaws.com/maven/elimu-codeartifact/</url>
+            </repository>
+            </repositories>
+        </profile>
     </profiles>
     <servers>
         <server>
-            <id>elimu-a2d2-api</id>
+            <id>elimu-ecdm</id>
             <username>aws</username>
             <password>${env.CODEARTIFACT_AUTH_TOKEN}</password>
         </server>
         <server>
-            <id>elimu-ecdm</id>
+            <id>elimu-java-commons</id>
             <username>aws</username>
             <password>${env.CODEARTIFACT_AUTH_TOKEN}</password>
         </server>
         <server>
-            <id>elimu-java-commons</id>
+            <id>elimu-elimu-codeartifact</id>
             <username>aws</username>
             <password>${env.CODEARTIFACT_AUTH_TOKEN}</password>
         </server>
diff --git a/deploy.sh b/deploy.sh
index ab69e7eb..6f2da084 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -2,10 +2,10 @@
 
 sub_projects=($(find "$(pwd)" -maxdepth 1 -type d -not -path "$(pwd)" -exec test -e '{}/pom.xml' ';' -printf '%f\n'))
 
-mvn deploy --settings a2d2-settings.xml -Durl=https://elimu-435911253355.d.codeartifact.us-west-2.amazonaws.com/maven/a2d2-api/ -DpomFile=pom.xml -DrepositoryId=elimu-a2d2-api -DupdateReleaseInfo=true -DskipTests -U
+mvn deploy --settings a2d2-settings.xml -Durl=https://elimu-435911253355.d.codeartifact.us-west-2.amazonaws.com/maven/elimu-codeartifact/ -DpomFile=pom.xml -DrepositoryId=elimu-elimu-codeartifact -DupdateReleaseInfo=true -DskipTests -U
 
 for sub_project in "${sub_projects[@]}"; do
     cd "$sub_project" || exit 1
-    mvn deploy --settings ../a2d2-settings.xml -Durl=https://elimu-435911253355.d.codeartifact.us-west-2.amazonaws.com/maven/a2d2-api/ -DpomFile=pom.xml -DrepositoryId=elimu-a2d2-api -DupdateReleaseInfo=true -DskipTests -U
+    mvn deploy --settings ../a2d2-settings.xml -Durl=https://elimu-435911253355.d.codeartifact.us-west-2.amazonaws.com/maven/elimu-codeartifact/ -DpomFile=pom.xml -DrepositoryId=elimu-elimu-codeartifact -DupdateReleaseInfo=true -DskipTests -U
     cd ..
 done
diff --git a/fhir-helpers/pom.xml b/fhir-helpers/pom.xml
index a07da57c..b2839547 100644
--- a/fhir-helpers/pom.xml
+++ b/fhir-helpers/pom.xml
@@ -132,12 +132,12 @@
 			<version>${kotlin-stdlib.version}</version>
 		</dependency>
 	</dependencies>
-       <distributionManagement>
-			<repository>
-				<id>elimu-a2d2-api</id>
-				<name>elimu-a2d2-api</name>
-				<url>https://elimu-435911253355.d.codeartifact.us-west-2.amazonaws.com/maven/a2d2-api/</url>
-			</repository>
+	<distributionManagement>
+		<repository>
+			<id>elimu-elimu-codeartifact</id>
+			<name>elimu-elimu-codeartifact</name>
+			<url>https://elimu-435911253355.d.codeartifact.us-west-2.amazonaws.com/maven/elimu-codeartifact/</url>
+		</repository>
 	</distributionManagement>
 	<build>
 		<plugins>
diff --git a/generic-helpers/pom.xml b/generic-helpers/pom.xml
index d2b65ac0..19c34225 100755
--- a/generic-helpers/pom.xml
+++ b/generic-helpers/pom.xml
@@ -23,7 +23,7 @@
 		<version>0.0.9-SNAPSHOT</version>
 	</parent>
 	<artifactId>generic-helpers</artifactId>
-	<version>0.0.17</version>
+	<version>0.0.18</version>
 	<name>Base helpers for the Generic services</name>
 	<description>Contains WIHInvoker</description>
 
diff --git a/oauth-helpers/pom.xml b/oauth-helpers/pom.xml
index c1771137..dbc529d7 100644
--- a/oauth-helpers/pom.xml
+++ b/oauth-helpers/pom.xml
@@ -27,7 +27,7 @@
 	</parent>
 
 	<artifactId>oauth-helpers</artifactId>
-	<version>0.0.17</version>
+	<version>0.0.18</version>
 	<description>OAuth Helper</description>
 
 	<properties>
diff --git a/pom.xml b/pom.xml
index 01173ab5..726b9d82 100644
--- a/pom.xml
+++ b/pom.xml
@@ -233,7 +233,7 @@
 				<groupId>${project.groupId}</groupId>
 				<artifactId>generic-helpers</artifactId>
 				<!--version>${cds.helper.version}</version-->
-				<version>0.0.17</version>
+				<version>0.0.18</version>
 			</dependency>
 			<dependency>
 				<groupId>${project.groupId}</groupId>
@@ -526,32 +526,12 @@
 	</dependencyManagement>
 	<distributionManagement>
 		<repository>
-			<id>elimu-a2d2-api</id>
-			<name>elimu-a2d2-api</name>
-			<url>https://elimu-435911253355.d.codeartifact.us-west-2.amazonaws.com/maven/a2d2-api/</url>
+			<id>elimu-elimu-codeartifact</id>
+			<name>elimu-elimu-codeartifact</name>
+			<url>https://elimu-435911253355.d.codeartifact.us-west-2.amazonaws.com/maven/elimu-codeartifact/</url>
 		</repository>
 	</distributionManagement>
-	<repositories>
-		<repository>
-			<id>maven-central</id>
-			<name>Maven Central</name>
-			<url>https://repo.maven.apache.org/maven2/</url>
-			<layout>default</layout>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>never</updatePolicy>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-				<updatePolicy>never</updatePolicy>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>elimu-a2d2-api</id>
-			<name>elimu-a2d2-api</name>
-			<url>https://elimu-435911253355.d.codeartifact.us-west-2.amazonaws.com/maven/a2d2-api/</url>
-		</repository>
-	</repositories>
+
 	<build>
 		<plugins>
 			<plugin>
diff --git a/task-utilities/pom.xml b/task-utilities/pom.xml
index 6a91dda4..ddf4c724 100644
--- a/task-utilities/pom.xml
+++ b/task-utilities/pom.xml
@@ -215,9 +215,9 @@
 	</dependencies>
 	<distributionManagement>
 		<repository>
-			<id>elimu-a2d2-api</id>
-			<name>elimu-a2d2-api</name>
-			<url>https://elimu-435911253355.d.codeartifact.us-west-2.amazonaws.com/maven/a2d2-api/</url>
+			<id>elimu-elimu-codeartifact</id>
+			<name>elimu-elimu-codeartifact</name>
+			<url>https://elimu-435911253355.d.codeartifact.us-west-2.amazonaws.com/maven/elimu-codeartifact/</url>
 		</repository>
 	</distributionManagement>
 	<build>