From e365734a41ec6a35afe209a2dbf8f0f900dc8c28 Mon Sep 17 00:00:00 2001 From: Vineet Sharma Date: Tue, 18 Jun 2024 23:30:48 +0530 Subject: [PATCH] Revert to dev versions --- distro/pom.xml | 12 +++--- frontend/Dockerfile | 6 +-- frontend/pom.xml | 2 +- frontend/spa-assemble-config.json | 69 ++++++++++++++++--------------- pom.xml | 2 +- 5 files changed, 46 insertions(+), 45 deletions(-) diff --git a/distro/pom.xml b/distro/pom.xml index 2f97e0df8..e2b1a0bf1 100644 --- a/distro/pom.xml +++ b/distro/pom.xml @@ -4,7 +4,7 @@ org.openmrs.distro referenceapplication - 3.0.0-beta.21 + 3.0.0-SNAPSHOT referenceapplication-distro @@ -24,9 +24,9 @@ 2.0.0 - 2.6.6 - 2.7.0-20240521.045407-11 - 2.44.0 + 2.6.7-SNAPSHOT + 2.7.0-SNAPSHOT + 2.45.0-SNAPSHOT 2.17.0 4.10.0 1.16.0 @@ -35,8 +35,8 @@ 2.3.0 3.2.0 2.4.0 - 2.4.0-20240417.172916-4 - 2.0.0-20240305.062514-14 + 2.4.0-SNAPSHOT + 2.0.0-SNAPSHOT 2.0.0-20230831.113926-1 3.7.1 1.26.0 diff --git a/frontend/Dockerfile b/frontend/Dockerfile index d4fc0b688..2e35ff873 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -4,7 +4,7 @@ #-------------------------------------------- FROM --platform=$BUILDPLATFORM node:18-alpine as dev -ARG APP_SHELL_VERSION=5.6.0 +ARG APP_SHELL_VERSION=next RUN mkdir -p /app WORKDIR /app @@ -13,8 +13,8 @@ COPY spa-assemble-config.json . COPY spa-build-config.json . ARG CACHE_BUST -RUN npx --legacy-peer-deps openmrs@${APP_SHELL_VERSION:-5.6.0} assemble --manifest --mode config --config spa-assemble-config.json --target ./spa -RUN npx --legacy-peer-deps openmrs@${APP_SHELL_VERSION:-5.6.0} build --build-config spa-build-config.json --target ./spa +RUN npx --legacy-peer-deps openmrs@${APP_SHELL_VERSION:-next} assemble --manifest --mode config --config spa-assemble-config.json --target ./spa +RUN npx --legacy-peer-deps openmrs@${APP_SHELL_VERSION:-next} build --build-config spa-build-config.json --target ./spa RUN if [ ! -f ./spa/index.html ]; then echo 'Build failed. Please check the logs above for details. This may have happened because of an update to a library that OpenMRS depends on.'; exit 1; fi #-------------------------------------------- diff --git a/frontend/pom.xml b/frontend/pom.xml index 7c95bee8b..3f9daa30a 100644 --- a/frontend/pom.xml +++ b/frontend/pom.xml @@ -4,7 +4,7 @@ org.openmrs.distro referenceapplication - 3.0.0-beta.21 + 3.0.0-SNAPSHOT referenceapplication-frontend diff --git a/frontend/spa-assemble-config.json b/frontend/spa-assemble-config.json index 8eb5334bd..1864054c4 100644 --- a/frontend/spa-assemble-config.json +++ b/frontend/spa-assemble-config.json @@ -1,39 +1,40 @@ { "frontendModules": { - "@openmrs/esm-devtools-app": "5.6.0", - "@openmrs/esm-implementer-tools-app": "5.6.0", - "@openmrs/esm-login-app": "5.6.0", - "@openmrs/esm-primary-navigation-app": "5.6.0", - "@openmrs/esm-home-app": "5.3.0", - "@openmrs/esm-form-engine-app": "8.0.0", - "@openmrs/esm-generic-patient-widgets-app": "8.0.0", - "@openmrs/esm-patient-allergies-app": "8.0.0", - "@openmrs/esm-patient-attachments-app": "8.0.0", - "@openmrs/esm-patient-banner-app": "8.0.0", - "@openmrs/esm-patient-chart-app": "8.0.0", - "@openmrs/esm-patient-conditions-app": "8.0.0", - "@openmrs/esm-patient-forms-app": "8.0.0", - "@openmrs/esm-patient-flags-app": "8.0.0", - "@openmrs/esm-patient-immunizations-app": "8.0.0", - "@openmrs/esm-patient-labs-app": "8.0.0", - "@openmrs/esm-patient-lists-app": "8.0.0", - "@openmrs/esm-patient-medications-app": "8.0.0", - "@openmrs/esm-patient-notes-app": "8.0.0", - "@openmrs/esm-patient-orders-app": "8.0.0", - "@openmrs/esm-patient-programs-app": "8.0.0", - "@openmrs/esm-patient-vitals-app": "8.0.0", - "@openmrs/esm-active-visits-app": "7.0.0", - "@openmrs/esm-appointments-app": "7.0.0", - "@openmrs/esm-service-queues-app": "7.0.0", - "@openmrs/esm-patient-list-management-app": "7.0.0", - "@openmrs/esm-patient-registration-app": "7.0.0", - "@openmrs/esm-patient-search-app": "7.0.0", - "@openmrs/esm-openconceptlab-app": "4.0.3", - "@openmrs/esm-system-admin-app": "4.0.3", - "@openmrs/esm-dispensing-app": "1.3.2", - "@openmrs/esm-fast-data-entry-app": "1.0.0", - "@openmrs/esm-cohort-builder-app": "4.0.0", - "@openmrs/esm-form-builder-app": "2.5.0" + "@openmrs/esm-devtools-app": "next", + "@openmrs/esm-implementer-tools-app": "next", + "@openmrs/esm-login-app": "next", + "@openmrs/esm-primary-navigation-app": "next", + "@openmrs/esm-home-app": "next", + "@openmrs/esm-form-engine-app": "next", + "@openmrs/esm-generic-patient-widgets-app": "next", + "@openmrs/esm-patient-allergies-app": "next", + "@openmrs/esm-patient-attachments-app": "next", + "@openmrs/esm-patient-banner-app": "next", + "@openmrs/esm-patient-chart-app": "next", + "@openmrs/esm-patient-conditions-app": "next", + "@openmrs/esm-patient-forms-app": "next", + "@openmrs/esm-patient-flags-app": "next", + "@openmrs/esm-patient-immunizations-app": "next", + "@openmrs/esm-patient-labs-app": "next", + "@openmrs/esm-patient-lists-app": "next", + "@openmrs/esm-patient-medications-app": "next", + "@openmrs/esm-patient-notes-app": "next", + "@openmrs/esm-patient-orders-app": "next", + "@openmrs/esm-patient-programs-app": "next", + "@openmrs/esm-patient-vitals-app": "next", + "@openmrs/esm-active-visits-app": "next", + "@openmrs/esm-appointments-app": "next", + "@openmrs/esm-service-queues-app": "next", + "@openmrs/esm-patient-list-management-app": "next", + "@openmrs/esm-patient-registration-app": "next", + "@openmrs/esm-patient-search-app": "next", + "@openmrs/esm-openconceptlab-app": "next", + "@openmrs/esm-system-admin-app": "next", + "@openmrs/esm-dispensing-app": "next", + "@openmrs/esm-laboratory-app": "next", + "@openmrs/esm-fast-data-entry-app": "next", + "@openmrs/esm-cohort-builder-app": "next", + "@openmrs/esm-form-builder-app": "next" }, "excludedFrontendModules": [] } diff --git a/pom.xml b/pom.xml index 8a88d85ac..1c417f2c0 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ Package and Run OpenMRS Convenient project to build an OpenMRS distribution and run it - 3.0.0-beta.21 + 3.0.0-SNAPSHOT pom