From 95935a20ecd4b1c32395c37a3992633dbf1e70c7 Mon Sep 17 00:00:00 2001
From: Jayasanka Weerasinghe <33048395+jayasanka-sack@users.noreply.github.com>
Date: Fri, 15 Mar 2024 22:36:41 +0530
Subject: [PATCH] (release-revert) Reset to dev versions

This reverts commit 49cd8227319c23096d02e984e727a247b7ff48c3.
---
 distro/pom.xml                    |  6 +--
 frontend/Dockerfile               |  6 +--
 frontend/pom.xml                  |  2 +-
 frontend/spa-assemble-config.json | 70 +++++++++++++++----------------
 pom.xml                           |  2 +-
 5 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/distro/pom.xml b/distro/pom.xml
index 52470c0fd..90879ce07 100644
--- a/distro/pom.xml
+++ b/distro/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.openmrs.distro</groupId>
     <artifactId>referenceapplication</artifactId>
-    <version>3.0.0-beta.18</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>referenceapplication-distro</artifactId>
@@ -23,7 +23,7 @@
 
     <!-- track module versions
          we do so here so that we can utilise Maven to track updates, etc. -->
-    <fhir2.version>2.0.0</fhir2.version>
+    <fhir2.version>2.0.0-SNAPSHOT</fhir2.version>
     <openmrs.version>2.6.4</openmrs.version>
     <initializer.version>2.6.0</initializer.version>
     <webservices.rest.version>2.41.0</webservices.rest.version>
@@ -40,7 +40,7 @@
     <queue.version>2.2.1</queue.version>
     <appointments.version>2.0.0-20231101.130425-7</appointments.version>
     <teleconsultation.version>2.0.0-20230831.113926-1</teleconsultation.version>
-    <cohort.version>3.7.1</cohort.version>
+    <cohort.version>3.7.0-SNAPSHOT</cohort.version>
     <reporting.version>1.25.0</reporting.version>
     <reportingrest.version>1.14.0</reportingrest.version>
     <!-- the next three are required for reporting -->
diff --git a/frontend/Dockerfile b/frontend/Dockerfile
index 35489eff0..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.5.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.5.0} assemble --manifest --mode config --config spa-assemble-config.json --target ./spa
-RUN npx --legacy-peer-deps openmrs@${APP_SHELL_VERSION:-5.5.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 4ba3cb9bd..fdc5f8ab8 100644
--- a/frontend/pom.xml
+++ b/frontend/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.openmrs.distro</groupId>
     <artifactId>referenceapplication</artifactId>
-    <version>3.0.0-beta.18</version>
+    <version>3.0.0-beta.17</version>
   </parent>
 
   <artifactId>referenceapplication-frontend</artifactId>
diff --git a/frontend/spa-assemble-config.json b/frontend/spa-assemble-config.json
index 25d9d6e2e..aebf581da 100644
--- a/frontend/spa-assemble-config.json
+++ b/frontend/spa-assemble-config.json
@@ -1,40 +1,40 @@
 {
   "frontendModules": {
-    "@openmrs/esm-devtools-app": "5.5.0",
-    "@openmrs/esm-implementer-tools-app": "5.5.0",
-    "@openmrs/esm-login-app": "5.5.0",
-    "@openmrs/esm-primary-navigation-app": "5.5.0",
-    "@openmrs/esm-home-app": "5.2.3",
-    "@openmrs/esm-form-entry-app": "7.1.0",
-    "@openmrs/esm-generic-patient-widgets-app": "7.1.0",
-    "@openmrs/esm-patient-allergies-app": "7.1.0",
-    "@openmrs/esm-patient-appointments-app": "7.1.0",
-    "@openmrs/esm-patient-attachments-app": "7.1.0",
-    "@openmrs/esm-patient-banner-app": "7.1.0",
-    "@openmrs/esm-patient-chart-app": "7.1.0",
-    "@openmrs/esm-patient-conditions-app": "7.1.0",
-    "@openmrs/esm-patient-forms-app": "7.1.0",
-    "@openmrs/esm-patient-flags-app": "7.1.0",
-    "@openmrs/esm-patient-immunizations-app": "7.1.0",
-    "@openmrs/esm-patient-labs-app": "7.1.0",
-    "@openmrs/esm-patient-lists-app": "7.1.0",
-    "@openmrs/esm-patient-medications-app": "7.1.0",
-    "@openmrs/esm-patient-notes-app": "7.1.0",
-    "@openmrs/esm-patient-orders-app": "7.1.0",
-    "@openmrs/esm-patient-programs-app": "7.1.0",
-    "@openmrs/esm-patient-vitals-app": "7.1.0",
-    "@openmrs/esm-active-visits-app": "6.1.0",
-    "@openmrs/esm-appointments-app": "6.1.0",
-    "@openmrs/esm-service-queues-app": "6.1.0",
-    "@openmrs/esm-patient-list-management-app": "6.1.0",
-    "@openmrs/esm-patient-registration-app": "6.1.0",
-    "@openmrs/esm-patient-search-app": "6.1.0",
-    "@openmrs/esm-openconceptlab-app": "4.0.2",
-    "@openmrs/esm-system-admin-app": "4.0.2",
-    "@openmrs/esm-dispensing-app": "1.3.1",
-    "@openmrs/esm-fast-data-entry-app": "1.0.1-pre.139",
-    "@openmrs/esm-cohort-builder-app": "3.0.1-pre.192",
-    "@openmrs/esm-form-builder-app": "2.4.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-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"
   },
   "excludedFrontendModules": []
 }
diff --git a/pom.xml b/pom.xml
index 63c46bea0..1c417f2c0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
   <name>Package and Run OpenMRS</name>
   <description>Convenient project to build an OpenMRS distribution and run it</description>
 
-  <version>3.0.0-beta.18</version>
+  <version>3.0.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <organization>