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

commit 5f9330a10e8ebdd33f0fdcaf55fac431cfbdb154
Merge: 03fd6d0 0bb11aa
Author: Ian Maxon <[email protected]>
AuthorDate: Mon Jul 19 17:34:28 2021 -0700

    Merge branch 'cheshire-cat' into 'master'
    
    Change-Id: I6da73651773a8f0880a3ae542951241f8672a159

 asterixdb/asterix-dashboard/pom.xml | 22 ++++++++++++++++++++++
 asterixdb/asterix-doc/pom.xml       |  8 ++++----
 asterixdb/pom.xml                   | 13 +++++++++++++
 3 files changed, 39 insertions(+), 4 deletions(-)

diff --cc asterixdb/pom.xml
index 98884f8,8b769f4..527eb4a
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@@ -79,10 -79,11 +79,11 @@@
      <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.6-SNAPSHOT</algebricks.version>
 -    <hyracks.version>0.3.6-SNAPSHOT</hyracks.version>
 +    <algebricks.version>0.3.7-SNAPSHOT</algebricks.version>
 +    <hyracks.version>0.3.7-SNAPSHOT</hyracks.version>
      <hadoop.version>2.8.5</hadoop.version>
      <jacoco.version>0.7.6.201602180812</jacoco.version>
      <log4j.version>2.14.1</log4j.version>

Reply via email to