From 6bfbdf3a5a2621057a2b7a1eb892ff0fd6300ff6 Mon Sep 17 00:00:00 2001
From: nravilla <nirupakanthi@gmail.com>
Date: Thu, 18 Jul 2024 16:19:08 -0400
Subject: [PATCH 01/14] validates content.properties and creates a zip file

---
 assembly.xml                                  |  26 ++++
 content.properties                            |   6 +-
 pom.xml                                       | 114 ++++++++++++++++--
 .../model/ContentPropertiesValidator.java     |  95 +++++++++++++++
 .../model/ContentPropertiesValidatorTest.java |  56 +++++++++
 5 files changed, 287 insertions(+), 10 deletions(-)
 create mode 100644 assembly.xml
 create mode 100644 src/main/java/org/openmrs/maven/plugins/model/ContentPropertiesValidator.java
 create mode 100644 src/test/java/org/openmrs/maven/plugins/model/ContentPropertiesValidatorTest.java

diff --git a/assembly.xml b/assembly.xml
new file mode 100644
index 0000000..dd2dcef
--- /dev/null
+++ b/assembly.xml
@@ -0,0 +1,26 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 
+                              http://maven.apache.org/xsd/assembly-1.1.3.xsd">
+  <id>null</id>
+  <formats>
+    <format>zip</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <fileSets>
+    <fileSet>
+      <directory>${project.basedir}</directory>
+      <outputDirectory>/</outputDirectory>
+      <includes>
+        <include>content.properties</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>configuration</directory>
+      <outputDirectory>/configuration</outputDirectory>
+      <includes>
+        <include>**/*</include>
+      </includes>
+    </fileSet>
+  </fileSets> 
+</assembly>
diff --git a/content.properties b/content.properties
index fd7a46a..0d39d1d 100644
--- a/content.properties
+++ b/content.properties
@@ -1,8 +1,8 @@
 #name=Ref 3.x distro
 #version=3.0.0
 #war.openmrs=2.6.1-SNAPSHOT
-omod.fhir2=1.9.0
+omod.fhir2=1.2.3
 omod.webservices.rest=2.40.0-SNAPSHOT
-spa.frontendModules.@ohri/openmrs-esm-ohri-hiv-care-treatment-app=latest
-spa.frontendModules.@ohri/openmrs-esm-ohri-core-app=latest
+spa.frontendModules.@ohri/openmrs-esm-ohri-hiv-care-treatment-app=2.40.0-SNAPSHOT
+spa.frontendModules.@ohri/openmrs-esm-ohri-core-app=2.40.0-SNAPSHOT
 #spa.frontendModules.@openmrs/esm-primary-navigation-app=next
diff --git a/pom.xml b/pom.xml
index 328a620..41106c2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,9 +1,109 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project
+	xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.openmrs</groupId>
-  <artifactId>openmrs-content-hiv</artifactId>
-  <version>1.0-SNAPSHOT</version>
-  <name>Archetype - openmrs-content-hiv</name>
-  <url>http://maven.apache.org</url>
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.openmrs</groupId>
+	<artifactId>content.hiv</artifactId>
+	<version>1.0.0-SNAPSHOT</version>
+	<packaging>jar</packaging>
+	<name>HIV Care and Treatment Content Package</name>
+	<description>Content package for HIV care and treatment module in OpenMRS</description>
+	<url>https://openmrs.org</url>
+	<developers>
+		<developer>
+			<name>OpenMRS</name>
+			<organization>OpenMRS</organization>
+			<organizationUrl>http://openmrs.org</organizationUrl>
+		</developer>
+	</developers>
+	<scm>
+		<connection>scm:git:git@github.com:openmrs/openmrs-content-hiv.git</connection>
+		<developerConnection>scm:git:git@github.com:openmrs/openmrs-content-hiv.git</developerConnection>
+		<url>https://github.com/openmrs/openmrs-content-hiv.git</url>
+		<tag>HEAD</tag>
+	</scm>
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<maven.compiler.source>1.8</maven.compiler.source>
+		<maven.compiler.target>1.8</maven.compiler.target>
+	</properties>
+	<dependencies>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.13.2</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.8.1</version>
+				<configuration>
+					<source>1.8</source>
+					<target>1.8</target>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<version>3.0.0</version>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>run</goal>
+						</goals>
+						<configuration>
+							<target>
+								<java classname="org.openmrs.maven.plugins.model.ContentPropertiesValidator" fork="true" failonerror="true">
+									<arg value="${project.basedir}/content.properties"/>
+									<classpath>
+										<path refid="maven.runtime.classpath"/>
+									</classpath>
+								</java>
+							</target>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<version>3.3.0</version>
+				<executions>
+					<execution>
+						<id>make-assembly</id>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+						<configuration>
+							<descriptors>
+								<descriptor>${project.basedir}/assembly.xml</descriptor>
+							</descriptors>
+							<appendAssemblyId>false</appendAssemblyId>
+							<!-- Ensure this is set to false -->
+							<finalName>${project.artifactId}-${project.version}</finalName>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+	<distributionManagement>
+		<repository>
+			<id>openmrs-repo-releases</id>
+			<name>OpenMRS Nexus Releases</name>
+			<url>https://mavenrepo.openmrs.org/nexus/content/repositories/releases</url>
+		</repository>
+		<snapshotRepository>
+			<id>openmrs-repo-snapshots</id>
+			<name>OpenMRS Nexus Snapshots</name>
+			<url>https://mavenrepo.openmrs.org/nexus/content/repositories/snapshots</url>
+		</snapshotRepository>
+	</distributionManagement>
 </project>
diff --git a/src/main/java/org/openmrs/maven/plugins/model/ContentPropertiesValidator.java b/src/main/java/org/openmrs/maven/plugins/model/ContentPropertiesValidator.java
new file mode 100644
index 0000000..f69b96f
--- /dev/null
+++ b/src/main/java/org/openmrs/maven/plugins/model/ContentPropertiesValidator.java
@@ -0,0 +1,95 @@
+package org.openmrs.maven.plugins.model;
+
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
+import java.util.regex.Pattern;
+
+/**
+ * This class is used by Maven to perform validation of property values based on a semantic versioning format using regular expressions.
+ * It validates whether the property values in a given properties file match the expected semantic versioning patterns.
+ * The validation includes support for range operators and excludes specific non-version strings like "latest".
+ * 
+ */
+public class ContentPropertiesValidator {
+
+    // Enhanced regex pattern to include range operators and support pre-release and build metadata
+    private static final Pattern VERSION_PATTERN = Pattern.compile(
+        "^(\\s*[=><~^]*\\s*\\d+(\\.\\d+){0,2}(-[0-9A-Za-z-]+(\\.[0-9A-Za-z-]+)*)?(\\+[0-9A-Za-z-]+(\\.[0-9A-Za-z-]+)*)?)" +
+        "(\\s*(-|\\|\\|)\\s*[=><~^]*\\s*\\d+(\\.\\d+){0,2}(-[0-9A-Za-z-]+(\\.[0-9A-Za-z-]+)*)?(\\+[0-9A-Za-z-]+(\\.[0-9A-Za-z-]+)*)?)*$"
+    );
+
+    /**
+     * Validates the properties in the given file.
+     *
+     * @param filePath the path to the properties file
+     * @return true if all property values are valid version formats, false otherwise
+     * @throws IOException if an error occurs while reading the file
+     */
+    public static boolean validateProperties(String filePath) throws IOException {
+        try (InputStream input = new FileInputStream(filePath)) {
+            Properties properties = new Properties();
+            properties.load(input);
+
+            for (String key : properties.stringPropertyNames()) {
+                String value = properties.getProperty(key);
+                if (!isValidVersion(value)) {
+                    System.out.println("Invalid version format for key: " + key + ", value: " + value);
+                    return false;
+                }
+            }
+            return true;
+        } catch (IOException e) {
+            System.err.println("Error reading properties file: " + e.getMessage());
+            throw e;
+        }
+    }
+
+    /**
+     * Cleans the value by trimming whitespace.
+     *
+     * @param value the value to clean
+     * @return the cleaned value
+     */
+    private static String cleanValue(String value) {
+        return value.trim();
+    }
+
+    /**
+     * Checks if the given value is a valid version format.
+     *
+     * @param value the value to check
+     * @return true if the value is a valid version format, false otherwise
+     */
+    protected static boolean isValidVersion(String value) {
+        value = cleanValue(value);
+        // Exclude "latest" explicitly
+        if ("latest".equalsIgnoreCase(value)) {
+            return false;
+        }
+        return VERSION_PATTERN.matcher(value).matches();
+    }
+
+    public static void main(String[] args) {
+        if (args.length != 1) {
+            System.out.println("Usage: java org.openmrs.maven.plugins.model.ContentPropertiesValidator <properties-file-path>");
+            System.exit(1);
+        }
+
+        String filePath = args[0];
+        try {
+            boolean isValid = validateProperties(filePath);
+            if (isValid) {
+                System.out.println("All properties have valid version formats.");
+                System.exit(0);  // Exit with zero status to indicate success
+            } else {
+                System.out.println("Some properties have invalid version formats.");
+                System.exit(1);  // Exit with non-zero status to indicate failure
+            }
+        } catch (IOException e) {
+            System.err.println("Error reading properties file: " + e.getMessage());
+            System.exit(1);  // Exit with non-zero status to indicate failure
+        }
+    }
+}
diff --git a/src/test/java/org/openmrs/maven/plugins/model/ContentPropertiesValidatorTest.java b/src/test/java/org/openmrs/maven/plugins/model/ContentPropertiesValidatorTest.java
new file mode 100644
index 0000000..9404997
--- /dev/null
+++ b/src/test/java/org/openmrs/maven/plugins/model/ContentPropertiesValidatorTest.java
@@ -0,0 +1,56 @@
+package org.openmrs.maven.plugins.model;
+
+import org.junit.Test;
+import org.junit.Before;
+import static org.junit.Assert.*;
+
+public class ContentPropertiesValidatorTest {
+
+    @Before
+    public void setUp() {
+        // Initialization if necessary
+    }
+
+    @Test
+    public void testValidVersions() {
+        assertTrue(ContentPropertiesValidator.isValidVersion("0.13.0"));
+        assertTrue(ContentPropertiesValidator.isValidVersion("3.0.0"));
+        assertTrue(ContentPropertiesValidator.isValidVersion("1.0.0"));
+    }
+
+    @Test
+    public void testValidVersionRanges() {
+        assertTrue(ContentPropertiesValidator.isValidVersion("^0.13.0"));
+        assertTrue(ContentPropertiesValidator.isValidVersion("~0.13.0"));
+        assertTrue(ContentPropertiesValidator.isValidVersion(">0.13.0"));
+        assertTrue(ContentPropertiesValidator.isValidVersion("<3.0.0"));
+        assertTrue(ContentPropertiesValidator.isValidVersion(">=3.0.0"));
+        assertTrue(ContentPropertiesValidator.isValidVersion("<=3.0.0"));
+        assertTrue(ContentPropertiesValidator.isValidVersion("=3.0.0"));
+        assertTrue(ContentPropertiesValidator.isValidVersion("1.0.0 - 1.10.10"));
+        assertTrue(ContentPropertiesValidator.isValidVersion("<2.1.0 || >2.6.0"));
+        assertTrue(ContentPropertiesValidator.isValidVersion("=3.0.0"));
+    }
+
+    @Test
+    public void testInvalidVersions() {
+        assertFalse(ContentPropertiesValidator.isValidVersion("abc"));
+        assertFalse(ContentPropertiesValidator.isValidVersion("1..0"));
+        assertFalse(ContentPropertiesValidator.isValidVersion("1.0.0.0"));
+        assertFalse(ContentPropertiesValidator.isValidVersion("latest")); // Ensure "latest" is not valid
+    }
+
+    @Test
+    public void testPreReleaseAndBuildMetadata() {
+        assertTrue(ContentPropertiesValidator.isValidVersion("1.0.0-alpha"));
+        assertTrue(ContentPropertiesValidator.isValidVersion("1.0.0+20130313144700"));
+        assertTrue(ContentPropertiesValidator.isValidVersion("1.0.0-beta+exp.sha.5114f85"));
+    }
+
+    @Test
+    public void testComplexRanges() {
+        assertFalse(ContentPropertiesValidator.isValidVersion(">=1.0.0 <2.0.0"));
+        assertTrue(ContentPropertiesValidator.isValidVersion("1.2.3 - 2.3.4"));
+        assertFalse(ContentPropertiesValidator.isValidVersion(">=1.2.3 <2.3.4 || >=3.0.0"));
+    }
+}

