From f6430dd50e6273afe6f8a8adb3911ac1401c8c02 Mon Sep 17 00:00:00 2001 From: Kipchumba Bett Date: Tue, 14 Jan 2025 10:43:42 +0300 Subject: [PATCH 1/2] HSC-350: Ozone Haiti to use Pro (SSO + central authorization) --- pom.xml | 20 +++++--------------- scripts/docker-compose-files.txt | 10 +++++++++- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/pom.xml b/pom.xml index b3e1689..66f7015 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,6 @@ 1.0.0-SNAPSHOT - com.ozonehis ozone-haiti 1.0.0-SNAPSHOT @@ -21,21 +20,13 @@ dependencies 2.1.0-SNAPSHOT 1.0.0-SNAPSHOT + + ozone-pro + com.ozonehis + 1.0.0-SNAPSHOT - - com.ozonehis - ozone - zip - 1.0.0-SNAPSHOT - - - com.ozonehis - ozone-scripts - zip - 1.0.0-SNAPSHOT - org.openmrs.module erp-omod @@ -46,7 +37,6 @@ orderexpansion-omod ${orderExpansionVersion} - @@ -68,7 +58,7 @@ true - ${project.build.directory}/ozone + ${project.build.directory}/${ozone.artifactId} distro/configs/**/address*/*demo.* distro/configs/**/concepts/*demo.csv diff --git a/scripts/docker-compose-files.txt b/scripts/docker-compose-files.txt index 537f80d..5cc8fa4 100644 --- a/scripts/docker-compose-files.txt +++ b/scripts/docker-compose-files.txt @@ -1,5 +1,13 @@ docker-compose-common.yml +docker-compose-common-pro.yml +docker-compose-keycloak.yml docker-compose-odoo.yml +docker-compose-odoo-sso.yml docker-compose-openmrs.yml +docker-compose-openmrs-pro.yml +docker-compose-openmrs-sso.yml docker-compose-senaite.yml -docker-compose-override.yml \ No newline at end of file +docker-compose-senaite-sso.yml +docker-compose-eip-keycloak-openmrs.yml +docker-compose-eip-keycloak-odoo.yml +docker-compose-override.yml From 9f843a3717fc66bbb70f48789f85438a4d407192 Mon Sep 17 00:00:00 2001 From: Kipchumba Bett Date: Tue, 14 Jan 2025 11:09:45 +0300 Subject: [PATCH 2/2] HSC-350: Add coordinates to Mekom Nexus private repositories --- pom.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pom.xml b/pom.xml index 66f7015..26e659a 100644 --- a/pom.xml +++ b/pom.xml @@ -227,6 +227,19 @@ OpenMRS Nexus Repository https://mavenrepo.openmrs.org/nexus/content/repositories/public + + mks-nexus-private-releases + Mekom Solutions Nexus repo + https://nexus.mekomsolutions.net/repository/maven-private-releases/ + + + + true + + mks-nexus-private-snapshots + Mekom Solutions Nexus repo for snapshots + https://nexus.mekomsolutions.net/repository/maven-private-snapshots +