DB hang and isanteplus version update (#40)

* DB refactoring * Updated db files and isanteplus version
IsantePlus · Jan 31, 2022 · 2e6d10a · 2e6d10a
1 parent 79294cd
commit 2e6d10a
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6,879 deletions.
diff --git a/package/pom.xml b/package/pom.xml
@@ -30,7 +30,6 @@
     </scm>
 
     <properties>
-        <sql.output.path>${basedir}/src/main/resources/openmrs-distro.sql</sql.output.path>
         <sql.db.path>${basedir}/src/main/resources/</sql.db.path>
     </properties>
     <build>
@@ -45,11 +44,10 @@
                         <id>Merge SQL Files</id>
                         <phase>generate-resources</phase>
                         <configuration>
-                            <target>
-                                <concat destfile="${sql.output.path}" overwrite="yes">
-                                    <filelist dir="${sql.db.path}" files="initial-db.sql,isanteplus-concepts.sql"></filelist>
-                                </concat>
-                            </target>
+                            <tasks>
+                                <echo message="unzipping file" />
+                                <unzip src="${sql.db.path}/openmrs-distro.sql.zip" dest="${sql.db.path}" overwrite="true" />
+                            </tasks>
                         </configuration>
                         <goals>
                             <goal>run</goal>

diff --git a/package/src/main/resources/initial-db.sql b/package/src/main/resources/initial-db.sql
diff --git a/package/src/main/resources/isanteplus-concepts.sql b/package/src/main/resources/isanteplus-concepts.sql
diff --git a/package/src/main/resources/openmrs-distro.sql.zip b/package/src/main/resources/openmrs-distro.sql.zip
diff --git a/pom.xml b/pom.xml
@@ -23,11 +23,11 @@
 		<connection>scm:git:[email protected]:isanteplus/openmrs-distro-isanteplus.git</connection>
 		<developerConnection>scm:git:[email protected]:isanteplus/openmrs-distro-isanteplus.git</developerConnection>
 		<url>https://github.com/isanteplus/openmrs-distro-isanteplus</url>
-	  	<tag>2.6.0</tag>
-  	</scm>
+		<tag>v2.2.0</tag>
+	</scm>
 
 	<properties>
-		<revision>2.1.1</revision>
+		<revision>2.2.0</revision>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<addresshierarchyVersion>2.11.0</addresshierarchyVersion>
 		<adminuiVersion>1.2.3</adminuiVersion>