From cc5a6cc3540cf83204b26066aadd38bf60c0ee71 Mon Sep 17 00:00:00 2001
From: Arjun G <91885483+Arjun-Go@users.noreply.github.com>
Date: Wed, 27 Mar 2024 15:10:50 +0530
Subject: [PATCH] update. modules for fhir2 in distro Dockerfile (#187)

---
 distro/pom.xml                    | 24 ++++++++++++------------
 package/docker/openmrs/Dockerfile |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/distro/pom.xml b/distro/pom.xml
index 700e8efa..43b1b259 100644
--- a/distro/pom.xml
+++ b/distro/pom.xml
@@ -48,8 +48,8 @@
         <bahmniIEOmodVersion>1.3.0</bahmniIEOmodVersion>
         <appointmentsVersion>1.8.0-SNAPSHOT</appointmentsVersion>
         <pacsQueryVersion>1.4.0</pacsQueryVersion>
-        <fhir2ModuleVersion>1.10.0-SNAPSHOT</fhir2ModuleVersion>
-        <fhir2ExtensionModuleVersion>1.3.0-SNAPSHOT</fhir2ExtensionModuleVersion>
+<!--        <fhir2ModuleVersion>1.10.0-SNAPSHOT</fhir2ModuleVersion>-->
+<!--        <fhir2ExtensionModuleVersion>1.3.0-SNAPSHOT</fhir2ExtensionModuleVersion>-->
         <openConceptLabVersion>2.1.0</openConceptLabVersion>
         <initializerModuleVersion>2.4.0</initializerModuleVersion>
         <bahmniCommonsVersion>1.1.0-SNAPSHOT</bahmniCommonsVersion>
@@ -190,11 +190,11 @@
             <version>${eventModuleVersion}</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.openmrs.module</groupId>
-            <artifactId>fhir2-omod</artifactId>
-            <version>${fhir2ModuleVersion}</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.openmrs.module</groupId>-->
+<!--            <artifactId>fhir2-omod</artifactId>-->
+<!--            <version>${fhir2ModuleVersion}</version>-->
+<!--        </dependency>-->
 
         <!-- end -->
 
@@ -259,11 +259,11 @@
             <version>${pacsQueryVersion}</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.bahmni.module</groupId>
-            <artifactId>fhir2Extension-omod</artifactId>
-            <version>${fhir2ExtensionModuleVersion}</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.bahmni.module</groupId>-->
+<!--            <artifactId>fhir2Extension-omod</artifactId>-->
+<!--            <version>${fhir2ExtensionModuleVersion}</version>-->
+<!--        </dependency>-->
 
         <dependency>
             <groupId>org.bahmni.module</groupId>
diff --git a/package/docker/openmrs/Dockerfile b/package/docker/openmrs/Dockerfile
index 2b67c4e3..33f9f1b2 100644
--- a/package/docker/openmrs/Dockerfile
+++ b/package/docker/openmrs/Dockerfile
@@ -27,7 +27,7 @@ COPY distro/target/distro/calculation-*.omod  ${OPENMRS_APPLICATION_DATA_DIRECTO
 COPY distro/target/distro/emrapi-*.omod  ${OPENMRS_APPLICATION_DATA_DIRECTORY}/modules
 COPY distro/target/distro/episodes-*.omod  ${OPENMRS_APPLICATION_DATA_DIRECTORY}/modules
 COPY distro/target/distro/event*.omod  ${OPENMRS_APPLICATION_DATA_DIRECTORY}/modules
-COPY distro/target/distro/fhir2*.omod  ${OPENMRS_APPLICATION_DATA_DIRECTORY}/modules
+# COPY distro/target/distro/fhir2*.omod  ${OPENMRS_APPLICATION_DATA_DIRECTORY}/modules  :To be reverted after fhir2 changes are pushed to OpenMRS
 COPY distro/target/distro/htmlwidgets*.omod  ${OPENMRS_APPLICATION_DATA_DIRECTORY}/modules
 COPY distro/target/distro/idgen*.omod  ${OPENMRS_APPLICATION_DATA_DIRECTORY}/modules
 COPY distro/target/distro/initializer*.omod  ${OPENMRS_APPLICATION_DATA_DIRECTORY}/modules