From 9e06b21b13a201cb60bfc645529b4998b111d4fb Mon Sep 17 00:00:00 2001
From: nravilla <nirupakanthi@gmail.com>
Date: Thu, 25 Jul 2024 10:57:22 -0400
Subject: [PATCH 02/14] Changed conf directory structure

---
 assembly.xml                                  |  10 +-
 .../ampathforms/ct_art_therapy_v1.0.json      |   0
 .../ampathforms/ct_cd4_lab_results_v1.0.json  |   0
 .../ampathforms/ct_clinical_visit_v1.0.json   |   0
 .../ampathforms/ct_clinical_visit_v2.0.json   |   0
 .../ampathforms/ct_contact_tracing_v1.0.json  |   0
 .../ampathforms/ct_death_v1.0.json            |   0
 .../ampathforms/ct_express_visit_v1.0.json    |   0
 .../ampathforms/ct_intimate_partner_v1.0.json |   0
 .../ampathforms/ct_lab_results_v1.0.json      |   0
 .../ct_lab_specimen_collection_v1.0.json      |   0
 .../ampathforms/ct_mental_health_v1.0.json    |   0
 .../ct_partner_notification_v1.0.json         |   0
 .../ampathforms/ct_patient_tracing_v1.0.json  |   0
 .../ampathforms/ct_pead_disclosure_v1.0.json  |   0
 .../ampathforms/ct_service_delivery_v1.0.json |   0
 .../ct_service_enrolment_v1.0.json            |   0
 .../ct_service_enrolment_v1.1.json            |   0
 .../ampathforms/ct_transfer_out_v1.0.json     |   0
 .../ct_viral_load_request_v1.0.json           |   0
 .../ct_viral_load_results_v1.0.json           |   0
 .../conceptclasses/conceptclasses.csv         |   0
 .../conceptsources/conceptsources.csv         |   0
 .../encountertypes/encountertypes.csv         |   0
 ...up_OCT_v202310241547.2023-10-24_124407.zip | Bin
 .../patientidentifiertypes.csv                |   0
 .../programs/programs-hiv-ct.csv              |   0
 .../programworkflows-hiv-ct.csv               |   0
 .../programworkflowstates-hiv-ct.csv          |   0
 configs/frontend_config/config.json           |   0
 content.properties                            |  34 +++++--
 pom.xml                                       |  65 ++++--------
 .../model/ContentPropertiesValidator.java     |  95 ------------------
 .../model/ContentPropertiesValidatorTest.java |  56 -----------
 34 files changed, 51 insertions(+), 209 deletions(-)
 rename {configuration => configs/backend_config}/ampathforms/ct_art_therapy_v1.0.json (100%)
 rename {configuration => configs/backend_config}/ampathforms/ct_cd4_lab_results_v1.0.json (100%)
 rename {configuration => configs/backend_config}/ampathforms/ct_clinical_visit_v1.0.json (100%)
 rename {configuration => configs/backend_config}/ampathforms/ct_clinical_visit_v2.0.json (100%)
 rename {configuration => configs/backend_config}/ampathforms/ct_contact_tracing_v1.0.json (100%)
 rename {configuration => configs/backend_config}/ampathforms/ct_death_v1.0.json (100%)
 rename {configuration => configs/backend_config}/ampathforms/ct_express_visit_v1.0.json (100%)
 rename {configuration => configs/backend_config}/ampathforms/ct_intimate_partner_v1.0.json (100%)
 rename {configuration => configs/backend_config}/ampathforms/ct_lab_results_v1.0.json (100%)
 rename {configuration => configs/backend_config}/ampathforms/ct_lab_specimen_collection_v1.0.json (100%)
 rename {configuration => configs/backend_config}/ampathforms/ct_mental_health_v1.0.json (100%)
 rename {configuration => configs/backend_config}/ampathforms/ct_partner_notification_v1.0.json (100%)
 rename {configuration => configs/backend_config}/ampathforms/ct_patient_tracing_v1.0.json (100%)
 rename {configuration => configs/backend_config}/ampathforms/ct_pead_disclosure_v1.0.json (100%)
 rename {configuration => configs/backend_config}/ampathforms/ct_service_delivery_v1.0.json (100%)
 rename {configuration => configs/backend_config}/ampathforms/ct_service_enrolment_v1.0.json (100%)
 rename {configuration => configs/backend_config}/ampathforms/ct_service_enrolment_v1.1.json (100%)
 rename {configuration => configs/backend_config}/ampathforms/ct_transfer_out_v1.0.json (100%)
 rename {configuration => configs/backend_config}/ampathforms/ct_viral_load_request_v1.0.json (100%)
 rename {configuration => configs/backend_config}/ampathforms/ct_viral_load_results_v1.0.json (100%)
 rename {configuration => configs/backend_config}/conceptclasses/conceptclasses.csv (100%)
 rename {configuration => configs/backend_config}/conceptsources/conceptsources.csv (100%)
 rename {configuration => configs/backend_config}/encountertypes/encountertypes.csv (100%)
 rename {configuration => configs/backend_config}/ocl/OHRITechGroup_OCT_v202310241547.2023-10-24_124407.zip (100%)
 rename {configuration => configs/backend_config}/patientidentifiertypes/patientidentifiertypes.csv (100%)
 rename {configuration => configs/backend_config}/programs/programs-hiv-ct.csv (100%)
 rename {configuration => configs/backend_config}/programworkflows/programworkflows-hiv-ct.csv (100%)
 rename {configuration => configs/backend_config}/programworkflowstates/programworkflowstates-hiv-ct.csv (100%)
 create mode 100644 configs/frontend_config/config.json
 delete mode 100644 src/main/java/org/openmrs/maven/plugins/model/ContentPropertiesValidator.java
 delete mode 100644 src/test/java/org/openmrs/maven/plugins/model/ContentPropertiesValidatorTest.java

