Skip to content

Commit 6847192

Browse files
committed
Update the pom.xml to define image versions
1 parent 423440d commit 6847192

File tree

1 file changed

+10
-18
lines changed

1 file changed

+10
-18
lines changed

distro/pom.xml

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,13 @@
2222
<maven.compiler.source>8</maven.compiler.source>
2323
<maven.compiler.target>8</maven.compiler.target>
2424
<limeEmrVersion>0.1.0</limeEmrVersion>
25-
<referenceApplicationDockerVersion>3.4.0-rc.1</referenceApplicationDockerVersion>
25+
<referenceApplicationDockerVersion>3.4.0</referenceApplicationDockerVersion>
2626
<datafilterVersion>2.3.0-SNAPSHOT</datafilterVersion>
2727
<yamlCombinePluginVersion>2.0.6</yamlCombinePluginVersion>
2828
</properties>
2929

3030
<dependencies>
3131

32-
<dependency>
33-
<groupId>org.openmrs.web</groupId>
34-
<artifactId>openmrs-webapp</artifactId>
35-
<version>${openmrs.version}</version>
36-
<type>war</type>
37-
<scope>provided</scope>
38-
</dependency>
3932

4033
<dependency>
4134
<groupId>org.openmrs.module</groupId>
@@ -48,14 +41,6 @@
4841
<artifactId>datafilter-omod</artifactId>
4942
<version>${datafilterVersion}</version>
5043
</dependency>
51-
52-
<dependency>
53-
<groupId>org.openmrs.module</groupId>
54-
<artifactId>webservices.rest-omod</artifactId>
55-
<version>${webservices.rest.version}</version>
56-
<scope>provided</scope>
57-
</dependency>
58-
5944
</dependencies>
6045

6146
<scm>
@@ -107,6 +92,9 @@
10792
<resource>
10893
<directory>${project.build.directory}/ozone</directory>
10994
<excludes>
95+
<exclude>distro/configs/**/autogenerationoptions/*.*</exclude>
96+
<exclude>distro/configs/**/idgen/*.*</exclude>
97+
<exclude>distro/configs/**/patientidentifiertypes/*.*</exclude>
11098
<!-- Temporarily remove Ozone -->
11199
<exclude>distro/binaries/openmrs/modules/referencedemodata*.omod</exclude>
112100
<!-- Remove Ozone frontend config -->
@@ -239,8 +227,12 @@
239227
<echo level="info" message="Adding msf docker image version"/>
240228
<replaceregexp file="${project.build.directory}/${project.artifactId}-${project.version}/run/docker/.env"
241229
match="O3_DOCKER_IMAGE_TAG=.*" replace="O3_DOCKER_IMAGE_TAG=${referenceApplicationDockerVersion}" />
230+
<replaceregexp file="${project.build.directory}/${project.artifactId}-${project.version}/run/docker/concatenated.env"
231+
match="O3_DOCKER_IMAGE_TAG=.*" replace="O3_DOCKER_IMAGE_TAG=${referenceApplicationDockerVersion}" />
232+
<replace file="${project.build.directory}/${project.artifactId}-${project.version}/run/docker/docker-compose-openmrs.yml"
233+
token="3.2.1" value="${O3_DOCKER_IMAGE_TAG:-nightly}" />
242234
<replace file="${project.build.directory}/${project.artifactId}-${project.version}/run/docker/docker-compose-openmrs.yml"
243-
token="3.0.0-beta.21" value="${O3_DOCKER_IMAGE_TAG:-nightly}" />
235+
token="2.6.14" value="2.7.4" />
244236
</target>
245237
</configuration>
246238
</execution>
@@ -515,4 +507,4 @@
515507
</snapshotRepository>
516508
</distributionManagement>
517509

518-
</project>
510+
</project>

0 commit comments

Comments
 (0)