Fix profiles in vaadin-root pom.xml (#8484)

diff --git a/pom.xml b/pom.xml
index 15e06ac3f277c6a05fd7f817d22dee0fac74b57e..8da154286f95f4fb4e494ebc00291a197dcd9b0f 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,7 @@
 
         <!-- Dependency unpack directory -->
         <dependency.unpack.directory>${project.build.directory}/dependency-unpack</dependency.unpack.directory>
-        
+
         <jetty.version>9.3.7.v20160115</jetty.version>
         <phantomjs.version>2.1.1</phantomjs.version>
 
@@ -125,13 +125,13 @@
                 <artifactId>vaadin-sass-compiler</artifactId>
                 <version>${vaadin.sass.version}</version>
                 <exclusions>
-                <!-- No need to have the minifier included for development 
-                    mode on-the-fly compilation -->
-                <exclusion>
-                    <groupId>com.yahoo.platform.yui</groupId>
-                    <artifactId>yuicompressor</artifactId>
-                </exclusion>
-            </exclusions>
+                    <!-- No need to have the minifier included for development 
+                        mode on-the-fly compilation -->
+                    <exclusion>
+                        <groupId>com.yahoo.platform.yui</groupId>
+                        <artifactId>yuicompressor</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>com.carrotsearch</groupId>
@@ -169,10 +169,10 @@
                 <artifactId>junit</artifactId>
                 <version>4.12</version>
                 <exclusions>
-                   <exclusion>
-                       <artifactId>hamcrest-core</artifactId>
-                       <groupId>org.hamcrest</groupId>
-                   </exclusion>
+                    <exclusion>
+                        <artifactId>hamcrest-core</artifactId>
+                        <groupId>org.hamcrest</groupId>
+                    </exclusion>
                 </exclusions>
             </dependency>
             <dependency>
@@ -215,10 +215,10 @@
                 <artifactId>mockito-core</artifactId>
                 <version>1.9.5</version>
                 <exclusions>
-                   <exclusion>
-                      <artifactId>hamcrest-core</artifactId>
-                      <groupId>org.hamcrest</groupId>
-                  </exclusion>
+                    <exclusion>
+                        <artifactId>hamcrest-core</artifactId>
+                        <groupId>org.hamcrest</groupId>
+                    </exclusion>
                 </exclusions>
             </dependency>
             <dependency>
@@ -567,14 +567,10 @@
 
     <profiles>
         <profile>
-            <!--  Profile is triggered unless apiDiff property is defined:
-                  always except "apicmp" profile which is disjoint with this profile
-            !-->
+            <!-- Default build profile that runs all modules. -->
             <id>default</id>
             <activation>
-                <property>
-                    <name>!apiDiff</name>
-                </property>
+                <activeByDefault>true</activeByDefault>
             </activation>
             <modules>
                 <module>buildhelpers</module>
@@ -595,24 +591,52 @@
                 <module>compatibility-shared</module>
                 <module>compatibility-themes</module>
                 <module>testbench-api</module>
-                <!-- Nexus staging bug needs the last module to be deployed. -->
                 <module>bom</module>
             </modules>
         </profile>
         <profile>
+            <!-- Profile for running integration tests. Vaadin version to 
+                be tested can be defined with property vaadin.version -->
             <id>slowtest</id>
             <modules>
                 <module>test</module>
             </modules>
         </profile>
         <profile>
+            <!-- This profile builds the assembled parts of the Framework 
+                for website release. Should be run after running the release profile -->
+            <id>release-assemblies</id>
+            <modules>
+                <module>liferay</module>
+                <module>all</module>
+            </modules>
+        </profile>
+        <profile>
+            <!-- Release build only builds artifacts that are deployed or 
+                needed by them -->
             <id>release</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-            </activation>
             <properties>
                 <vaadin.plugin.version>${project.version}</vaadin.plugin.version>
             </properties>
+            <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>compatibility-server</module>
+                <module>compatibility-client</module>
+                <module>compatibility-client-compiled</module>
+                <module>compatibility-shared</module>
+                <module>compatibility-themes</module>
+                <module>testbench-api</module>
+                <!-- Nexus staging bug needs the last module to be deployed. -->
+                <module>bom</module>
+            </modules>
+
             <build>
                 <plugins>
                     <plugin>
@@ -658,19 +682,12 @@
             </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).
