Skip to content

Commit e4c0929

Browse files
STAND-130: Upgrade Standalone 3.x to use OpenMRS 2.8.x+ and switch SQL import to MariaDbController (#88)
* STAND-130: Upgrade Standalone to use OpenMRS 2.8.x+ * Switching from ScriptRunner to MariaDbController's source method * Updatng dump files from 3.4.0 to 3.6.0-SNAPSHOT * use 2.8.0 instead of snapshot and switch from manual download of war file
1 parent c43fe9c commit e4c0929

File tree

7 files changed

+13281
-9443
lines changed

7 files changed

+13281
-9443
lines changed

pom-step-01.xml

Lines changed: 33 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,43 @@
5757
<testMode>true</testMode>
5858
</configuration>
5959
</execution>
60+
</executions>
61+
</plugin>
62+
<plugin>
63+
<groupId>org.apache.maven.plugins</groupId>
64+
<artifactId>maven-antrun-plugin</artifactId>
65+
<version>3.1.0</version>
66+
<executions>
67+
<execution>
68+
<id>update-stockmanagement</id>
69+
<phase>process-resources</phase>
70+
<configuration>
71+
<target>
72+
<replaceregexp file="${project.build.directory}/openmrs3x/openmrs-distro.properties"
73+
match="omod.stockmanagement=.*"
74+
replace="omod.stockmanagement=${omod.stockmanagement}"/>
75+
<replaceregexp file="${project.build.directory}/openmrs3x/openmrs-distro.properties"
76+
match="war.openmrs=.*"
77+
replace="war.openmrs=${openmrs.version}"/>
78+
</target>
79+
</configuration>
80+
<goals>
81+
<goal>run</goal>
82+
</goals>
83+
</execution>
84+
</executions>
85+
</plugin>
86+
<plugin>
87+
<groupId>org.openmrs.maven.plugins</groupId>
88+
<artifactId>openmrs-sdk-maven-plugin</artifactId>
89+
<version>${openmrs.sdk.version}</version>
90+
<executions>
6091
<execution>
6192
<id>openmrs-sdk:build-distro</id>
6293
<goals>
6394
<goal>build-distro</goal>
6495
</goals>
65-
<phase>generate-resources</phase>
96+
<phase>process-resources</phase>
6697
<configuration>
6798
<distro>${project.build.directory}/openmrs3x/openmrs-distro.properties</distro>
6899
<dir>${project.build.directory}/distro</dir>
@@ -77,7 +108,7 @@
77108
<executions>
78109
<execution>
79110
<id>start-docker-and-wait</id>
80-
<phase>generate-resources</phase>
111+
<phase>process-resources</phase>
81112
<goals>
82113
<goal>exec</goal>
83114
</goals>

pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,13 @@
2121
<liquibase.plugin.version>4.23.2</liquibase.plugin.version>
2222

2323
<tomcat.version>9.0.106</tomcat.version>
24-
<openmrs.version>2.7.4</openmrs.version>
24+
<openmrs.version>2.8.0</openmrs.version>
2525
<refapp.version>3.6.0-SNAPSHOT</refapp.version>
2626
<mariadb4jVersion>3.2.0</mariadb4jVersion>
2727
<junitVersion>5.12.2</junitVersion>
2828
<mockitoVersion>3.12.4</mockitoVersion>
2929
<openmrs.sdk.version>6.5.0</openmrs.sdk.version>
30+
<omod.stockmanagement>2.0.4-core-2.8-SNAPSHOT</omod.stockmanagement>
3031
</properties>
3132

3233
<dependencies>
Lines changed: 6667 additions & 4714 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)