Correct the O3 Versions during setup of an instance

Author: mherman22

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

@@ -786,9 +786,13 @@ private Map<String, String> getO3VersionsOptionsMap(VersionsHelper versionsHelpe
 		Map<String, String> optionsMap = new LinkedHashMap<>();
 
 		{
-			Artifact artifact = new Artifact("distro-emr-configuration", "3.0.0-SNAPSHOT", "org.openmrs", "zip");
-			for (ArtifactVersion version : versionsHelper.getAllVersions(artifact, MAX_OPTIONS_SIZE)) {
-				optionsMap.put(String.format(optionTemplate, version.toString()), artifact.getGroupId() + ":" + artifact.getArtifactId() + ":" + version);
+			Artifact artifact = new Artifact("distro-emr-configuration", "3.0.0-beta.21", "org.openmrs", "zip");
+			List<ArtifactVersion> versionList = versionsHelper.getAllVersions(artifact, MAX_OPTIONS_SIZE);
+			for (ArtifactVersion version : versionList) {
+				if (optionsMap.size() < MAX_OPTIONS_SIZE) {
+					optionsMap.put(String.format(optionTemplate, version.toString()),
+							artifact.getGroupId() + ":" + artifact.getArtifactId() + ":" + version);
+				}
 			}
 		}
 
@@ -797,10 +801,15 @@ private Map<String, String> getO3VersionsOptionsMap(VersionsHelper versionsHelpe
 		}
 
 		{
-			Artifact artifact = new Artifact("referenceapplication-distro", "3.0.0-SNAPSHOT", "org.openmrs.distro", "zip");
-			for (ArtifactVersion version : versionsHelper.getAllVersions(artifact, MAX_OPTIONS_SIZE)) {
-				optionsMap.put(String.format(optionTemplate, version.toString()), artifact.getGroupId() + ":" + artifact.getArtifactId() + ":" + version);
-
+			Artifact artifact = new Artifact("referenceapplication-distro", "3.0.0-beta.21", "org.openmrs.distro", "zip");
+			List<ArtifactVersion> versionList = versionsHelper.getAllVersions(artifact, MAX_OPTIONS_SIZE);
+			for (ArtifactVersion version : versionList) {
+				if (optionsMap.size() < MAX_OPTIONS_SIZE) {
+					optionsMap.put(String.format(optionTemplate, version.toString()),
+							artifact.getGroupId() + ":" + artifact.getArtifactId() + ":" + version);
+				} else {
+					break;
+				}
 			}
 		}
 

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

@@ -2,6 +2,7 @@
 
 import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.apache.maven.artifact.versioning.ArtifactVersion;
+import org.apache.maven.artifact.versioning.ComparableVersion;
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.repository.legacy.metadata.ArtifactMetadataRetrievalException;
@@ -68,14 +69,14 @@ private List<ArtifactVersion> getVersions(Artifact artifact){
 
     public List<ArtifactVersion> getAllVersions(Artifact artifact, int maxSize) {
         List<ArtifactVersion> versions = getVersions(artifact);
+        versions.removeIf(version -> "3.1.0-SNAPSHOT".equals(version.toString()));
+        versions.removeIf(version -> "3.0.0-SNAPSHOT".equals(version.toString()));
         sortDescending(versions);
         return versions.subList(0, Math.min(versions.size(), maxSize));
     }
 
-    @SuppressWarnings("unchecked")
     private void sortDescending(List<ArtifactVersion> versions){
-        Collections.sort(versions);
-        Collections.reverse(versions);
+        Collections.sort(versions, (v1, v2) -> new ComparableVersion(v2.toString()).compareTo(new ComparableVersion(v1.toString())));
     }
 
     /**