Kavitha|Vikram|updated omod versions and removed manual copy (#198)

Bahmni · Jun 26, 2024 · 81957b2 · 81957b2
1 parent cc5a6cc
commit 81957b2
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 19 deletions.
diff --git a/distro/pom.xml b/distro/pom.xml
@@ -35,7 +35,7 @@
         <metadataMappingVersion>1.5.0</metadataMappingVersion>
         <metadataSharingVersion>1.8.0</metadataSharingVersion>
         <openMRSVersion>2.5.12</openMRSVersion>
-        <operationTheaterVersion>1.7.0</operationTheaterVersion>
+        <operationTheaterVersion>1.8.0</operationTheaterVersion>
         <providerManagementVersion>2.13.0</providerManagementVersion>
         <rulesEngineVersion>1.0.0</rulesEngineVersion>
         <reportingVersion>1.24.0</reportingVersion>
@@ -45,11 +45,11 @@
         <uilibraryVersion>2.0.7</uilibraryVersion>
         <webServicesRestVersion>2.39.0</webServicesRestVersion>
         <reportingRestVersion>1.12.0</reportingRestVersion>
-        <bahmniIEOmodVersion>1.3.0</bahmniIEOmodVersion>
+        <bahmniIEOmodVersion>1.4.0-SNAPSHOT</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>2.1.0</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
@@ -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  :To be reverted after fhir2 changes are pushed to OpenMRS
+COPY distro/target/distro/fhir2*.omod  ${OPENMRS_APPLICATION_DATA_DIRECTORY}/modules
 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
@@ -55,10 +55,6 @@ COPY distro/target/distro/communication*.omod  ${OPENMRS_APPLICATION_DATA_DIRECT
 COPY distro/target/distro/bahmni-events*.omod ${OPENMRS_APPLICATION_DATA_DIRECTORY}/modules
 COPY distro/target/distro/medication-administration*.omod ${OPENMRS_APPLICATION_DATA_DIRECTORY}/modules
 
-# Copy custom omod for operationtheater and remove existing. This is done for temporary purpose. Once the PR in operationtheater is merged, this can be removed.
-RUN rm -rf ${OPENMRS_APPLICATION_DATA_DIRECTORY}/modules/operationtheater-*.omod
-COPY package/resources/operationtheater-*.omod  ${OPENMRS_APPLICATION_DATA_DIRECTORY}/modules
-
 # Copy Configuration Files
 COPY package/docker/openmrs/templates/bahmnicore.properties.template /etc/bahmni-emr/templates/
 COPY package/docker/openmrs/templates/openmrs-runtime.properties.template /etc/bahmni-emr/templates/

diff --git a/package/resources/operationtheater-1.8.0-844d6ee.omod b/package/resources/operationtheater-1.8.0-844d6ee.omod