diff --git a/assembly.xml b/assembly.xml
index dd2dcef..e104efa 100644
--- a/assembly.xml
+++ b/assembly.xml
@@ -2,22 +2,20 @@
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 
                               http://maven.apache.org/xsd/assembly-1.1.3.xsd">
-  <id>null</id>
+  <id>assemble-content</id>
   <formats>
     <format>zip</format>
   </formats>
   <includeBaseDirectory>false</includeBaseDirectory>
   <fileSets>
-    <fileSet>
-      <directory>${project.basedir}</directory>
-      <outputDirectory>/</outputDirectory>
+    <fileSet>  
+      <directory>${project.basedir}</directory>    
       <includes>
         <include>content.properties</include>
       </includes>
     </fileSet>
     <fileSet>
-      <directory>configuration</directory>
-      <outputDirectory>/configuration</outputDirectory>
+      <directory>${project.basedir}/configs</directory>     
       <includes>
         <include>**/*</include>
       </includes>
diff --git a/configuration/ampathforms/ct_art_therapy_v1.0.json b/configs/backend_config/ampathforms/ct_art_therapy_v1.0.json
similarity index 100%
rename from configuration/ampathforms/ct_art_therapy_v1.0.json
rename to configs/backend_config/ampathforms/ct_art_therapy_v1.0.json
diff --git a/configuration/ampathforms/ct_cd4_lab_results_v1.0.json b/configs/backend_config/ampathforms/ct_cd4_lab_results_v1.0.json
similarity index 100%
rename from configuration/ampathforms/ct_cd4_lab_results_v1.0.json
rename to configs/backend_config/ampathforms/ct_cd4_lab_results_v1.0.json
diff --git a/configuration/ampathforms/ct_clinical_visit_v1.0.json b/configs/backend_config/ampathforms/ct_clinical_visit_v1.0.json
similarity index 100%
rename from configuration/ampathforms/ct_clinical_visit_v1.0.json
rename to configs/backend_config/ampathforms/ct_clinical_visit_v1.0.json
diff --git a/configuration/ampathforms/ct_clinical_visit_v2.0.json b/configs/backend_config/ampathforms/ct_clinical_visit_v2.0.json
similarity index 100%
rename from configuration/ampathforms/ct_clinical_visit_v2.0.json
rename to configs/backend_config/ampathforms/ct_clinical_visit_v2.0.json
diff --git a/configuration/ampathforms/ct_contact_tracing_v1.0.json b/configs/backend_config/ampathforms/ct_contact_tracing_v1.0.json
similarity index 100%
rename from configuration/ampathforms/ct_contact_tracing_v1.0.json
rename to configs/backend_config/ampathforms/ct_contact_tracing_v1.0.json
diff --git a/configuration/ampathforms/ct_death_v1.0.json b/configs/backend_config/ampathforms/ct_death_v1.0.json
similarity index 100%
rename from configuration/ampathforms/ct_death_v1.0.json
rename to configs/backend_config/ampathforms/ct_death_v1.0.json
diff --git a/configuration/ampathforms/ct_express_visit_v1.0.json b/configs/backend_config/ampathforms/ct_express_visit_v1.0.json
similarity index 100%
rename from configuration/ampathforms/ct_express_visit_v1.0.json
rename to configs/backend_config/ampathforms/ct_express_visit_v1.0.json
diff --git a/configuration/ampathforms/ct_intimate_partner_v1.0.json b/configs/backend_config/ampathforms/ct_intimate_partner_v1.0.json
similarity index 100%
rename from configuration/ampathforms/ct_intimate_partner_v1.0.json
rename to configs/backend_config/ampathforms/ct_intimate_partner_v1.0.json
diff --git a/configuration/ampathforms/ct_lab_results_v1.0.json b/configs/backend_config/ampathforms/ct_lab_results_v1.0.json
similarity index 100%
rename from configuration/ampathforms/ct_lab_results_v1.0.json
rename to configs/backend_config/ampathforms/ct_lab_results_v1.0.json
diff --git a/configuration/ampathforms/ct_lab_specimen_collection_v1.0.json b/configs/backend_config/ampathforms/ct_lab_specimen_collection_v1.0.json
similarity index 100%
rename from configuration/ampathforms/ct_lab_specimen_collection_v1.0.json
rename to configs/backend_config/ampathforms/ct_lab_specimen_collection_v1.0.json
diff --git a/configuration/ampathforms/ct_mental_health_v1.0.json b/configs/backend_config/ampathforms/ct_mental_health_v1.0.json
similarity index 100%
rename from configuration/ampathforms/ct_mental_health_v1.0.json
rename to configs/backend_config/ampathforms/ct_mental_health_v1.0.json
diff --git a/configuration/ampathforms/ct_partner_notification_v1.0.json b/configs/backend_config/ampathforms/ct_partner_notification_v1.0.json
similarity index 100%
rename from configuration/ampathforms/ct_partner_notification_v1.0.json
rename to configs/backend_config/ampathforms/ct_partner_notification_v1.0.json
diff --git a/configuration/ampathforms/ct_patient_tracing_v1.0.json b/configs/backend_config/ampathforms/ct_patient_tracing_v1.0.json
similarity index 100%
rename from configuration/ampathforms/ct_patient_tracing_v1.0.json
rename to configs/backend_config/ampathforms/ct_patient_tracing_v1.0.json
diff --git a/configuration/ampathforms/ct_pead_disclosure_v1.0.json b/configs/backend_config/ampathforms/ct_pead_disclosure_v1.0.json
similarity index 100%
rename from configuration/ampathforms/ct_pead_disclosure_v1.0.json
rename to configs/backend_config/ampathforms/ct_pead_disclosure_v1.0.json
diff --git a/configuration/ampathforms/ct_service_delivery_v1.0.json b/configs/backend_config/ampathforms/ct_service_delivery_v1.0.json
similarity index 100%
rename from configuration/ampathforms/ct_service_delivery_v1.0.json
rename to configs/backend_config/ampathforms/ct_service_delivery_v1.0.json
diff --git a/configuration/ampathforms/ct_service_enrolment_v1.0.json b/configs/backend_config/ampathforms/ct_service_enrolment_v1.0.json
similarity index 100%
rename from configuration/ampathforms/ct_service_enrolment_v1.0.json
rename to configs/backend_config/ampathforms/ct_service_enrolment_v1.0.json
diff --git a/configuration/ampathforms/ct_service_enrolment_v1.1.json b/configs/backend_config/ampathforms/ct_service_enrolment_v1.1.json
similarity index 100%
rename from configuration/ampathforms/ct_service_enrolment_v1.1.json
rename to configs/backend_config/ampathforms/ct_service_enrolment_v1.1.json
diff --git a/configuration/ampathforms/ct_transfer_out_v1.0.json b/configs/backend_config/ampathforms/ct_transfer_out_v1.0.json
similarity index 100%
rename from configuration/ampathforms/ct_transfer_out_v1.0.json
rename to configs/backend_config/ampathforms/ct_transfer_out_v1.0.json
diff --git a/configuration/ampathforms/ct_viral_load_request_v1.0.json b/configs/backend_config/ampathforms/ct_viral_load_request_v1.0.json
similarity index 100%
rename from configuration/ampathforms/ct_viral_load_request_v1.0.json
rename to configs/backend_config/ampathforms/ct_viral_load_request_v1.0.json
diff --git a/configuration/ampathforms/ct_viral_load_results_v1.0.json b/configs/backend_config/ampathforms/ct_viral_load_results_v1.0.json
similarity index 100%
rename from configuration/ampathforms/ct_viral_load_results_v1.0.json
rename to configs/backend_config/ampathforms/ct_viral_load_results_v1.0.json
diff --git a/configuration/conceptclasses/conceptclasses.csv b/configs/backend_config/conceptclasses/conceptclasses.csv
similarity index 100%
rename from configuration/conceptclasses/conceptclasses.csv
rename to configs/backend_config/conceptclasses/conceptclasses.csv
diff --git a/configuration/conceptsources/conceptsources.csv b/configs/backend_config/conceptsources/conceptsources.csv
similarity index 100%
rename from configuration/conceptsources/conceptsources.csv
rename to configs/backend_config/conceptsources/conceptsources.csv
diff --git a/configuration/encountertypes/encountertypes.csv b/configs/backend_config/encountertypes/encountertypes.csv
similarity index 100%
rename from configuration/encountertypes/encountertypes.csv
rename to configs/backend_config/encountertypes/encountertypes.csv
diff --git a/configuration/ocl/OHRITechGroup_OCT_v202310241547.2023-10-24_124407.zip b/configs/backend_config/ocl/OHRITechGroup_OCT_v202310241547.2023-10-24_124407.zip
similarity index 100%
rename from configuration/ocl/OHRITechGroup_OCT_v202310241547.2023-10-24_124407.zip
rename to configs/backend_config/ocl/OHRITechGroup_OCT_v202310241547.2023-10-24_124407.zip
diff --git a/configuration/patientidentifiertypes/patientidentifiertypes.csv b/configs/backend_config/patientidentifiertypes/patientidentifiertypes.csv
similarity index 100%
rename from configuration/patientidentifiertypes/patientidentifiertypes.csv
rename to configs/backend_config/patientidentifiertypes/patientidentifiertypes.csv
diff --git a/configuration/programs/programs-hiv-ct.csv b/configs/backend_config/programs/programs-hiv-ct.csv
similarity index 100%
rename from configuration/programs/programs-hiv-ct.csv
rename to configs/backend_config/programs/programs-hiv-ct.csv
diff --git a/configuration/programworkflows/programworkflows-hiv-ct.csv b/configs/backend_config/programworkflows/programworkflows-hiv-ct.csv
similarity index 100%
rename from configuration/programworkflows/programworkflows-hiv-ct.csv
rename to configs/backend_config/programworkflows/programworkflows-hiv-ct.csv
diff --git a/configuration/programworkflowstates/programworkflowstates-hiv-ct.csv b/configs/backend_config/programworkflowstates/programworkflowstates-hiv-ct.csv
similarity index 100%
rename from configuration/programworkflowstates/programworkflowstates-hiv-ct.csv
rename to configs/backend_config/programworkflowstates/programworkflowstates-hiv-ct.csv
diff --git a/configs/frontend_config/config.json b/configs/frontend_config/config.json
new file mode 100644
index 0000000..e69de29
diff --git a/content.properties b/content.properties
index 0d39d1d..cb16c69 100644
--- a/content.properties
+++ b/content.properties
@@ -1,8 +1,26 @@
-#name=Ref 3.x distro
-#version=3.0.0
-#war.openmrs=2.6.1-SNAPSHOT
-omod.fhir2=1.2.3
-omod.webservices.rest=2.40.0-SNAPSHOT
-spa.frontendModules.@ohri/openmrs-esm-ohri-hiv-care-treatment-app=2.40.0-SNAPSHOT
-spa.frontendModules.@ohri/openmrs-esm-ohri-core-app=2.40.0-SNAPSHOT
-#spa.frontendModules.@openmrs/esm-primary-navigation-app=next
+# content.properties - Metadata for the content package and its dependencies
+
+# The name of this content package
+name=openmrs-content-hiv
+
+# The version of this content package (must follow SemVer)
+version=1.0.0-SNAPSHOT
+
+# Dependencies (specified in a format similar to distro.properties)
+
+# OMOD modules with their SemVer range
+omod.fhir2=1.0.0-SNAPSHOT
+omod.reporting=^2.0.0
+
+# SPA modules with their SemVer range
+spa.frontendModules.@openmrs/esm-login-app=^3.0.0
+spa.frontendModules.@openmrs/esm-patient-chart=^1.0.0
+
+# Additional dependencies can be listed here
+# omod.another-module=^X.X.X
+# spa.frontendModules.@openmrs/esm-another-app=^X.X.X
+
+# Ensure to follow SemVer ranges when specifying versions
+# For example:
+# - ^1.0.0 means compatible with 1.0.0 including patch updates
+# - ~1.2.3 means compatible with 1.2.x but not 1.3.0
diff --git a/pom.xml b/pom.xml
index 41106c2..9d34d16 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,13 +3,11 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.openmrs</groupId>
-	<artifactId>content.hiv</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
-	<packaging>jar</packaging>
-	<name>HIV Care and Treatment Content Package</name>
-	<description>Content package for HIV care and treatment module in OpenMRS</description>
-	<url>https://openmrs.org</url>
+ 	<groupId>org.openmrs.content</groupId>
+  	<artifactId>openmrs-content-hiv</artifactId>
+  	<version>1.0-SNAPSHOT</version>
+  	<name>OpenMRS HIV Content Package</name>		
+	<packaging>pom</packaging>
 	<developers>
 		<developer>
 			<name>OpenMRS</name>
@@ -22,51 +20,30 @@
 		<developerConnection>scm:git:git@github.com:openmrs/openmrs-content-hiv.git</developerConnection>
 		<url>https://github.com/openmrs/openmrs-content-hiv.git</url>
 		<tag>HEAD</tag>
-	</scm>
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<maven.compiler.source>1.8</maven.compiler.source>
-		<maven.compiler.target>1.8</maven.compiler.target>
-	</properties>
+	</scm>	
 	<dependencies>
 		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.13.2</version>
-			<scope>test</scope>
-		</dependency>
+            <groupId>org.openmrs.maven.plugins</groupId>
+            <artifactId>openmrs-packager-maven-plugin</artifactId>
+            <version>1.8.0-SNAPSHOT</version>
+        </dependency>
 	</dependencies>
 	<build>
-		<plugins>
+		<plugins>			
 			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.8.1</version>
-				<configuration>
-					<source>1.8</source>
-					<target>1.8</target>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-antrun-plugin</artifactId>
-				<version>3.0.0</version>
+				<groupId>org.openmrs.maven.plugins</groupId>
+				<artifactId>openmrs-packager-maven-plugin</artifactId>
+				<version>1.8.0-SNAPSHOT</version>
 				<executions>
 					<execution>
-						<phase>package</phase>
-						<goals>
-							<goal>run</goal>
-						</goals>
+						<id>validate-assemble</id>
+						<phase>package</phase>						
 						<configuration>
-							<target>
-								<java classname="org.openmrs.maven.plugins.model.ContentPropertiesValidator" fork="true" failonerror="true">
-									<arg value="${project.basedir}/content.properties"/>
-									<classpath>
-										<path refid="maven.runtime.classpath"/>
-									</classpath>
-								</java>
-							</target>
+							<sourceFile>{project.basedir}/content.properties</sourceFile>
 						</configuration>
+						<goals>
+						<goal>validate-assemble</goal>
+						</goals>
 					</execution>
 				</executions>
 			</plugin>
@@ -91,7 +68,7 @@
 						</configuration>
 					</execution>
 				</executions>
-			</plugin>
+			</plugin>			
 		</plugins>
 	</build>
 	<distributionManagement>
diff --git a/src/main/java/org/openmrs/maven/plugins/model/ContentPropertiesValidator.java b/src/main/java/org/openmrs/maven/plugins/model/ContentPropertiesValidator.java
deleted file mode 100644
index f69b96f..0000000
--- a/src/main/java/org/openmrs/maven/plugins/model/ContentPropertiesValidator.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package org.openmrs.maven.plugins.model;
-
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Properties;
-import java.util.regex.Pattern;
-
-/**
- * This class is used by Maven to perform validation of property values based on a semantic versioning format using regular expressions.
- * It validates whether the property values in a given properties file match the expected semantic versioning patterns.
- * The validation includes support for range operators and excludes specific non-version strings like "latest".
- * 
- */
-public class ContentPropertiesValidator {
-
-    // Enhanced regex pattern to include range operators and support pre-release and build metadata
-    private static final Pattern VERSION_PATTERN = Pattern.compile(
-        "^(\\s*[=><~^]*\\s*\\d+(\\.\\d+){0,2}(-[0-9A-Za-z-]+(\\.[0-9A-Za-z-]+)*)?(\\+[0-9A-Za-z-]+(\\.[0-9A-Za-z-]+)*)?)" +
-        "(\\s*(-|\\|\\|)\\s*[=><~^]*\\s*\\d+(\\.\\d+){0,2}(-[0-9A-Za-z-]+(\\.[0-9A-Za-z-]+)*)?(\\+[0-9A-Za-z-]+(\\.[0-9A-Za-z-]+)*)?)*$"
-    );
-
-    /**
-     * Validates the properties in the given file.
-     *
-     * @param filePath the path to the properties file
-     * @return true if all property values are valid version formats, false otherwise
-     * @throws IOException if an error occurs while reading the file
-     */
-    public static boolean validateProperties(String filePath) throws IOException {
-        try (InputStream input = new FileInputStream(filePath)) {
-            Properties properties = new Properties();
-            properties.load(input);
-
-            for (String key : properties.stringPropertyNames()) {
-                String value = properties.getProperty(key);
-                if (!isValidVersion(value)) {
-                    System.out.println("Invalid version format for key: " + key + ", value: " + value);
-                    return false;
-                }
-            }
-            return true;
-        } catch (IOException e) {
-            System.err.println("Error reading properties file: " + e.getMessage());
-            throw e;
-        }
-    }
-
-    /**
-     * Cleans the value by trimming whitespace.
-     *
-     * @param value the value to clean
-     * @return the cleaned value
-     */
-    private static String cleanValue(String value) {
-        return value.trim();
-    }
-
-    /**
-     * Checks if the given value is a valid version format.
-     *
-     * @param value the value to check
-     * @return true if the value is a valid version format, false otherwise
-     */
-    protected static boolean isValidVersion(String value) {
-        value = cleanValue(value);
-        // Exclude "latest" explicitly
-        if ("latest".equalsIgnoreCase(value)) {
-            return false;
-        }
-        return VERSION_PATTERN.matcher(value).matches();
-    }
-
-    public static void main(String[] args) {
-        if (args.length != 1) {
-            System.out.println("Usage: java org.openmrs.maven.plugins.model.ContentPropertiesValidator <properties-file-path>");
-            System.exit(1);
-        }
-
-        String filePath = args[0];
-        try {
-            boolean isValid = validateProperties(filePath);
-            if (isValid) {
-                System.out.println("All properties have valid version formats.");
-                System.exit(0);  // Exit with zero status to indicate success
-            } else {
-                System.out.println("Some properties have invalid version formats.");
-                System.exit(1);  // Exit with non-zero status to indicate failure
-            }
-        } catch (IOException e) {
-            System.err.println("Error reading properties file: " + e.getMessage());
-            System.exit(1);  // Exit with non-zero status to indicate failure
-        }
-    }
-}
diff --git a/src/test/java/org/openmrs/maven/plugins/model/ContentPropertiesValidatorTest.java b/src/test/java/org/openmrs/maven/plugins/model/ContentPropertiesValidatorTest.java
deleted file mode 100644
index 9404997..0000000
--- a/src/test/java/org/openmrs/maven/plugins/model/ContentPropertiesValidatorTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package org.openmrs.maven.plugins.model;
-
-import org.junit.Test;
-import org.junit.Before;
-import static org.junit.Assert.*;
-
-public class ContentPropertiesValidatorTest {
-
-    @Before
-    public void setUp() {
-        // Initialization if necessary
-    }
-
-    @Test
-    public void testValidVersions() {
-        assertTrue(ContentPropertiesValidator.isValidVersion("0.13.0"));
-        assertTrue(ContentPropertiesValidator.isValidVersion("3.0.0"));
-        assertTrue(ContentPropertiesValidator.isValidVersion("1.0.0"));
-    }
-
-    @Test
-    public void testValidVersionRanges() {
-        assertTrue(ContentPropertiesValidator.isValidVersion("^0.13.0"));
-        assertTrue(ContentPropertiesValidator.isValidVersion("~0.13.0"));
-        assertTrue(ContentPropertiesValidator.isValidVersion(">0.13.0"));
-        assertTrue(ContentPropertiesValidator.isValidVersion("<3.0.0"));
-        assertTrue(ContentPropertiesValidator.isValidVersion(">=3.0.0"));
-        assertTrue(ContentPropertiesValidator.isValidVersion("<=3.0.0"));
-        assertTrue(ContentPropertiesValidator.isValidVersion("=3.0.0"));
-        assertTrue(ContentPropertiesValidator.isValidVersion("1.0.0 - 1.10.10"));
-        assertTrue(ContentPropertiesValidator.isValidVersion("<2.1.0 || >2.6.0"));
-        assertTrue(ContentPropertiesValidator.isValidVersion("=3.0.0"));
-    }
-
-    @Test
-    public void testInvalidVersions() {
-        assertFalse(ContentPropertiesValidator.isValidVersion("abc"));
-        assertFalse(ContentPropertiesValidator.isValidVersion("1..0"));
-        assertFalse(ContentPropertiesValidator.isValidVersion("1.0.0.0"));
-        assertFalse(ContentPropertiesValidator.isValidVersion("latest")); // Ensure "latest" is not valid
-    }
-
-    @Test
-    public void testPreReleaseAndBuildMetadata() {
-        assertTrue(ContentPropertiesValidator.isValidVersion("1.0.0-alpha"));
-        assertTrue(ContentPropertiesValidator.isValidVersion("1.0.0+20130313144700"));
-        assertTrue(ContentPropertiesValidator.isValidVersion("1.0.0-beta+exp.sha.5114f85"));
-    }
-
-    @Test
-    public void testComplexRanges() {
-        assertFalse(ContentPropertiesValidator.isValidVersion(">=1.0.0 <2.0.0"));
-        assertTrue(ContentPropertiesValidator.isValidVersion("1.2.3 - 2.3.4"));
-        assertFalse(ContentPropertiesValidator.isValidVersion(">=1.2.3 <2.3.4 || >=3.0.0"));
-    }
-}

