You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by im...@apache.org on 2019/04/10 02:35:38 UTC

[asterixdb] branch master updated: [NO ISSUE][TEST] Allow asterix-dashboard skip

This is an automated email from the ASF dual-hosted git repository.

imaxon pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git


The following commit(s) were added to refs/heads/master by this push:
     new 4f24399  [NO ISSUE][TEST] Allow asterix-dashboard skip
4f24399 is described below

commit 4f24399bc32adfd695fdf682838a6bca3e4b9a6d
Author: Ian Maxon <im...@apache.org>
AuthorDate: Thu Apr 4 13:56:19 2019 -0700

    [NO ISSUE][TEST] Allow asterix-dashboard skip
    
    This allows the skip.npm property of the frontend-maven-plugin
    to work properly for the asterix-dashboard module, so it can
    be skipped for test runs that don't require it to be built
    outside of the java components it has.
    
    Change-Id: Ie089a8649376caf731f989da3db4e8443981ec63
    Reviewed-on: https://asterix-gerrit.ics.uci.edu/3316
    Sonar-Qube: Jenkins <je...@fulliautomatix.ics.uci.edu>
    Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
    Integration-Tests: Jenkins <je...@fulliautomatix.ics.uci.edu>
    Contrib: Jenkins <je...@fulliautomatix.ics.uci.edu>
    Reviewed-by: Wail Alkowaileet <wa...@gmail.com>
---
 asterixdb/asterix-dashboard/pom.xml |  4 ++--
 asterixdb/pom.xml                   | 15 +++++++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/asterixdb/asterix-dashboard/pom.xml b/asterixdb/asterix-dashboard/pom.xml
index acf7e13..ff4234f 100644
--- a/asterixdb/asterix-dashboard/pom.xml
+++ b/asterixdb/asterix-dashboard/pom.xml
@@ -102,7 +102,7 @@
         <executions>
           <execution>
             <id>copy-static</id>
-            <phase>process-classes</phase>
+            <phase>${resource.stage}</phase>
             <goals>
               <goal>copy-resources</goal>
             </goals>
@@ -143,7 +143,7 @@
         <artifactId>license-automation-plugin</artifactId>
         <executions>
           <execution>
-            <phase>compile</phase>
+            <phase>${license.stage}</phase>
             <goals>
               <goal>generate</goal>
             </goals>
diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index 0e6e80d..decf7e7 100644
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@ -73,6 +73,8 @@
     <global.itest.excludes/>
     <itest.includes>${global.itest.includes}</itest.includes>
     <itest.excludes>${global.itest.excludes}</itest.excludes>
+    <license.stage>compile</license.stage>
+    <resource.stage>process-classes</resource.stage>
 
     <!-- Versions under dependencymanagement or used in many projects via properties -->
     <algebricks.version>0.3.5-SNAPSHOT</algebricks.version>
@@ -620,6 +622,19 @@
       </properties>
     </profile>
     <profile>
+      <id>skip-dashboard</id>
+      <activation>
+        <property>
+          <name>skip.npm</name>
+          <value>true</value>
+        </property>
+      </activation>
+      <properties>
+        <license.stage>none</license.stage>
+        <resource.stage>none</resource.stage>
+      </properties>
+    </profile>
+    <profile>
       <id>invalid-tests</id>
       <properties>
         <invalid.tests />