You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@asterixdb.apache.org by mb...@apache.org on 2023/01/27 14:19:39 UTC

[asterixdb] 09/10: Merge branch 'gerrit/stabilization-667a908755'

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

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

commit 6512463b026f5d87eae8d528c1497a4cdebe5f78
Merge: 2aa06c577b fd8cd3051c
Author: Michael Blow <mb...@apache.org>
AuthorDate: Mon Jan 23 21:43:38 2023 -0500

    Merge branch 'gerrit/stabilization-667a908755'
    
    Change-Id: Ic9669e91dda5824631d6f134c9f0c332cf7b8590

 asterixdb/asterix-app/pom.xml                      |  1 -
 asterixdb/asterix-external-data/pom.xml            |  1 -
 asterixdb/pom.xml                                  |  4 +-
 .../appended-resources/supplemental-models.xml     | 88 +++++++++++-----------
 ....com_netty_netty_netty-4.1.87.Final_NOTICE.txt} |  0
 .../hyracks-control/hyracks-nc-service/pom.xml     |  1 -
 .../hyracks/hyracks-dataflow-std/pom.xml           |  1 -
 .../hyracks-integration-tests/pom.xml              |  1 -
 .../hyracks/maven/license/GenerateFileMojo.java    | 62 +++++++++------
 .../apache/hyracks/maven/license/LicenseMojo.java  |  6 ++
 .../apache/hyracks/maven/license/ProjectFlag.java  | 39 ++++++++--
 .../hyracks/test/support/LicensingTestBase.java    |  4 +-
 hyracks-fullstack/pom.xml                          | 35 +++++----
 13 files changed, 146 insertions(+), 97 deletions(-)