From 81aaceebba95523fe406f9fb09a1fcb248d04f27 Mon Sep 17 00:00:00 2001
From: Ravilla <kuf8@cdc.gov>
Date: Thu, 8 Aug 2024 10:10:18 -0400
Subject: [PATCH 03/14] Formatting and PR review changes

---
 assembly.xml                        |  43 ++++++------
 configs/frontend_config/config.json |   1 +
 content.properties                  |  22 +-----
 pom.xml                             | 104 ++++++++++++++++++++--------
 4 files changed, 100 insertions(+), 70 deletions(-)

diff --git a/assembly.xml b/assembly.xml
index e104efa..f03d174 100644
--- a/assembly.xml
+++ b/assembly.xml
@@ -1,24 +1,23 @@
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 
                               http://maven.apache.org/xsd/assembly-1.1.3.xsd">
-  <id>assemble-content</id>
-  <formats>
-    <format>zip</format>
-  </formats>
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <fileSets>
-    <fileSet>  
-      <directory>${project.basedir}</directory>    
-      <includes>
-        <include>content.properties</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>${project.basedir}/configs</directory>     
-      <includes>
-        <include>**/*</include>
-      </includes>
-    </fileSet>
-  </fileSets> 
+	<id>assemble-content</id>
+	<formats>
+		<format>zip</format>
+	</formats>
+	<includeBaseDirectory>false</includeBaseDirectory>
+	<fileSets>
+		<fileSet>
+			<directory>${project.build.directory}</directory>
+			<includes>
+				<include>content.properties</include>
+			</includes>
+			<outputDirectory>/</outputDirectory>
+		</fileSet>
+		<fileSet>
+			<directory>${project.basedir}/configs</directory>
+			<includes>
+				<include>**/*</include>
+			</includes>
+		</fileSet>
+	</fileSets>
 </assembly>
