commit 5f9330a10e8ebdd33f0fdcaf55fac431cfbdb154
author Ian Maxon <imaxon@apache.org> Mon Jul 19 17:34:28 2021 -0700
committer Ian Maxon <imaxon@apache.org> Mon Jul 19 17:34:28 2021 -0700
tree a3c09d3716d7c66db3cf42a74319469e5649d324
parent 03fd6d0ff69a800324f8cee6ca5d2f82c210684d
parent 0bb11aa6b26c00bd52a81ffdce58858dd036c964

Merge branch 'cheshire-cat' into 'master'

Change-Id: I6da73651773a8f0880a3ae542951241f8672a159

asterixdb/asterix-dashboard/pom.xml

diff --git a/asterixdb/asterix-dashboard/pom.xml b/asterixdb/asterix-dashboard/pom.xml
index 7937f75..3604335 100644
--- a/asterixdb/asterix-dashboard/pom.xml
+++ b/asterixdb/asterix-dashboard/pom.xml
@@ -182,4 +182,26 @@
       <id>skip-dashboard</id>
     </profile>
   </profiles>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>touch-3rdparty</id>
+            <phase>${skip-npm-touch.stage}</phase>
+            <configuration>
+              <target>
+                <touch file="${basedir}/target/dashboard/static/3rdpartylicenses.txt" mkdirs="true"/>
+              </target>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>

asterixdb/asterix-doc/pom.xml

diff --git a/asterixdb/asterix-doc/pom.xml b/asterixdb/asterix-doc/pom.xml
index a5c8aed..a402d35 100644
--- a/asterixdb/asterix-doc/pom.xml
+++ b/asterixdb/asterix-doc/pom.xml
@@ -191,10 +191,10 @@
                 <id>extract-rr</id>
                 <phase>generate-sources</phase>
                 <configuration>
-                  <tasks>
+                  <target>
                     <echo message="Extracting rr" />
                     <unzip src="${project.build.directory}/rr-1.62-java8.zip" dest="${project.build.directory}" />
-                  </tasks>
+                  </target>
                 </configuration>
                 <goals>
                   <goal>run</goal>
@@ -204,13 +204,13 @@
                 <id>extract-diagrams</id>
                 <phase>process-resources</phase>
                 <configuration>
-                  <tasks>
+                  <target>
                     <echo message="Extracting diagrams" />
                     <unzip src="${project.build.directory}/railroads.zip" dest="${project.build.directory}" />
                       <copy todir="${project.build.directory}/site/images/diagrams/">
                       <fileset dir="${project.build.directory}/diagram/"/>
                     </copy>
-                  </tasks>
+                  </target>
                 </configuration>
                 <goals>
                   <goal>run</goal>

asterixdb/pom.xml

diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index 98884f8..527eb4a 100644
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@ -79,6 +79,7 @@
     <prepare-env.stage>none</prepare-env.stage>
     <shim.stage>none</shim.stage>
     <pytestlib.stage>none</pytestlib.stage>
+    <skip-npm-touch.stage>none</skip-npm-touch.stage>
 
     <!-- Versions under dependencymanagement or used in many projects via properties -->
     <algebricks.version>0.3.7-SNAPSHOT</algebricks.version>
@@ -712,6 +713,18 @@
       </properties>
     </profile>
     <profile>
+      <id>skip-npm</id>
+      <activation>
+        <property>
+          <name>skip.npm</name>
+          <value>true</value>
+        </property>
+      </activation>
+      <properties>
+          <skip-npm-touch.stage>process-sources</skip-npm-touch.stage>
+      </properties>
+    </profile>
+    <profile>
       <id>invalid-tests</id>
       <properties>
         <invalid.tests />