Merge pull request #52 from IsantePlus/update1

upgrade distro
IsantePlus · Sep 21, 2022 · 0e042ab · 0e042ab
2 parents 5aadab6 + 118bf21
commit 0e042ab
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/package/src/main/resources/openmrs-distro.properties b/package/src/main/resources/openmrs-distro.properties
@@ -51,6 +51,8 @@ omod.atomfeed=${atomfeedVersion}
 omod.labintegration=${labintegrationVersion}
 omod.outgoing-message-exceptions=${outgoingMessageExceptionsVersion}
 omod.santedb-mpiclient=${santedbMpiClientVersion}
+omod.isanteplusfhir=${isanteplusFhirVersion}
+omod.labonfhir=${labOnFhirVersion}
 
 db.h2.supported=false
 db.sql=classpath://openmrs-distro.sql
diff --git a/pom.xml b/pom.xml
@@ -27,7 +27,7 @@
 	</scm>
 
 	<properties>
-		<revision>2.3.4</revision>
+		<revision>2.3.5</revision>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<addresshierarchyVersion>2.11.0</addresshierarchyVersion>
 		<adminuiVersion>1.2.3</adminuiVersion>
@@ -45,15 +45,17 @@
 		<emrapiVersion>1.21.0</emrapiVersion>
 		<eventVersion>2.5</eventVersion>
 		<exti18nVersion>1.1.0</exti18nVersion>
-		<fhir2Version>1.3.0</fhir2Version>
+		<fhir2Version>1.5.0</fhir2Version>
 		<formentryappVersion>1.4.2</formentryappVersion>
 		<haiticoreVersion>1.0.0-SNAPSHOT</haiticoreVersion>
 		<htmlformentryuiVersion>1.6.3</htmlformentryuiVersion>
 		<htmlformentryVersion>3.9.2</htmlformentryVersion>
 		<htmlwidgetsVersion>1.9.0</htmlwidgetsVersion>
 		<idgenVersion>4.4.1</idgenVersion>
 		<isanteplusreportsVersion>1.1-SNAPSHOT</isanteplusreportsVersion>
-		<isanteplusVersion>1.4.2</isanteplusVersion>
+		<isanteplusVersion>1.4.3</isanteplusVersion>
+		<isanteplusFhirVersion>1.0.1</isanteplusFhirVersion>
+		<labOnFhirVersion>1.2.0-SNAPSHOT</labOnFhirVersion>
 		<labintegrationVersion>2.2.0</labintegrationVersion>
 		<legacyuiVersion>1.3.1</legacyuiVersion>
 		<m2sys-biometricsVersion>1.2.4</m2sys-biometricsVersion>
@@ -876,6 +878,18 @@
                 <version>${appointmentschedulinguiVersion}</version>
                 <scope>provided</scope>
             </dependency>
+			<dependency>
+				<groupId>org.openmrs.module</groupId>
+				<artifactId>isanteplusfhir-omod</artifactId>
+				<version>${isanteplusFhirVersion}</version>
+				<scope>provided</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.openmrs.module</groupId>
+				<artifactId>labonfhir-omod</artifactId>
+				<version>${labOnFhirVersion}</version>
+				<scope>provided</scope>
+			</dependency>
 
 	<!-- Other dependencies -->
 			<dependency>