Change japicmp profile activation to avoid run it for all modules.

Change-Id: Id25311621de43d247b21359a1069e694562a2762

diff --git a/all/pom.xml b/all/pom.xml
index e4658dffd11285db993428801a1cfb9c5f5b053a..1630241db71c922b228427aa8c8b45276ec5113e 100644 (file)
--- a/all/pom.xml
+++ b/all/pom.xml
@@ -338,22 +338,5 @@
                 </pluginManagement>
             </build>
         </profile>
-        <profile>
-            <id>apicmp</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>com.github.siom79.japicmp</groupId>
-                        <artifactId>japicmp-maven-plugin</artifactId>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
     </profiles>
 </project>

diff --git a/pom.xml b/pom.xml
index 53647e8a36a8927f3444c292b03f10bcbb6556e3..e87295383a656638500932858e0519a9b4d0bbe9 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -47,7 +47,6 @@
         
         <jetty.version>9.3.7.v20160115</jetty.version>
         <phantomjs.version>2.1.1</phantomjs.version>
-        <skipApiDiff></skipApiDiff>
     </properties>
 
     <!-- TODO: remove this after maven plugin has been released -->
@@ -87,28 +86,6 @@
     </scm>
 
 
-    <modules>
-        <module>buildhelpers</module>
-        <module>shared</module>
-        <module>push</module>
-        <module>server</module>
-        <module>client</module>
-        <module>client-compiler</module>
-        <module>client-compiled</module>
-        <module>themes</module>
-        <module>widgets</module>
-        <module>uitest-common</module>
-        <module>uitest</module>
-        <module>liferay</module>
-        <module>all</module>
-        <module>compatibility-server</module>
-        <module>compatibility-client</module>
-        <module>compatibility-client-compiled</module>
-        <module>compatibility-shared</module>
-        <!-- Nexus staging bug needs the last module to be deployed. -->
-        <module>bom</module>
-    </modules>
-
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -548,6 +525,38 @@
     </build>
 
     <profiles>
+        <profile>
+            <!--  Profile is triggered unless apiDiff property is defined:
+                  always except "apicmp" profile which is disjoint with this profile
+            !-->
+            <id>default</id>
+            <activation>
+                <property>
+                    <name>!apiDiff</name>
+                </property>
+            </activation>
+            <modules>
+                <module>buildhelpers</module>
+                <module>shared</module>
+                <module>push</module>
+                <module>server</module>
+                <module>client</module>
+                <module>client-compiler</module>
+                <module>client-compiled</module>
+                <module>themes</module>
+                <module>widgets</module>
+                <module>uitest-common</module>
+                <module>uitest</module>
+                <module>liferay</module>
+                <module>all</module>
+                <module>compatibility-server</module>
+                <module>compatibility-client</module>
+                <module>compatibility-client-compiled</module>
+                <module>compatibility-shared</module>
+                <!-- Nexus staging bug needs the last module to be deployed. -->
+                <module>bom</module>
+            </modules>
+        </profile>
         <profile>
             <id>slowtest</id>
             <modules>
@@ -607,10 +616,28 @@
             </build>
         </profile>
         <profile>
+            <!--  Profile is triggered if apiDiff property is defined:
+                  this profile is disjoint with default profile.
+                  It allows to prevent running build for all available modules 
+                  but restricts a number of modules to specified here only
+                  (which allows to avoid long time compilation for projects 
+                  that are not needed since japicmp works with compiled classes).
+            !-->
             <id>apicmp</id>
             <activation>
-                <activeByDefault>false</activeByDefault>
+                <property>
+                    <name>apiDiff</name>
+                </property>
             </activation>
+            <modules>
+                <module>server</module>
+                <module>client</module>
+                <module>compatibility-server</module>
+                <module>compatibility-client</module>
+                <module>client-compiler</module>
+                <module>shared</module>
+                <module>compatibility-shared</module>
+            </modules>
             <build>
                 <plugins>
                     <plugin>
@@ -649,8 +676,9 @@
                         </executions>
                     </plugin>
                 </plugins>
-        </build>
+            </build>
         </profile>
     </profiles>
 
 </project>
+