-            !-->
+            <!-- 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>
-                <property>
-                    <name>apiDiff</name>
-                </property>
-            </activation>
             <modules>
                 <module>server</module>
                 <module>push</module>
@@ -722,10 +739,9 @@
             </build>
         </profile>
         <profile>
+            <!-- Testing profile for measurement tests. Use along with default 
+                profile -->
             <id>measurements</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-            </activation>
             <properties>
                 <skipTests>true</skipTests>
             </properties>

diff --git a/uitest/pom.xml b/uitest/pom.xml
index e88e46d2ac8465122fb5e80cdc10c51f657e9f6b..d2abf4cd7ceb13d87dc71612677f70b3c9dee128 100644 (file)
--- a/uitest/pom.xml
+++ b/uitest/pom.xml
@@ -310,26 +310,10 @@
                     <skip>${skip.uitest.deployment}</skip>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>animal-sniffer-maven-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
             <plugin>
                 <artifactId>maven-failsafe-plugin</artifactId>
                 <configuration>
                     <skip>${skip.uitest.failsafe}</skip>
-                    <includes>
-                        <include>**/AllTB3Tests.java</include>
-                    </includes>
                     <systemPropertyVariables>
                         <!-- Static path for screenshots pointing to submodule -->
                         <com.vaadin.testbench.screenshot.directory>${project.parent.basedir}/tests/screenshots</com.vaadin.testbench.screenshot.directory>
@@ -342,7 +326,12 @@
                         <categories.include>${categories.include}</categories.include>
                         <categories.exclude>${categories.exclude}</categories.exclude>
                         <useLocalWebDriver>${useLocalWebDriver}</useLocalWebDriver>
+                        <!-- PhantomJS binary downloaded by phantomjs-maven-plugin -->
+<!--                        <phantomjs.binary.path>${phantomjs.binary}</phantomjs.binary.path> -->
                     </systemPropertyVariables>
+                    <includes>
+                        <include>**/AllTB3Tests.java</include>
+                    </includes>
                 </configuration>
                 <executions>
                     <execution>
@@ -353,6 +342,19 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>animal-sniffer-maven-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
         </plugins>
         <pluginManagement>
             <plugins>
@@ -435,19 +437,8 @@
                 <plugins>
                     <plugin>
                         <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                            </execution>
-                        </executions>
                         <configuration>
                             <groups>com.vaadin.testcategory.MeasurementTest</groups>
-                            <systemPropertyVariables>
-                                <phantomjs.binary.path>${phantomjs.binary}</phantomjs.binary.path>
-                            </systemPropertyVariables>
                         </configuration>
                     </plugin>
                 </plugins>

diff --git a/uitest/src/test/java/com/vaadin/tests/performance/MemoryIT.java b/uitest/src/test/java/com/vaadin/tests/performance/MemoryIT.java
index b5ba723c7defb7a74771627c51fa5db83fa6bd1a..4ac3ae68ff960f0d2d53d15418bff1ddf3134f76 100644 (file)
--- a/uitest/src/test/java/com/vaadin/tests/performance/MemoryIT.java
+++ b/uitest/src/test/java/com/vaadin/tests/performance/MemoryIT.java
@@ -44,11 +44,6 @@ public class MemoryIT extends SingleBrowserTest {
     protected void closeApplication() {
     }
 
-    @Override
-    protected String getScreenshotDirectory() {
-        return ".";
-    }
-
     private long getGridSize(String path, int itemsCount) {
         // Repeat until we get consecutive results within 0.1% of each other
         double lastResult = 0;