diff --git a/configs/frontend_config/config.json b/configs/frontend_config/config.json
index e69de29..9e26dfe 100644
--- a/configs/frontend_config/config.json
+++ b/configs/frontend_config/config.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/content.properties b/content.properties
index cb16c69..0bc3073 100644
--- a/content.properties
+++ b/content.properties
@@ -1,26 +1,8 @@
 # content.properties - Metadata for the content package and its dependencies
 
 # The name of this content package
-name=openmrs-content-hiv
+name=${project.artifactId}
 
 # The version of this content package (must follow SemVer)
-version=1.0.0-SNAPSHOT
+version=1.0.0
 
-# Dependencies (specified in a format similar to distro.properties)
-
-# OMOD modules with their SemVer range
-omod.fhir2=1.0.0-SNAPSHOT
-omod.reporting=^2.0.0
-
-# SPA modules with their SemVer range
-spa.frontendModules.@openmrs/esm-login-app=^3.0.0
-spa.frontendModules.@openmrs/esm-patient-chart=^1.0.0
-
-# Additional dependencies can be listed here
-# omod.another-module=^X.X.X
-# spa.frontendModules.@openmrs/esm-another-app=^X.X.X
-
-# Ensure to follow SemVer ranges when specifying versions
-# For example:
-# - ^1.0.0 means compatible with 1.0.0 including patch updates
-# - ~1.2.3 means compatible with 1.2.x but not 1.3.0
diff --git a/pom.xml b/pom.xml
index 9d34d16..883691b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,13 +1,11 @@
-<project
-	xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
- 	<groupId>org.openmrs.content</groupId>
-  	<artifactId>openmrs-content-hiv</artifactId>
-  	<version>1.0-SNAPSHOT</version>
-  	<name>OpenMRS HIV Content Package</name>		
+	<groupId>org.openmrs.content</groupId>
+	<artifactId>openmrs-content-hiv</artifactId>
+	<version>1.0.0-SNAPSHOT</version>
+	<name>OpenMRS HIV Content Package</name>
 	<packaging>pom</packaging>
