Merge remote-tracking branch 'origin/issues/131_m-rc-deployments' into

develop
datasharingframework · Dec 12, 2023 · 55ce3d8 · 55ce3d8
2 parents fef882e + 9687336
commit 55ce3d8
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/plugin/ProcessPluginLoaderImpl.java b/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/plugin/ProcessPluginLoaderImpl.java
@@ -25,7 +25,9 @@
 
 public class ProcessPluginLoaderImpl implements ProcessPluginLoader, InitializingBean
 {
-	public static final String FILE_DRAFT_SUFFIX = "-SNAPSHOT.jar";
+	public static final String SNAPSHOT_FILE_SUFFIX = "-SNAPSHOT.jar";
+	public static final String MILESTONE_FILE_PATTERN = ".*-M[0-9]+.jar";
+	public static final String RELEASE_CANDIDATE_FILE_PATTERN = ".*-RC[0-9]+.jar";
 
 	private static final Logger logger = LoggerFactory.getLogger(ProcessPluginLoaderImpl.class);
 
@@ -118,7 +120,13 @@ else if (!p.getFileName().toString().endsWith(".jar"))
 			if (definitions.size() != 1)
 				return null;
 
-			boolean draft = jar.getFileName().toString().endsWith(FILE_DRAFT_SUFFIX);
+			String filename = jar.getFileName().toString();
+			boolean isSnapshot = filename.endsWith(SNAPSHOT_FILE_SUFFIX);
+			boolean isMilestone = filename.matches(MILESTONE_FILE_PATTERN);
+			boolean isReleaseCandidate = filename.matches(RELEASE_CANDIDATE_FILE_PATTERN);
+
+			boolean draft = isSnapshot || isMilestone || isReleaseCandidate;
+
 			return factory.createProcessPlugin(definitions.get(0).get(), draft, jar, classLoader, fhirContext,
 					environment);
 		}