From f2ed799b8bd7ea09fee0cc9af8d1ea4e7ad5dfa1 Mon Sep 17 00:00:00 2001
From: Jon Koops <jonkoops@gmail.com>
Date: Thu, 17 Feb 2022 23:10:41 +0100
Subject: [PATCH] Add profile to conditionally build account2 theme (#10267)

* Add profile to conditionally build account2 theme

* Use a property for activation instead
---
 themes/pom.xml | 110 +++++++++++++++++++++++++++++--------------------
 1 file changed, 65 insertions(+), 45 deletions(-)

diff --git a/themes/pom.xml b/themes/pom.xml
index d8d69f6724..e26ab3c85d 100755
--- a/themes/pom.xml
+++ b/themes/pom.xml
@@ -24,57 +24,12 @@
                 <artifactId>maven-clean-plugin</artifactId>
                 <configuration>
                     <filesets>
-                        <fileset>
-                            <directory>${dir.account2}/web_modules</directory>
-                        </fileset>
                         <fileset>
                             <directory>${dir.common}/web_modules</directory>
                         </fileset>
                     </filesets>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>com.github.eirslett</groupId>
-                <artifactId>frontend-maven-plugin</artifactId>
-                <executions>
-                    <!-- Download NPM tools -->
-                    <execution>
-                        <id>setup-node</id>
-                        <goals>
-                            <goal>install-node-and-npm</goal>
-                        </goals>
-                        <phase>initialize</phase>
-                    </execution>
-                    <!-- Compile stuff -->
-                    <execution>
-                        <id>compile-account2</id>
-                        <goals>
-                            <goal>npm</goal>
-                        </goals>
-                        <phase>generate-resources</phase>
-                        <configuration>
-                            <workingDirectory>${dir.account2}</workingDirectory>
-                            <arguments>run build --scripts-prepend-node-path</arguments>
-                        </configuration>
-                    </execution>
-                    <!-- Download NPM packages -->
-                    <execution>
-                        <id>npm-install-account2</id>
-                        <phase>initialize</phase>
-                        <goals>
-                            <goal>npm</goal>
-                        </goals>
-                        <configuration>
-                            <workingDirectory>${dir.account2}</workingDirectory>
-                            <arguments>${args.npm.install}</arguments>
-                        </configuration>
-                    </execution>
-                </executions>
-                <configuration>
-                    <nodeVersion>${node.version}</nodeVersion>
-                    <installDirectory>${project.basedir}</installDirectory>
-                </configuration>
-            </plugin>
         </plugins>
 
         <resources>
@@ -131,6 +86,71 @@
     </build>
 
     <profiles>
+        <profile>
+            <id>account2</id>
+            <activation>
+                <property>
+                    <name>!skipAccount2</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-clean-plugin</artifactId>
+                        <configuration>
+                            <filesets>
+                                <fileset>
+                                    <directory>${dir.account2}/web_modules</directory>
+                                </fileset>
+                            </filesets>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <groupId>com.github.eirslett</groupId>
+                        <artifactId>frontend-maven-plugin</artifactId>
+                        <executions>
+                            <!-- Download NPM tools -->
+                            <execution>
+                                <id>setup-node</id>
+                                <goals>
+                                    <goal>install-node-and-npm</goal>
+                                </goals>
+                                <phase>initialize</phase>
+                            </execution>
+                            <!-- Compile stuff -->
+                            <execution>
+                                <id>compile-account2</id>
+                                <goals>
+                                    <goal>npm</goal>
+                                </goals>
+                                <phase>generate-resources</phase>
+                                <configuration>
+                                    <workingDirectory>${dir.account2}</workingDirectory>
+                                    <arguments>run build --scripts-prepend-node-path</arguments>
+                                </configuration>
+                            </execution>
+                            <!-- Download NPM packages -->
+                            <execution>
+                                <id>npm-install-account2</id>
+                                <phase>initialize</phase>
+                                <goals>
+                                    <goal>npm</goal>
+                                </goals>
+                                <configuration>
+                                    <workingDirectory>${dir.account2}</workingDirectory>
+                                    <arguments>${args.npm.install}</arguments>
+                                </configuration>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <nodeVersion>${node.version}</nodeVersion>
+                            <installDirectory>${project.basedir}</installDirectory>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
         <profile>
             <id>admin-preview</id>
             <dependencies>