From 928c4c1c049c8494e16d99a781972aa0dcbd6380 Mon Sep 17 00:00:00 2001
From: smallGod <davies.mugume@gmail.com>
Date: Thu, 11 Apr 2024 08:19:41 +0300
Subject: [PATCH] Add correct dependencies to distro

---
 distro/distro.properties | 54 +++++++++++++++-------------------------
 distro/pom.xml           | 41 +++++++++++++++---------------
 2 files changed, 40 insertions(+), 55 deletions(-)

diff --git a/distro/distro.properties b/distro/distro.properties
index 93eec41c0..1a06702a7 100644
--- a/distro/distro.properties
+++ b/distro/distro.properties
@@ -1,45 +1,31 @@
 name=Ref 3.x distro
 version=${project.version}
 war.openmrs=${openmrs.version}
-omod.initializer=${initializer.version}
 omod.fhir2=${fhir2.version}
-omod.webservices.rest=${webservices.rest.version}
-omod.idgen=${idgen.version}
-omod.legacyui=${legacyui.version}
-omod.addresshierarchy=${addresshierarchy.version}
-omod.metadatamapping=${metadatamapping.version}
-omod.metadatasharing=${metadatasharing.version}
+omod.initializer=${initializer.version}
 omod.openconceptlab=${openconceptlab.version}
-omod.owa=${owa.version}
-
-# omod.referencedemodata=${referencedemodata.version}
-
-omod.attachments=${attachments.version}
-omod.queue=${queue.version}
-#omod.appointments=${appointments.version}
-#omod.appointments.groupId=org.bahmni.module
-#omod.teleconsultation=${teleconsultation.version}
-#omod.teleconsultation.groupId=org.bahmni.module
-omod.cohort=${cohort.version}
+omod.ordertemplates=${ordertemplates.version}
+omod.metadatasharing=${metadatasharing.version}
 omod.reporting=${reporting.version}
 omod.reportingrest=${reportingrest.version}
-omod.calculation=${calculation.version}
+omod.idgen=${idgen.version}
+omod.teleconsultation=${teleconsultation.version}
+omod.teleconsultation.groupId=org.bahmni.module
+omod.metadatamapping=${metadatamapping.version}
+omod.patientflags=${patientflags.version}
+omod.o3forms=${o3forms.version}
 omod.htmlwidgets=${htmlwidgets.version}
 omod.serialization.xstream=${serialization-xstream.version}
 omod.serialization.xstream.type=omod
-omod.ordertemplates=${ordertemplates.version}
-omod.patientflags=${patientflags.version}
-omod.o3forms=${o3forms.version}
-
+omod.addresshierarchy=${addresshierarchy.version}
+omod.attachments=${attachments.version}
+omod.stockmanagement=${stockmanagement.version}
+omod.appointments=${bahmniappointment.version}
+omod.appointments.groupId=org.bahmni.module
+omod.calculation=${calculation.version}
+omod.owa=${owa.version}
+omod.webservices.rest=${webservices.rest.version}
+omod.legacyui=${legacyui.version}
+omod.queue=${queue.version}
 omod.dataexchange=${dataexchange.version}
-omod.appframework=${appframework.version}
-omod.appui=${appui.version}
-omod.htmlformentry=${htmlformentry.version}
-omod.uicommons=${uicommons.version}
-omod.uiframework=${uiframework.version}
-omod.coreapps=${coreapps.version}
-omod.emrapi=${emrapi.version}
-omod.event=${event.version}
-omod.event.groupId=org.openmrs
-omod.providermanagement=${providermanagement.version}
-omod.uilibrary=${uilibrary.version}
+omod.referencedemodata=${referencedemodata.version}
diff --git a/distro/pom.xml b/distro/pom.xml
index ac2910117..a2d6b5c5a 100644
--- a/distro/pom.xml
+++ b/distro/pom.xml
@@ -23,35 +23,34 @@
 
     <!-- track module versions
          we do so here so that we can utilise Maven to track updates, etc. -->
-    <fhir2.version>1.10.0</fhir2.version>
     <openmrs.version>2.6.4</openmrs.version>
+    <fhir2.version>2.0.0-SNAPSHOT</fhir2.version>
     <initializer.version>2.6.0</initializer.version>
-    <webservices.rest.version>2.41.0</webservices.rest.version>
-    <addresshierarchy.version>2.17.0</addresshierarchy.version>
-    <idgen.version>4.10.0</idgen.version>
-    <legacyui.version>1.16.0</legacyui.version>
-    <metadatamapping.version>1.7.0-SNAPSHOT</metadatamapping.version>
-    <metadatasharing.version>1.9.0</metadatasharing.version>
     <openconceptlab.version>2.1.0</openconceptlab.version>
-    <!-- this is request for the OCL UI -->
-    <owa.version>1.14.0</owa.version>
-    <attachments.version>3.1.0</attachments.version>
-
-    <queue.version>2.2.1</queue.version>
-    <!--<appointments.version>2.0.0-20231101.130425-7</appointments.version>
-    <teleconsultation.version>2.0.0-20230831.113926-1</teleconsultation.version>-->
-    <cohort.version>3.6.0</cohort.version>
+    <ordertemplates.version>1.0.2</ordertemplates.version>
+    <metadatasharing.version>1.9.0</metadatasharing.version>
     <reporting.version>1.25.0</reporting.version>
     <reportingrest.version>1.14.0</reportingrest.version>
-    <!-- the next three are required for reporting -->
-    <calculation.version>1.3.0</calculation.version>
+    <idgen.version>4.10.0</idgen.version>
+    <teleconsultation.version>2.0.0-SNAPSHOT</teleconsultation.version>
+    <metadatamapping.version>1.6.0</metadatamapping.version>
+    <patientflags.version>3.0.5</patientflags.version>
+    <o3forms.version>2.1.0</o3forms.version>
     <htmlwidgets.version>1.11.0</htmlwidgets.version>
     <serialization-xstream.version>0.2.16</serialization-xstream.version>
-    <ordertemplates.version>1.0.2</ordertemplates.version>
-    <patientflags.version>3.0.5</patientflags.version>
-    <o3forms.version>2.2.0</o3forms.version>
-
+    <addresshierarchy.version>2.15.2</addresshierarchy.version>
+    <attachments.version>3.0.0</attachments.version>
+    <stockmanagement.version>1.0.2-SNAPSHOT</stockmanagement.version>
+    <bahmniappointment.version>2.0.0-SNAPSHOT</bahmniappointment.version>
+    <calculation.version>1.3.0</calculation.version>
+    <owa.version>1.14.0</owa.version>
+    <webservices.rest.version>2.41.0.756cb3</webservices.rest.version>
+    <legacyui.version>1.16.0-SNAPSHOT</legacyui.version>
+    <queue.version>2.2.2-SNAPSHOT</queue.version>
     <dataexchange.version>1.3.8</dataexchange.version>
+    <referencedemodata.version>2.3.1</referencedemodata.version>
+
+
     <appframework.version>2.17.0</appframework.version>
     <appui.version>1.15.0</appui.version>
     <htmlformentry.version>5.1.0</htmlformentry.version>