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 19013697dbe2d4c990ee39dc36079c415556900a Merge: 92297c7d87 fc90675063 Author: Michael Blow <[email protected]> AuthorDate: Tue Jun 20 09:03:58 2023 -0400 Merge branch 'gerrit/neo' into 'gerrit/trinity' Change-Id: Ie32fb6b9085f94ab43a4ff24efdf06520948fb47 asterixdb/asterix-active/pom.xml | 2 +- asterixdb/asterix-algebra/pom.xml | 2 +- .../provider/SqlppCompilationProvider.java | 15 +- .../array/AbstractOperatorFromSubplanRewrite.java | 2 +- .../rules/am/array/JoinFromSubplanRewrite.java | 6 +- .../optimizer/rules/cbo/EnumerateJoinsRule.java | 17 +- .../asterix/optimizer/rules/cbo/JoinEnum.java | 26 +++ .../asterix/optimizer/rules/cbo/JoinNode.java | 10 +- .../apache/asterix/optimizer/rules/cbo/Stats.java | 33 +++- asterixdb/asterix-app/pom.xml | 7 +- .../http/server/QueryServiceRequestParameters.java | 2 + .../asterix/app/function/DumpIndexDatasource.java | 7 + .../asterix/app/function/DumpIndexReader.java | 4 + .../message/RegistrationTasksResponseMessage.java | 3 + .../asterix/app/translator/QueryTranslator.java | 25 ++- .../org/apache/asterix/utils/RebalanceUtil.java | 20 ++- .../hints-use-index/hints-use-index-20.sqlpp} | 15 +- .../hints-use-index/hints-use-index-21.sqlpp} | 16 +- .../atomic-and-array-queries/query8.plan | 13 +- .../atomic-and-array-queries/query9.plan | 13 +- .../hints-use-index/hints-use-index-20.plan | 28 ++++ .../hints-use-index/hints-use-index-21.plan | 28 ++++ .../atomic-and-array-queries/query8.plan | 11 +- .../atomic-and-array-queries/query9.plan | 11 +- .../hints-use-index/hints-use-index-10.plan | 12 -- .../hints-use-index/hints-use-index-11.plan | 12 -- .../hints-use-index/hints-use-index-12.plan | 12 -- .../hints-use-index/hints-use-index-13.plan | 12 -- .../hints-use-index/hints-use-index-14.plan | 12 -- .../hints-use-index/hints-use-index-15.plan | 12 -- .../hints-use-index/hints-use-index-16.plan | 12 -- .../hints-use-index/hints-use-index-17.plan | 12 -- .../hints-use-index/hints-use-index-3.plan | 12 -- .../hints-use-index/hints-use-index-4.plan | 12 -- .../hints-use-index/hints-use-index-5.plan | 12 -- .../hints-use-index/hints-use-index-6.plan | 12 -- .../hints-use-index/hints-use-index-8.plan | 12 -- .../hints-use-index/hints-use-index-9.plan | 12 -- .../optimizerts/results_cbo/ch2/ch2_q16.plan | 65 ++++++++ .../optimizerts/results_cbo/ch2/ch2_q21.plan | 28 ++-- ..._shipping_broadcast.plan => q12_broadcast.plan} | 18 +-- ...ing_broadcast_ps.plan => q12_broadcast_ps.plan} | 36 ++--- .../optimizerts/results_cbo/tpch/q12_shipping.plan | 20 +-- .../results_cbo/tpch/q12_shipping_broadcast.plan | 18 +-- .../tpch/q12_shipping_broadcast_ps.plan | 36 ++--- .../results_cbo/tpch/q12_shipping_ps.plan | 40 ++--- .../non-pure-function.00.ddl.sqlpp} | 14 +- .../non-pure-function.01.update.sqlpp} | 8 +- .../non-pure-function.02.query.sqlpp} | 14 +- .../non-pure-function.03.query.sqlpp} | 11 +- .../non-pure-function.04.query.sqlpp} | 12 +- .../non-pure-function.05.query.sqlpp} | 11 +- .../non-pure-function.06.query.sqlpp} | 12 +- .../request-param/request-param.003.query.sqlpp} | 6 +- .../analyze-dataset-1.20.ddl.sqlpp | 5 +- .../analyze-dataset-1.21.query.sqlpp | 9 +- .../analyze-dataset-1.22.ddl.sqlpp | 6 +- .../analyze-dataset-1.23.query.sqlpp | 2 +- .../analyze-dataset-1.24.ddl.sqlpp | 6 +- .../analyze-dataset-1.25.query.sqlpp | 2 +- ...24.ddl.sqlpp => analyze-dataset-1.26.ddl.sqlpp} | 0 ...uery.sqlpp => analyze-dataset-1.27.query.sqlpp} | 0 .../analyze-dataset-with-indexes.04.query.sqlpp | 2 +- .../analyze-dataset-with-indexes.06.query.sqlpp | 4 +- .../misc/dump_index/dump_index.2.update.sqlpp | 3 +- .../cardinality-hint-warning.01.ddl.sqlpp} | 7 +- .../cardinality-hint-warning.02.query.sqlpp} | 16 +- .../cardinality-hint-warning.03.query.sqlpp} | 15 +- .../cardinality-hint-warning.04.query.sqlpp} | 15 +- .../cardinality-hint-warning.05.query.sqlpp} | 15 +- .../cardinality-hint-warning.06.query.sqlpp} | 15 +- .../cardinality-hint-warning.07.query.sqlpp} | 15 +- .../cardinality-hint-warning.08.query.sqlpp} | 15 +- .../cardinality-hint-warning.09.query.sqlpp} | 15 +- .../cardinality-hint-warning.10.query.sqlpp} | 15 +- .../cardinality-hint-warning.11.query.sqlpp} | 15 +- .../cardinality-hint-warning.12.query.sqlpp} | 15 +- .../cardinality-hint-warning.13.query.sqlpp} | 15 +- .../cardinality-hint-warning.14.query.sqlpp} | 15 +- .../hashjoin-hint-warning.01.ddl.sqlpp | 3 +- .../hashjoin-hint-warning.12.query.sqlpp} | 16 +- .../multiple-hints-warning.01.ddl.sqlpp} | 5 +- .../multiple-hints-warning.02.query.sqlpp} | 14 +- .../multiple-hints-warning.03.query.sqlpp} | 14 +- .../multiple-hints-warning.04.query.sqlpp} | 14 +- .../non-pure-function/non-pure-function.02.adm | 1 + .../non-pure-function/non-pure-function.03.adm | 1 + .../non-pure-function/non-pure-function.04.adm | 1 + .../non-pure-function/non-pure-function.05.adm | 1 + .../non-pure-function/non-pure-function.06.adm | 1 + .../api/request-param/request-param.003.adm | 2 + .../ddl/analyze-dataset-1/analyze-dataset-1.21.adm | 2 +- .../ddl/analyze-dataset-1/analyze-dataset-1.23.adm | 2 +- .../ddl/analyze-dataset-1/analyze-dataset-1.25.adm | 2 +- ...e-dataset-1.21.adm => analyze-dataset-1.27.adm} | 0 .../explain_field_access.1.plan | 28 ++-- .../explain_field_access_closed.1.plan | 28 ++-- .../array-access-pushdown.03.plan | 24 +-- .../array-access-pushdown.05.plan | 24 +-- .../array-access-pushdown.07.plan | 30 ++-- .../array-access-pushdown.09.plan | 30 ++-- .../array-access-pushdown.11.plan | 28 ++-- .../array-access-pushdown.13.plan | 28 ++-- .../array-access-pushdown.15.plan | 24 +-- .../array-access-pushdown.17.plan | 24 +-- .../array-access-pushdown.19.plan | 24 +-- .../array-access-pushdown.21.plan | 24 +-- .../field-access-pushdown.03.plan | 18 +-- .../field-access-pushdown.05.plan | 18 +-- .../field-access-pushdown.15.plan | 28 ++-- .../field-access-pushdown.17.plan | 28 ++-- .../field-access-pushdown.19.plan | 14 +- .../field-access-pushdown.21.plan | 14 +- .../field-access-pushdown.22.plan | 28 ++-- .../heterogeneous-access-pushdown.03.plan | 26 +-- .../heterogeneous-access-pushdown.05.plan | 26 +-- .../parquet/object-concat/object-concat.3.plan | 20 +-- .../parquet/object-concat/object-concat.5.plan | 24 +-- .../common/query-with-limit-plan/result.001.plan | 18 +-- .../hash-join-with-redundant-variable.04.plan | 16 +- .../hash-join-with-redundant-variable.14.plan | 20 +-- .../hash-join-with-redundant-variable.16.plan | 20 +-- .../offset_without_limit.6.plan | 14 +- .../push-limit-to-external-scan.2.plan | 18 +-- .../push-limit-to-primary-scan.3.plan | 16 +- .../push-limit-to-primary-scan.5.plan | 16 +- .../push-limit-to-primary-scan.8.plan | 24 +-- .../results/misc/dump_index/dump_index.10.adm | 2 +- .../runtimets/results/query_index/q01/q01.024.plan | 18 +-- .../runtimets/results/query_index/q01/q01.025.plan | 18 +-- .../runtimets/results/query_index/q01/q01.026.plan | 24 +-- .../runtimets/results/query_index/q01/q01.027.plan | 20 +-- .../runtimets/results/query_index/q01/q01.028.plan | 26 +-- .../runtimets/results/query_index/q01/q01.029.plan | 26 +-- .../runtimets/results/query_index/q01/q01.030.plan | 26 +-- .../runtimets/results/query_index/q01/q01.031.plan | 26 +-- .../view/view-pushdown/view-pushdown.04.plan | 30 ++-- .../view/view-pushdown/view-pushdown.06.plan | 18 +-- .../view/view-pushdown/view-pushdown.08.plan | 22 +-- .../view/view-pushdown/view-pushdown.10.plan | 22 +-- .../view/view-pushdown/view-pushdown.12.plan | 22 +-- .../view/view-pushdown/view-pushdown.14.plan | 22 +-- .../cardinality-hint-warning.02.adm | 1 + .../cardinality-hint-warning.03.adm | 1 + .../cardinality-hint-warning.04.adm | 1 + .../cardinality-hint-warning.05.adm | 1 + .../cardinality-hint-warning.06.adm | 1 + .../cardinality-hint-warning.07.adm | 1 + .../cardinality-hint-warning.08.adm | 1 + .../cardinality-hint-warning.09.adm | 1 + .../cardinality-hint-warning.10.adm | 1 + .../cardinality-hint-warning.11.adm | 1 + .../cardinality-hint-warning.12.adm | 1 + .../cardinality-hint-warning.13.adm | 1 + .../cardinality-hint-warning.14.adm | 1 + .../hashjoin-hint-warning.12.adm | 1 + .../multiple-hints-warning.02.adm | 1 + .../multiple-hints-warning.03.adm | 1 + .../multiple-hints-warning.04.adm | 1 + .../test/resources/runtimets/testsuite_sqlpp.xml | 34 ++++ asterixdb/asterix-benchmark/pom.xml | 2 +- asterixdb/asterix-client-helper/pom.xml | 2 +- asterixdb/asterix-common/pom.xml | 2 +- .../asterix/common/exceptions/ErrorCode.java | 3 + .../asterix/common/metadata/IMetadataLock.java | 2 +- .../apache/asterix/common/metadata/LockList.java | 7 +- .../asterix/common/utils/NcLocalCounters.java | 8 + .../src/main/resources/asx_errormsg/en.properties | 4 +- asterixdb/asterix-coverage/pom.xml | 2 +- asterixdb/asterix-dashboard/pom.xml | 2 +- asterixdb/asterix-doc/pom.xml | 2 +- asterixdb/asterix-examples/pom.xml | 2 +- asterixdb/asterix-external-data/pom.xml | 17 +- .../adapter/factory/GenericAdapterFactory.java | 16 +- .../input/record/reader/gcs/GCSInputStream.java | 18 +-- asterixdb/asterix-fuzzyjoin/pom.xml | 2 +- asterixdb/asterix-geo/pom.xml | 2 +- asterixdb/asterix-lang-common/pom.xml | 2 +- .../lang/common/statement/AnalyzeStatement.java | 40 +++-- .../asterix/lang/common/util/ExpressionUtils.java | 22 +++ asterixdb/asterix-lang-sqlpp/pom.xml | 2 +- .../asterix-lang-sqlpp/src/main/javacc/SQLPP.jj | 81 ++++++---- asterixdb/asterix-license/pom.xml | 2 +- .../asterix-grammar-extension-maven-plugin/pom.xml | 2 +- .../pom.xml | 2 +- .../lexer-generator-maven-plugin/pom.xml | 2 +- asterixdb/asterix-maven-plugins/pom.xml | 2 +- .../record-manager-generator-maven-plugin/pom.xml | 2 +- asterixdb/asterix-metadata/pom.xml | 2 +- .../metadata/declared/FunctionDataSource.java | 11 +- .../apache/asterix/metadata/entities/Index.java | 4 + .../apache/asterix/metadata/lock/DatasetLock.java | 20 ++- asterixdb/asterix-om/pom.xml | 2 +- asterixdb/asterix-podman/pom.xml | 2 +- asterixdb/asterix-replication/pom.xml | 2 +- asterixdb/asterix-runtime/pom.xml | 2 +- .../DatasetStreamStatsOperatorDescriptor.java | 2 +- .../transaction/GlobalResourceIdFactory.java | 39 ++++- asterixdb/asterix-server/pom.xml | 89 +++++----- asterixdb/asterix-spidersilk/pom.xml | 2 +- asterixdb/asterix-test-framework/pom.xml | 2 +- asterixdb/asterix-tools/pom.xml | 2 +- asterixdb/asterix-transactions/pom.xml | 2 +- .../PersistentLocalResourceRepository.java | 5 +- asterixdb/pom.xml | 40 ++--- .../appended-resources/supplemental-models.xml | 180 ++++++++++++--------- ...bc8e88873f0c1e42723640536866d3df_COPYRIGHT.txt} | 0 ...bc7348d6be23d2a9daaacd6b8424b8c1_COPYRIGHT.txt} | 4 +- ...7db1c3a9d42f1ae39fb35cfbb54a8742_COPYRIGHT.txt} | 4 +- ...5b7e93858a39ad4a46ba4d0e17a0aefe_COPYRIGHT.txt} | 4 +- ...-sdk-for-java_azure-identity_1.9.0_LICENSE.txt} | 0 ...e-sdk-for-java_azure-identity_1.9.0_NOTICE.txt} | 141 +++++++++++++--- ...or-java_azure-storage-blob_12.22.0_LICENSE.txt} | 0 ...for-java_azure-storage-blob_12.22.0_NOTICE.txt} | 45 ++++-- .../algebricks/algebricks-common/pom.xml | 2 +- .../algebricks/algebricks-compiler/pom.xml | 2 +- .../algebricks/algebricks-core/pom.xml | 2 +- .../logical/visitors/VariableUtilities.java | 12 ++ .../algebricks/algebricks-data/pom.xml | 2 +- .../algebricks/algebricks-rewriter/pom.xml | 2 +- .../rules/InlineAssignIntoAggregateRule.java | 31 ++-- .../algebricks/rewriter/util/JoinUtils.java | 11 +- .../algebricks/algebricks-runtime/pom.xml | 2 +- .../algebricks/algebricks-tests/pom.xml | 2 +- hyracks-fullstack/algebricks/pom.xml | 2 +- .../hyracks-fullstack-license/pom.xml | 2 +- hyracks-fullstack/hyracks/hyracks-api/pom.xml | 2 +- hyracks-fullstack/hyracks/hyracks-client/pom.xml | 2 +- hyracks-fullstack/hyracks/hyracks-comm/pom.xml | 2 +- .../hyracks-control/hyracks-control-cc/pom.xml | 2 +- .../hyracks/control/cc/work/NodeHeartbeatWork.java | 8 +- .../hyracks-control/hyracks-control-common/pom.xml | 2 +- .../hyracks/control/common/config/OptionTypes.java | 4 + .../hyracks-control/hyracks-control-nc/pom.xml | 2 +- .../hyracks-control/hyracks-nc-service/pom.xml | 2 +- hyracks-fullstack/hyracks/hyracks-control/pom.xml | 2 +- .../hyracks/hyracks-data/hyracks-data-std/pom.xml | 2 +- hyracks-fullstack/hyracks/hyracks-data/pom.xml | 2 +- .../hyracks/hyracks-dataflow-common/pom.xml | 2 +- .../hyracks/hyracks-dataflow-std/pom.xml | 2 +- hyracks-fullstack/hyracks/hyracks-dist/pom.xml | 2 +- .../hyracks/hyracks-documentation/pom.xml | 2 +- .../btree-example/btreeclient/pom.xml | 2 +- .../btree-example/btreehelper/pom.xml | 2 +- .../btree-example/btreeserver/pom.xml | 2 +- .../hyracks/hyracks-examples/btree-example/pom.xml | 2 +- .../hyracks-integration-tests/pom.xml | 2 +- .../hyracks-examples/hyracks-shutdown-test/pom.xml | 2 +- hyracks-fullstack/hyracks/hyracks-examples/pom.xml | 2 +- .../hyracks/hyracks-examples/text-example/pom.xml | 2 +- .../text-example/textclient/pom.xml | 2 +- .../text-example/texthelper/pom.xml | 2 +- .../text-example/textserver/pom.xml | 2 +- .../hyracks/hyracks-examples/tpch-example/pom.xml | 2 +- .../tpch-example/tpchclient/pom.xml | 2 +- .../tpch-example/tpchserver/pom.xml | 2 +- hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml | 10 +- hyracks-fullstack/hyracks/hyracks-http/pom.xml | 2 +- hyracks-fullstack/hyracks/hyracks-ipc/pom.xml | 2 +- .../hyracks-virtualcluster-maven-plugin/pom.xml | 2 +- .../license-automation-plugin/pom.xml | 2 +- .../hyracks/hyracks-maven-plugins/pom.xml | 2 +- hyracks-fullstack/hyracks/hyracks-net/pom.xml | 2 +- hyracks-fullstack/hyracks/hyracks-server/pom.xml | 2 +- .../hyracks/hyracks-storage-am-bloomfilter/pom.xml | 2 +- .../hyracks/hyracks-storage-am-btree/pom.xml | 2 +- .../hyracks/hyracks-storage-am-common/pom.xml | 2 +- .../hyracks-storage-am-lsm-btree-column/pom.xml | 2 +- .../hyracks/hyracks-storage-am-lsm-btree/pom.xml | 2 +- .../hyracks/hyracks-storage-am-lsm-common/pom.xml | 2 +- .../hyracks-storage-am-lsm-invertedindex/pom.xml | 2 +- .../hyracks/hyracks-storage-am-lsm-rtree/pom.xml | 2 +- .../hyracks/hyracks-storage-am-rtree/pom.xml | 2 +- .../hyracks/hyracks-storage-common/pom.xml | 2 +- .../storage/common/buffercache/BufferCache.java | 4 +- .../storage/common/file/IResourceIdFactory.java | 10 +- .../hyracks/hyracks-test-support/pom.xml | 2 +- .../hyracks-dataflow-common-test/pom.xml | 2 +- .../hyracks-storage-am-bloomfilter-test/pom.xml | 2 +- .../hyracks-storage-am-btree-test/pom.xml | 2 +- .../hyracks-storage-am-lsm-btree-test/pom.xml | 2 +- .../hyracks-storage-am-lsm-common-test/pom.xml | 2 +- .../pom.xml | 2 +- .../hyracks-storage-am-lsm-rtree-test/pom.xml | 2 +- .../hyracks-storage-am-rtree-test/pom.xml | 2 +- .../hyracks-storage-common-test/pom.xml | 2 +- .../hyracks/storage/common/BufferCacheTest.java | 24 ++- hyracks-fullstack/hyracks/hyracks-tests/pom.xml | 2 +- hyracks-fullstack/hyracks/hyracks-util/pom.xml | 2 +- hyracks-fullstack/hyracks/pom.xml | 2 +- hyracks-fullstack/pom.xml | 17 +- pom.xml | 2 +- 292 files changed, 1974 insertions(+), 1400 deletions(-) diff --cc asterixdb/asterix-podman/pom.xml index 3d32518587,0000000000..5fe3b7c682 mode 100644,000000..100644 --- a/asterixdb/asterix-podman/pom.xml +++ b/asterixdb/asterix-podman/pom.xml @@@ -1,156 -1,0 +1,156 @@@ +<!-- + ! Licensed to the Apache Software Foundation (ASF) under one + ! or more contributor license agreements. See the NOTICE file + ! distributed with this work for additional information + ! regarding copyright ownership. The ASF licenses this file + ! to you under the Apache License, Version 2.0 (the + ! "License"); you may not use this file except in compliance + ! with the License. You may obtain a copy of the License at + ! + ! http://www.apache.org/licenses/LICENSE-2.0 + ! + ! Unless required by applicable law or agreed to in writing, + ! software distributed under the License is distributed on an + ! "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + ! KIND, either express or implied. See the License for the + ! specific language governing permissions and limitations + ! under the License. + !--> + +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>apache-asterixdb</artifactId> + <groupId>org.apache.asterix</groupId> - <version>0.9.8-SNAPSHOT</version> ++ <version>0.9.8.2-SNAPSHOT</version> + </parent> + <artifactId>asterix-podman</artifactId> + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>asterix-server</artifactId> + <version>${project.version}</version> + <type>deb</type> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.asterix</groupId> + <artifactId>asterix-app</artifactId> + <version>${project.version}</version> + <classifier>tests</classifier> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.asterix</groupId> + <artifactId>asterix-test-framework</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.testcontainers</groupId> + <artifactId>testcontainers</artifactId> + <version>1.17.1</version> + <scope>test</scope> + </dependency> + </dependencies> + + <properties> + <root.dir>${basedir}/..</root.dir> + </properties> + + <licenses> + <license> + <name>Apache License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo</distribution> + <comments>A business-friendly OSS license</comments> + </license> + </licenses> + <build> + <plugins> + <plugin> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <configuration> + <excludes combine.children="append"> + <exclude>src/test/resources/setup.sh</exclude> + <exclude>src/test/resources/passwd</exclude> + <exclude>src/test/resources/socktest/Containerfile</exclude> + <exclude>src/test/resources/testenv.conf</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </build> + <profiles> + <profile> + <id>podman.tests</id> + <properties> + <test.excludes>**/*.java</test.excludes> + <itest.includes>**/PodmanPythonFunctionIT.java</itest.includes> + <failIfNoTests>false</failIfNoTests> + </properties> + <build> + <plugins> + <plugin> + <groupId>nl.lexemmens</groupId> + <artifactId>podman-maven-plugin</artifactId> + <version>1.8.0</version> + <executions> + <execution> + <goals> + <goal>build</goal> + </goals> + <phase>generate-test-resources</phase> + </execution> + </executions> + <configuration> + <skipAuth>true</skipAuth> + <images> + <image> + <name>asterixdb/socktest</name> + <build> + <pull>false</pull> + <createLatestTag>true</createLatestTag> + <containerFileDir>src/test/resources/socktest</containerFileDir> + </build> + </image> + </images> + </configuration> + </plugin> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <executions> + <execution> + <id>copy-external-data-resources</id> + <phase>generate-resources</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>target/</outputDirectory> + <overwrite>true</overwrite> + <resources> + <resource> + <directory>../asterix-server/target</directory> + <includes> + <include>asterix-server*.deb</include> + </includes> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> + +</project> diff --cc asterixdb/asterix-server/pom.xml index c15152aea5,0dcfbdec5e..fc473be0dd --- a/asterixdb/asterix-server/pom.xml +++ b/asterixdb/asterix-server/pom.xml @@@ -633,8 -518,7 +615,9 @@@ <aliasUrl>https://raw.githubusercontent.com/googleapis/gapic-generator-java/v2.13.0/java-common-protos/LICENSE</aliasUrl> <aliasUrl>https://raw.githubusercontent.com/googleapis/google-api-java-client/v2.1.2/LICENSE</aliasUrl> <aliasUrl>https://raw.githubusercontent.com/grpc/grpc-java/v1.52.1/LICENSE</aliasUrl> + <aliasUrl>https://raw.githubusercontent.com/reactor/reactor-netty/v1.0.28/LICENSE</aliasUrl> + <aliasUrl>https://raw.githubusercontent.com/googleapis/java-core/v2.8.0/LICENSE</aliasUrl> + <aliasUrl>https://raw.githubusercontent.com/google/gson/gson-parent-2.9.0/LICENSE</aliasUrl> </aliasUrls> <metric>1</metric> </license> diff --cc hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree-column/pom.xml index 9e4a2974ab,0000000000..80cfe8162d mode 100644,000000..100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree-column/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree-column/pom.xml @@@ -1,91 -1,0 +1,91 @@@ +<!-- + ! Licensed to the Apache Software Foundation (ASF) under one + ! or more contributor license agreements. See the NOTICE file + ! distributed with this work for additional information + ! regarding copyright ownership. The ASF licenses this file + ! to you under the Apache License, Version 2.0 (the + ! "License"); you may not use this file except in compliance + ! with the License. You may obtain a copy of the License at + ! + ! http://www.apache.org/licenses/LICENSE-2.0 + ! + ! Unless required by applicable law or agreed to in writing, + ! software distributed under the License is distributed on an + ! "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + ! KIND, either express or implied. See the License for the + ! specific language governing permissions and limitations + ! under the License. + !--> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + <artifactId>hyracks-storage-am-lsm-btree-column</artifactId> + <parent> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks</artifactId> - <version>0.3.8-SNAPSHOT</version> ++ <version>0.3.8.2-SNAPSHOT</version> + </parent> + <licenses> + <license> + <name>Apache License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo</distribution> + <comments>A business-friendly OSS license</comments> + </license> + </licenses> + <properties> + <root.dir>${basedir}/../..</root.dir> + </properties> + <dependencies> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-storage-am-btree</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-storage-am-lsm-btree</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-storage-am-bloomfilter</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-storage-am-lsm-common</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-dataflow-common</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-storage-am-common</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-storage-common</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-data-std</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-util</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> +</project>
