fix

maven-plugin/pom.xml

@@ -29,11 +29,6 @@
             <groupId>org.apache.maven.shared</groupId>
             <artifactId>maven-verifier</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.vdurmont</groupId>
-            <artifactId>semver4j</artifactId>
-            <version>3.1.0</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-model</artifactId>

pom.xml

@@ -402,6 +402,12 @@
                 <version>0.10.2</version>
             </dependency>
 
+            <dependency>
+                <groupId>org.semver4j</groupId>
+                <artifactId>semver4j</artifactId>
+                <version>5.3.0</version>
+            </dependency>
+
             <!-- console input and output -->
             <dependency>
                 <groupId>org.jline</groupId>

sdk-commons/pom.xml

@@ -34,6 +34,11 @@
             <artifactId>java-semver</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.semver4j</groupId>
+            <artifactId>semver4j</artifactId>
+        </dependency>
+
         <!-- TODO: Get rid of this... just using for URLBuilder -->
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
@@ -86,12 +91,6 @@
             <artifactId>json</artifactId>
             <version>20230618</version>
         </dependency>
-        <dependency>
-            <groupId>com.vdurmont</groupId>
-            <artifactId>semver4j</artifactId>
-            <version>3.1.0</version>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>
 
     <build>

sdk-commons/src/main/java/org/openmrs/maven/plugins/utility/DistroHelper.java

@@ -564,7 +564,7 @@ public String findLatestMatchingVersion(String dependency, String versionRange)
 			return versionHelper.getLatestReleasedVersion(new Artifact(dependency, "latest"));
 		} else if (dependency.startsWith("spa.frontendModule")) {
 			packageJson.setName(dependency.substring("spa.frontendModules.".length()));
-			return npmVersionHelper.getLatestReleasedVersionFromNpmRegistry(packageJson, versionRange);
+			return npmVersionHelper.getResolvedVersionFromNpmRegistry(packageJson, versionRange);
 		}
 		throw new IllegalArgumentException("Unsupported dependency type: " + dependency);
 	}

sdk-commons/src/main/java/org/openmrs/maven/plugins/utility/NpmVersionHelper.java