+
 	<developers>
 		<developer>
 			<name>OpenMRS</name>
@@ -19,38 +17,47 @@
 		<connection>scm:git:git@github.com:openmrs/openmrs-content-hiv.git</connection>
 		<developerConnection>scm:git:git@github.com:openmrs/openmrs-content-hiv.git</developerConnection>
 		<url>https://github.com/openmrs/openmrs-content-hiv.git</url>
-		<tag>HEAD</tag>
-	</scm>	
+
+	</scm>
 	<dependencies>
 		<dependency>
-            <groupId>org.openmrs.maven.plugins</groupId>
-            <artifactId>openmrs-packager-maven-plugin</artifactId>
-            <version>1.8.0-SNAPSHOT</version>
-        </dependency>
+			<groupId>org.openmrs.maven.plugins</groupId>
+			<artifactId>openmrs-packager-maven-plugin</artifactId>
+			<version>1.8.0-SNAPSHOT</version>
+		</dependency>
 	</dependencies>
 	<build>
-		<plugins>			
+		<resources>
+			<resource>
+				<directory>${project.basedir}</directory>
+				<includes>
+					<include>content.properties</include>
+				</includes>
+				<filtering>true</filtering>
+			</resource>
+		</resources>
+		<plugins>
 			<plugin>
 				<groupId>org.openmrs.maven.plugins</groupId>
 				<artifactId>openmrs-packager-maven-plugin</artifactId>
 				<version>1.8.0-SNAPSHOT</version>
 				<executions>
 					<execution>
-						<id>validate-assemble</id>
-						<phase>package</phase>						
-						<configuration>
-							<sourceFile>{project.basedir}/content.properties</sourceFile>
-						</configuration>
+						<id>validate-content-package</id>
+						<phase>verify</phase>
 						<goals>
-						<goal>validate-assemble</goal>
+							<goal>validate-content-package</goal>
 						</goals>
+						<configuration>
+							<sourceFile>${project.basedir}/content.properties</sourceFile>
+						</configuration>
 					</execution>
 				</executions>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-assembly-plugin</artifactId>
-				<version>3.3.0</version>
+				<version>3.7.1</version>
 				<executions>
 					<execution>
 						<id>make-assembly</id>
@@ -62,25 +69,66 @@
 							<descriptors>
 								<descriptor>${project.basedir}/assembly.xml</descriptor>
 							</descriptors>
+							<!-- Setting appendAssemblyId to false ensures that the assembly ID 
+							is not appended to the final name of the assembled artifact -->
 							<appendAssemblyId>false</appendAssemblyId>
-							<!-- Ensure this is set to false -->
 							<finalName>${project.artifactId}-${project.version}</finalName>
 						</configuration>
 					</execution>
 				</executions>
-			</plugin>			
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-release-plugin</artifactId>
+				<version>3.1.1</version>
+				<configuration>
+					<autoVersionSubmodules>true</autoVersionSubmodules>
+					<useReleaseProfile>false</useReleaseProfile>
+					<releaseProfiles>release</releaseProfiles>
+					<preparationGoals>clean install</preparationGoals>
+					<goals>deploy</goals>
+					<tagNameFormat>@{project.version}</tagNameFormat>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-resources-plugin</artifactId>
+				<version>3.3.1</version>
+				<executions>
+					<execution>
+						<id>copy-resources</id>
+						<phase>process-resources</phase>
+						<goals>
+							<goal>resources</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${project.build.directory}</outputDirectory>
+							<resources>
+								<resource>
+									<directory>${project.basedir}</directory>
+									<includes>
+										<include>content.properties</include>
+									</includes>
+									<filtering>true</filtering>
+								</resource>
+							</resources>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
+
 	<distributionManagement>
 		<repository>
-			<id>openmrs-repo-releases</id>
-			<name>OpenMRS Nexus Releases</name>
-			<url>https://mavenrepo.openmrs.org/nexus/content/repositories/releases</url>
+			<id>openmrs-repo-modules</id>
+			<name>OpenMRS Nexus Modules</name>
+			<url>http://mavenrepo.openmrs.org/nexus/content/repositories/modules</url>
 		</repository>
 		<snapshotRepository>
 			<id>openmrs-repo-snapshots</id>
 			<name>OpenMRS Nexus Snapshots</name>
-			<url>https://mavenrepo.openmrs.org/nexus/content/repositories/snapshots</url>
+			<url>http://mavenrepo.openmrs.org/nexus/content/repositories/snapshots</url>
 		</snapshotRepository>
 	</distributionManagement>
 </project>

From 02de78316e067dfaf45b9aaa7345c937852d69ac Mon Sep 17 00:00:00 2001
From: nravilla <nirupakanthi@gmail.com>
Date: Mon, 12 Aug 2024 13:35:20 -0400
Subject: [PATCH 04/14] Update pom.xml, Added validate-configurations

---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7a03949..a437bbf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,16 +39,16 @@
 							<sourceFile>${project.basedir}/content.properties</sourceFile>
 						</configuration>
 					</execution>
