Add a feature flag and disable SPA by default

openmrs · Jun 11, 2021 · 52b45de · 52b45de
1 parent f9fbc50
commit 52b45de
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/docker-maven-plugin/src/main/java/org/openmrs/maven/plugins/RunDb.java b/docker-maven-plugin/src/main/java/org/openmrs/maven/plugins/RunDb.java
@@ -17,7 +17,7 @@ public class RunDb extends AbstractDockerMojo {
     /**
      * port exposed by mysql container to connect with db
      *
-     * @parameter propert="container"
+     * @parameter property="container"
      */
     protected String container;
 

diff --git a/maven-plugin/src/main/java/org/openmrs/maven/plugins/AbstractTask.java b/maven-plugin/src/main/java/org/openmrs/maven/plugins/AbstractTask.java
@@ -129,6 +129,15 @@ public abstract class AbstractTask extends AbstractMojo {
      */
     OwaHelper owaHelper;
 
+    /**
+     * Temporary feature flag for SPA support. Will be removed in 4.1.0
+     *
+     * @since 4.0.1
+     * @deprecated
+     * @parameter property="enable.spa" default-value="false"
+     */
+    boolean enableSpa;
+
     /**
      * installs SPAs
      */
@@ -189,7 +198,7 @@ public void initTask() {
         if (owaHelper == null) {
             owaHelper = new OwaHelper(mavenSession, mavenProject, pluginManager, wizard);
         }
-        if (spaInstaller == null) {
+        if (spaInstaller == null && enableSpa) {
             spaInstaller = new SpaInstaller(mavenProject, mavenSession, pluginManager, distroHelper);
         }
         if(dockerHelper == null){

diff --git a/maven-plugin/src/main/java/org/openmrs/maven/plugins/Setup.java b/maven-plugin/src/main/java/org/openmrs/maven/plugins/Setup.java
@@ -247,7 +247,9 @@ public void setup(Server server, DistroProperties distroProperties) throws MojoE
             distroHelper.savePropertiesToServer(distroProperties, server);
             setServerVersionsFromDistroProperties(server, distroProperties);
             moduleInstaller.installModulesForDistro(server, distroProperties, distroHelper);
-            spaInstaller.installFromDistroProperties(server.getServerDirectory(), distroProperties);
+            if (spaInstaller != null) {
+                spaInstaller.installFromDistroProperties(server.getServerDirectory(), distroProperties);
+            }
             installOWAs(server, distroProperties);
         } else {
             moduleInstaller.installDefaultModules(server);