From ec6bb3e18dca4b54dc3e1fa86f731c09ef785c6f Mon Sep 17 00:00:00 2001 From: Jayasanka <33048395+jayasanka-sack@users.noreply.github.com> Date: Thu, 8 Feb 2024 22:02:16 +0530 Subject: [PATCH] (release) Release 3.0.0-beta.17 --- distro/pom.xml | 8 +-- e2e_test_support_files/extract_tag_numbers.sh | 2 +- frontend/Dockerfile | 6 +- frontend/spa-assemble-config.json | 70 +++++++++---------- pom.xml | 2 +- 5 files changed, 44 insertions(+), 44 deletions(-) diff --git a/distro/pom.xml b/distro/pom.xml index a9fceffa2..35f1690a0 100644 --- a/distro/pom.xml +++ b/distro/pom.xml @@ -4,7 +4,7 @@ org.openmrs.distro referenceapplication - 3.0.0-SNAPSHOT + 3.0.0-beta.17 referenceapplication-distro @@ -24,7 +24,7 @@ 1.10.0 - 2.6.4-SNAPSHOT + 2.6.4 2.6.0 2.41.0 2.17.0 @@ -35,9 +35,9 @@ 2.1.0 1.14.0 - 3.1.0-SNAPSHOT + 3.1.0 2.4.0 - 2.1.0-SNAPSHOT + 2.2.1 2.0.0-20231101.130425-7 2.0.0-20230831.113926-1 3.6.0 diff --git a/e2e_test_support_files/extract_tag_numbers.sh b/e2e_test_support_files/extract_tag_numbers.sh index e607ad4ae..4f5f98ead 100644 --- a/e2e_test_support_files/extract_tag_numbers.sh +++ b/e2e_test_support_files/extract_tag_numbers.sh @@ -17,7 +17,7 @@ get_repository_tag() { echo "$repo_name=$ref" } -file_path="frontend/spa-build-config.json" +file_path="frontend/spa-assemble-config.json" # Call the function for each Repository with the app as the second argument get_repository_tag "$file_path" "patient_management" "@openmrs/esm-patient-registration-app" >> "$GITHUB_OUTPUT" diff --git a/frontend/Dockerfile b/frontend/Dockerfile index 1cff5ca95..b350c333a 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -4,7 +4,7 @@ #-------------------------------------------- FROM --platform=$BUILDPLATFORM node:18-alpine as dev -ARG APP_SHELL_VERSION=next +ARG APP_SHELL_VERSION=5.4.0 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:-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 npx --legacy-peer-deps openmrs@${APP_SHELL_VERSION:-5.4.0} assemble --manifest --mode config --config spa-assemble-config.json --target ./spa +RUN npx --legacy-peer-deps openmrs@${APP_SHELL_VERSION:-5.4.0} 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/spa-assemble-config.json b/frontend/spa-assemble-config.json index aebf581da..4dc5fef02 100644 --- a/frontend/spa-assemble-config.json +++ b/frontend/spa-assemble-config.json @@ -1,40 +1,40 @@ { "frontendModules": { - "@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-entry-app": "next", - "@openmrs/esm-generic-patient-widgets-app": "next", - "@openmrs/esm-patient-allergies-app": "next", - "@openmrs/esm-patient-appointments-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-fast-data-entry-app": "next", - "@openmrs/esm-cohort-builder-app": "next", - "@openmrs/esm-form-builder-app": "next" + "@openmrs/esm-devtools-app": "5.4.0", + "@openmrs/esm-implementer-tools-app": "5.4.0", + "@openmrs/esm-login-app": "5.4.0", + "@openmrs/esm-primary-navigation-app": "5.4.0", + "@openmrs/esm-home-app": "5.2.2", + "@openmrs/esm-form-entry-app": "7.0.1", + "@openmrs/esm-generic-patient-widgets-app": "7.0.1", + "@openmrs/esm-patient-allergies-app": "7.0.1", + "@openmrs/esm-patient-appointments-app": "7.0.1", + "@openmrs/esm-patient-attachments-app": "7.0.1", + "@openmrs/esm-patient-banner-app": "7.0.1", + "@openmrs/esm-patient-chart-app": "7.0.1", + "@openmrs/esm-patient-conditions-app": "7.0.1", + "@openmrs/esm-patient-forms-app": "7.0.1", + "@openmrs/esm-patient-flags-app": "7.0.1", + "@openmrs/esm-patient-immunizations-app": "7.0.1", + "@openmrs/esm-patient-labs-app": "7.0.1", + "@openmrs/esm-patient-lists-app": "7.0.1", + "@openmrs/esm-patient-medications-app": "7.0.1", + "@openmrs/esm-patient-notes-app": "7.0.1", + "@openmrs/esm-patient-orders-app": "7.0.1", + "@openmrs/esm-patient-programs-app": "7.0.1", + "@openmrs/esm-patient-vitals-app": "7.0.1", + "@openmrs/esm-active-visits-app": "6.0.0", + "@openmrs/esm-appointments-app": "6.0.0", + "@openmrs/esm-service-queues-app": "6.0.0", + "@openmrs/esm-patient-list-management-app": "6.0.0", + "@openmrs/esm-patient-registration-app": "6.0.0", + "@openmrs/esm-patient-search-app": "6.0.0", + "@openmrs/esm-openconceptlab-app": "4.0.1", + "@openmrs/esm-system-admin-app": "4.0.1", + "@openmrs/esm-dispensing-app": "1.3.0", + "@openmrs/esm-fast-data-entry-app": "1.0.1-pre.128", + "@openmrs/esm-cohort-builder-app": "3.0.1-pre.183", + "@openmrs/esm-form-builder-app": "2.3.1-pre.677" }, "excludedFrontendModules": [] } diff --git a/pom.xml b/pom.xml index 1c417f2c0..062daf210 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-SNAPSHOT + 3.0.0-beta.17 pom