-					<!--<execution>
+					<execution>
 						<id>validate-configurations</id>
 						<phase>verify</phase>
 						<goals>
 							<goal>validate-configurations</goal>
 						</goals>
 						<configuration>
-							<sourceDir>${project.basedir}/configs</sourceDir>
+							<sourceDir>${project.basedir}/configs/backend_config</sourceDir>
 						</configuration>						
-					</execution> -->
+					</execution>
 				</executions>
 			</plugin>
 			<plugin>

From 8e95a0faac891817cce2bc365e14de17616a3ef8 Mon Sep 17 00:00:00 2001
From: nravilla <nirupakanthi@gmail.com>
Date: Tue, 13 Aug 2024 07:09:43 -0400
Subject: [PATCH 05/14] Update pom.xml, added distributionManagement

---
 pom.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index a437bbf..5969928 100644
--- a/pom.xml
+++ b/pom.xml
@@ -117,14 +117,14 @@
 	</build>
 	<distributionManagement>
 		<repository>
-			<id>openmrs-repo-modules</id>
-			<name>OpenMRS Nexus Modules</name>
-			<url>http://mavenrepo.openmrs.org/nexus/content/repositories/releases</url>
+			<id>openmrs-repo-releases</id>
+			<name>OpenMRS Releases Repo</name>
+			<url>https://mavenrepo.openmrs.org/releases</url>
 		</repository>
 		<snapshotRepository>
 			<id>openmrs-repo-snapshots</id>
-			<name>OpenMRS Nexus Snapshots</name>
-			<url>http://mavenrepo.openmrs.org/nexus/content/repositories/snapshots</url>
+			<name>OpenMRS Snapshots Repo</name>
+			<url>https://mavenrepo.openmrs.org/snapshots</url>
 		</snapshotRepository>
 	</distributionManagement>
 </project>

From aa83015acdda5ef996e0da333a1ebc8e9bbb7a48 Mon Sep 17 00:00:00 2001
From: Ravilla <kuf8@cdc.gov>
Date: Tue, 13 Aug 2024 14:11:27 -0400
Subject: [PATCH 06/14] Added pluginRepospluginRepositories section

---
 pom.xml | 37 +++++++++++++++++++++++++++++--------
 1 file changed, 29 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5969928..42d6201 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
 			<plugin>
 				<groupId>org.openmrs.maven.plugins</groupId>
 				<artifactId>openmrs-packager-maven-plugin</artifactId>
-				<version>1.8.0-SNAPSHOT</version>
+				<version>1.8.0</version>
 				<executions>
 					<execution>
 						<id>validate-content-package</id>
@@ -46,8 +46,8 @@
 							<goal>validate-configurations</goal>
 						</goals>
 						<configuration>
-							<sourceDir>${project.basedir}/configs/backend_config</sourceDir>
-						</configuration>						
+							<sourceDir>${project.basedir}/configs</sourceDir>
+						</configuration>
 					</execution>
 				</executions>
 			</plugin>
@@ -115,16 +115,37 @@
 			</plugin>
 		</plugins>
 	</build>
+	<pluginRepositories>
+		<pluginRepository>
+			<id>openmrs-releases</id>
+			<name>OpenMRS JFrog Releases</name>
+			<url>https://openmrs.jfrog.io/artifactory/releases</url>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</pluginRepository>
+		<pluginRepository>
+			<id>openmrs-snapshots</id>
+			<name>OpenMRS JFrog Snapshots</name>
+			<url>https://openmrs.jfrog.io/artifactory/snapshots</url>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</pluginRepository>
+	</pluginRepositories>
 	<distributionManagement>
 		<repository>
-			<id>openmrs-repo-releases</id>
-			<name>OpenMRS Releases Repo</name>
-			<url>https://mavenrepo.openmrs.org/releases</url>
+			<id>openmrs-repo-modules</id>
+			<name>OpenMRS Nexus Modules</name>
+			<url>http://mavenrepo.openmrs.org/nexus/content/repositories/releases</url>
 		</repository>
 		<snapshotRepository>
 			<id>openmrs-repo-snapshots</id>
-			<name>OpenMRS Snapshots Repo</name>
-			<url>https://mavenrepo.openmrs.org/snapshots</url>
+			<name>OpenMRS Nexus Snapshots</name>
+			<url>http://mavenrepo.openmrs.org/nexus/content/repositories/snapshots</url>
 		</snapshotRepository>
 	</distributionManagement>
 </project>

From 3d2a838b36a9ecc916b1c18e5edda4af6f81ccc3 Mon Sep 17 00:00:00 2001
From: Ravilla <kuf8@cdc.gov>
Date: Tue, 13 Aug 2024 14:32:09 -0400
Subject: [PATCH 07/14] Changed sourceDir for validate-configurations

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 42d6201..1610624 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,7 +46,7 @@
 							<goal>validate-configurations</goal>
 						</goals>
 						<configuration>
-							<sourceDir>${project.basedir}/configs</sourceDir>
+							<sourceDir>${project.basedir}/configs/backend_config</sourceDir>
 						</configuration>
 					</execution>
 				</executions>

From f1d883c004fa45415a138cd5342eb1e5b06b673c Mon Sep 17 00:00:00 2001
From: nravilla <nirupakanthi@gmail.com>
Date: Wed, 14 Aug 2024 13:45:56 -0400
Subject: [PATCH 08/14] Update pom.xml, removed validate-configurations

---
 pom.xml | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1610624..c7b110b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,17 +38,7 @@
 						<configuration>
 							<sourceFile>${project.basedir}/content.properties</sourceFile>
 						</configuration>
-					</execution>
-					<execution>
-						<id>validate-configurations</id>
-						<phase>verify</phase>
-						<goals>
-							<goal>validate-configurations</goal>
-						</goals>
-						<configuration>
-							<sourceDir>${project.basedir}/configs/backend_config</sourceDir>
-						</configuration>
-					</execution>
+					</execution>					
 				</executions>
 			</plugin>
 			<plugin>

From 7464118a7a2b0c0f8f9070706931affc39ebffbb Mon Sep 17 00:00:00 2001
From: Ravilla <kuf8@cdc.gov>
Date: Wed, 14 Aug 2024 23:41:09 -0400
Subject: [PATCH 09/14] Changed http to https

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index c7b110b..8ea14b2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -130,12 +130,12 @@
 		<repository>
 			<id>openmrs-repo-modules</id>
 			<name>OpenMRS Nexus Modules</name>
-			<url>http://mavenrepo.openmrs.org/nexus/content/repositories/releases</url>
+			<url>https://mavenrepo.openmrs.org/nexus/content/repositories/releases</url>
 		</repository>
 		<snapshotRepository>
 			<id>openmrs-repo-snapshots</id>
 			<name>OpenMRS Nexus Snapshots</name>
-			<url>http://mavenrepo.openmrs.org/nexus/content/repositories/snapshots</url>
+			<url>https://mavenrepo.openmrs.org/nexus/content/repositories/snapshots</url>
 		</snapshotRepository>
 	</distributionManagement>
 </project>

From 993a936f710dd953904797c066c8d4f9102928f9 Mon Sep 17 00:00:00 2001
From: Ravilla <kuf8@cdc.gov>
Date: Thu, 15 Aug 2024 05:08:54 -0400
Subject: [PATCH 10/14] Updated urls

---
 pom.xml | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8ea14b2..e716385 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.openmrs.content</groupId>
 	<artifactId>hiv</artifactId>
@@ -38,7 +37,7 @@
 						<configuration>
 							<sourceFile>${project.basedir}/content.properties</sourceFile>
 						</configuration>
-					</execution>					
+					</execution>
 				</executions>
 			</plugin>
 			<plugin>
@@ -107,35 +106,24 @@
 	</build>
 	<pluginRepositories>
 		<pluginRepository>
-			<id>openmrs-releases</id>
-			<name>OpenMRS JFrog Releases</name>
+			<id>openmrs-repo</id>
+			<name>OpenMRS Nexus Repository</name>
 			<url>https://openmrs.jfrog.io/artifactory/releases</url>
 			<snapshots>
 				<enabled>false</enabled>
 			</snapshots>
 		</pluginRepository>