@@ -24,7 +24,7 @@ public class NpmVersionHelper {
      * @return              The resolved version of the package that satisfies the semver range.
      * @throws RuntimeException if the command fails or the resolved version cannot be determined.
      */
-    public String getLatestReleasedVersionFromNpmRegistry(PackageJson packageJson, String versionRange) {
+    public String getResolvedVersionFromNpmRegistry(PackageJson packageJson, String versionRange) {
         try {
             String packageName = packageJson.getName();
             JSONArray jsonArray = getJsonArray(versionRange, packageName);

sdk-commons/src/main/java/org/openmrs/maven/plugins/utility/PropertiesUtils.java

@@ -21,8 +21,8 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.github.zafarkhaja.semver.ParseException;
-import com.vdurmont.semver4j.Semver;
+import org.semver4j.Semver;
+import org.semver4j.SemverException;
 import org.apache.commons.io.IOUtils;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
@@ -311,38 +311,45 @@ private static Document parseXMLFromURL(String url) throws ParserConfigurationEx
 	}
 
 	/**
-	 * Reads the content.properties file.
+	 * <p>The distro.properties should have entries like: <code>content.hiv=1.0.0-SNAPSHOT</code>.
+	 * This should correspond to a Zip file stored in a Maven repository and the content.properties file is in that Zip file</p>
+	 *
+	 * <p> So this should be able to read the underlying content.properties file and then.</p>
 	 * <p> For dependencies defined in both content.properties and distro.properties, this ensures the version specified in distro.properties
 	 * matches the range defined in content.properties; otherwise, we output an error to the user to fix this.</p>
-	 * For dependencies not defined in distro.properties but defined in content.properties, the SDK should locate the latest matching version
-	 * and add that to the OMODs and ESMs used by the distro.
+	 * <p>For dependencies not defined in distro.properties but defined in content.properties, the SDK should locate the latest matching version
+	 * and add that to the OMODs and ESMs used by the distro.</p>
 	 *
-	 * @param userDir           The directory where the distro.properties or content.properties file is located. This is typically the user's working directory.
+	 * @param file           The directory where the distro.properties or content.properties file is located. This is typically the user's working directory.
 	 * @param distroProperties  An object representing the properties defined in distro.properties. This includes versions of various dependencies
 	 *                          currently used in the distribution.
 	 * @throws MojoExecutionException if there is an error reading the content.properties file or if a version conflict is detected.
 	 */
-	public static void parseContentProperties(File userDir, DistroProperties distroProperties) throws MojoExecutionException {
-		File contentFile = new File(userDir, CONTENT_PROPERTIES);
-		if (!contentFile.exists()) {
-			log.info("No content.properties file found in the user directory.");
-			return;
-		}
-
+	public static void parseContentProperties(File file, DistroProperties distroProperties) throws MojoExecutionException {
 		Properties contentProperties = new Properties();
-		String contentPackageName = null;
-		String contentPackageVersion = null;
+		boolean found = false;
 
-		try (BufferedReader reader = new BufferedReader(new FileReader(contentFile))) {
-			contentProperties.load(reader);
-			contentPackageName = contentProperties.getProperty("name");
-			contentPackageVersion = contentProperties.getProperty("version");
-
-			if (contentPackageName == null || contentPackageVersion == null) {
-				throw new MojoExecutionException("Content package name or version not specified in content.properties");
+		try (ZipFile zipFile = new ZipFile(file)) {
+			Enumeration<? extends ZipEntry> entries = zipFile.entries();
+			while (entries.hasMoreElements()) {
+				ZipEntry zipEntry = entries.nextElement();
+				if (CONTENT_PROPERTIES.equals(zipEntry.getName())) {
+					try (InputStream inputStream = zipFile.getInputStream(zipEntry)) {
+						contentProperties.load(inputStream);
+						found = true;
+						log.info("content.properties file found and parsed successfully.");
+
+						if (contentProperties.getProperty("name") == null || contentProperties.getProperty("version") == null) {
+							throw new MojoExecutionException("Content package name or version not specified in content.properties");
+						}
+					}
+				}
+			}
+			if (!found) {
+				throw new MojoExecutionException("content.properties file not found in ZIP file");
 			}
 		} catch (IOException e) {
-			throw new MojoExecutionException("Failed to read content.properties file", e);
+			throw new MojoExecutionException("Error reading content.properties from ZIP file: " + e.getMessage(), e);
 		}
 
 		for (String dependency : contentProperties.stringPropertyNames()) {
@@ -358,7 +365,7 @@ public static void parseContentProperties(File userDir, DistroProperties distroP
 					}
 					distroProperties.add(dependency, latestVersion);
 				} else {
-					checkVersionInRange(dependency, versionRange, distroVersion, contentPackageName);
+					checkVersionInRange(dependency, versionRange, distroVersion, contentProperties.getProperty("name"));
 				}
 			}
 		}
@@ -379,7 +386,7 @@ private static String findLatestMatchingVersion(String dependency, String versio
 	 * @throws MojoExecutionException If the version does not fall within the specified range or if the range format is invalid.
 	 */
 	private static void checkVersionInRange(String contentDependencyKey, String contentDependencyVersionRange, String distroPropertyVersion, String contentPackageName) throws MojoExecutionException {
-		Semver semverVersion = new Semver(distroPropertyVersion, Semver.SemverType.NPM);
+		Semver semverVersion = new Semver(distroPropertyVersion);
 
 		try {
 			boolean inRange = semverVersion.satisfies(contentDependencyVersionRange.trim());
@@ -388,7 +395,7 @@ private static void checkVersionInRange(String contentDependencyKey, String cont
 						"Incompatible version for " + contentDependencyKey + " in content package " + contentPackageName + ". Specified range: " + contentDependencyVersionRange
 								+ ", found in distribution: " + distroPropertyVersion);
 			}
-		} catch (ParseException e) {
+		} catch (SemverException e) {
 			throw new MojoExecutionException("Invalid version range format for " + contentDependencyKey + " in content package " + contentPackageName + ": " + contentDependencyVersionRange, e);
 		}
 	}