-		<pluginRepository>
-			<id>openmrs-snapshots</id>
-			<name>OpenMRS JFrog Snapshots</name>
-			<url>https://openmrs.jfrog.io/artifactory/snapshots</url>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</pluginRepository>
 	</pluginRepositories>
 	<distributionManagement>
 		<repository>
 			<id>openmrs-repo-modules</id>
 			<name>OpenMRS Nexus Modules</name>
-			<url>https://mavenrepo.openmrs.org/nexus/content/repositories/releases</url>
+			<url>https://mavenrepo.openmrs.org/releases</url> <!-- Corrected -->
 		</repository>
 		<snapshotRepository>
 			<id>openmrs-repo-snapshots</id>
 			<name>OpenMRS Nexus Snapshots</name>
-			<url>https://mavenrepo.openmrs.org/nexus/content/repositories/snapshots</url>
+			<url>https://mavenrepo.openmrs.org/snapshots</url>
 		</snapshotRepository>
 	</distributionManagement>
 </project>

From e52fb11efcd5a2053ccb25cd3bd18f56fb0f95e2 Mon Sep 17 00:00:00 2001
From: Ravilla <kuf8@cdc.gov>
Date: Thu, 15 Aug 2024 06:27:33 -0400
Subject: [PATCH 11/14] Added profiles to control execution

---
 .github/workflows/main.yml |  2 +-
 pom.xml                    | 88 +++++++++++++++++++++++++++++---------
 2 files changed, 69 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ad2dd4e..c855111 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -29,4 +29,4 @@ jobs:
       - name: Build with Maven
         id: build_with_maven
         run: |
-          mvn clean verify --batch-mode --file pom.xml
+          mvn clean verify --batch-mode --file pom.xml -Pexclude-validate-configurations
diff --git a/pom.xml b/pom.xml
index e716385..1946923 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,23 +23,6 @@
 	</properties>
 	<build>
 		<plugins>
-			<plugin>
-				<groupId>org.openmrs.maven.plugins</groupId>
-				<artifactId>openmrs-packager-maven-plugin</artifactId>
-				<version>1.8.0</version>
-				<executions>
-					<execution>
-						<id>validate-content-package</id>
-						<phase>verify</phase>
-						<goals>
-							<goal>validate-content-package</goal>
-						</goals>
-						<configuration>
-							<sourceFile>${project.basedir}/content.properties</sourceFile>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-assembly-plugin</artifactId>
@@ -55,8 +38,6 @@
 							<descriptors>
 								<descriptor>${project.basedir}/assembly.xml</descriptor>
 							</descriptors>
-							<!-- Setting appendAssemblyId to false ensures that the assembly ID 
-							is not appended to the final name of the assembled artifact -->
 							<appendAssemblyId>false</appendAssemblyId>
 							<finalName>${project.artifactId}-${project.version}</finalName>
 						</configuration>
@@ -118,7 +99,7 @@
 		<repository>
 			<id>openmrs-repo-modules</id>
 			<name>OpenMRS Nexus Modules</name>
-			<url>https://mavenrepo.openmrs.org/releases</url> <!-- Corrected -->
+			<url>https://mavenrepo.openmrs.org/releases</url>
 		</repository>
 		<snapshotRepository>
 			<id>openmrs-repo-snapshots</id>
@@ -126,4 +107,71 @@
 			<url>https://mavenrepo.openmrs.org/snapshots</url>
 		</snapshotRepository>
 	</distributionManagement>
+
+	<!-- Profiles for execution control -->
+	<profiles>
+		<profile>
+			<id>default-profile</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.openmrs.maven.plugins</groupId>
+						<artifactId>openmrs-packager-maven-plugin</artifactId>
+						<version>1.8.0</version>
+						<executions>
+							<execution>
+								<id>validate-content-package</id>
+								<phase>verify</phase>
+								<goals>
+									<goal>validate-content-package</goal>
+								</goals>
+								<configuration>
+									<sourceFile>${project.basedir}/content.properties</sourceFile>
+								</configuration>
+							</execution>
+							<execution>
+								<id>validate-configurations</id>
+								<phase>verify</phase>
+								<goals>
+									<goal>validate-configurations</goal>
+								</goals>
+								<configuration>
+									<sourceFile>${project.basedir}/configs/backend_config</sourceFile>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+
+		<!-- Profile to exclude validate-configurations -->
+		<profile>
+			<id>exclude-validate-configurations</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.openmrs.maven.plugins</groupId>
+						<artifactId>openmrs-packager-maven-plugin</artifactId>
+						<version>1.8.0</version>
+						<executions>
+							<execution>
+								<id>validate-content-package</id>
+								<phase>verify</phase>
+								<goals>
+									<goal>validate-content-package</goal>
+								</goals>
+								<configuration>
+									<sourceFile>${project.basedir}/content.properties</sourceFile>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
 </project>

From 80028682ea6c8056c84da9c4874c5a44f0d680ee Mon Sep 17 00:00:00 2001
From: nravilla <nirupakanthi@gmail.com>
Date: Thu, 15 Aug 2024 07:00:10 -0400
Subject: [PATCH 12/14] Update pom.xml, changed sourceFile to sourceDir

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 1946923..3b0fd30 100644
--- a/pom.xml
+++ b/pom.xml
@@ -139,7 +139,7 @@
 									<goal>validate-configurations</goal>
 								</goals>
 								<configuration>
-									<sourceFile>${project.basedir}/configs/backend_config</sourceFile>
+									<sourceDir>${project.basedir}/configs/backend_config</sourceDir>
 								</configuration>
 							</execution>
 						</executions>

From bb1d6eb4813a25624fca5df420f37dfb5256682b Mon Sep 17 00:00:00 2001
From: Ravilla <kuf8@cdc.gov>
Date: Thu, 15 Aug 2024 07:15:06 -0400
Subject: [PATCH 13/14] Added profiles to control execution

---
 .github/workflows/main.yml |  2 +-
 pom.xml                    | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c855111..ad2dd4e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -29,4 +29,4 @@ jobs:
       - name: Build with Maven
         id: build_with_maven
         run: |
-          mvn clean verify --batch-mode --file pom.xml -Pexclude-validate-configurations
+          mvn clean verify --batch-mode --file pom.xml
diff --git a/pom.xml b/pom.xml
index 3b0fd30..343d560 100644
--- a/pom.xml
+++ b/pom.xml
@@ -131,17 +131,7 @@
 								<configuration>
 									<sourceFile>${project.basedir}/content.properties</sourceFile>
 								</configuration>
-							</execution>
-							<execution>
-								<id>validate-configurations</id>
-								<phase>verify</phase>
-								<goals>
-									<goal>validate-configurations</goal>
-								</goals>
-								<configuration>
-									<sourceDir>${project.basedir}/configs/backend_config</sourceDir>
-								</configuration>
-							</execution>
+							</execution>							
 						</executions>
 					</plugin>
 				</plugins>
@@ -150,7 +140,7 @@
 
 		<!-- Profile to exclude validate-configurations -->
 		<profile>
-			<id>exclude-validate-configurations</id>
+			<id>include-validate-configurations</id>
 			<build>
 				<plugins>
 					<plugin>
@@ -168,6 +158,16 @@
 									<sourceFile>${project.basedir}/content.properties</sourceFile>
 								</configuration>
 							</execution>
+							<execution>
+								<id>validate-configurations</id>
+								<phase>verify</phase>
+								<goals>
+									<goal>validate-configurations</goal>
+								</goals>
+								<configuration>
+									<sourceDir>${project.basedir}/configs/backend_config</sourceDir>
+								</configuration>
+							</execution>
 						</executions>
 					</plugin>
 				</plugins>

From 83e6df5c72ad714bb2956a302a5397387588a2de Mon Sep 17 00:00:00 2001
From: Ravilla <kuf8@cdc.gov>
Date: Thu, 15 Aug 2024 07:19:12 -0400
Subject: [PATCH 14/14] Formatting update

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 343d560..f4adcea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -131,7 +131,7 @@
 								<configuration>
 									<sourceFile>${project.basedir}/content.properties</sourceFile>
 								</configuration>
-							</execution>							
+							</execution>
 						</executions>
 					</plugin>
 				</plugins>