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 debb4553cbfe7245016e505bf7dd6ef617355f64 Merge: 30c60f9ad9 603d7c1e9a Author: Michael Blow <[email protected]> AuthorDate: Thu Oct 12 15:59:42 2023 -0400 Merge branch 'gerrit/trinity' into 'master' Change-Id: I3001297b663c729fdc22621444c2f9c007696129 asterixdb/asterix-app/pom.xml | 1 + asterixdb/pom.xml | 12 ++- .../appended-resources/supplemental-models.xml | 90 +++++++++++----------- ...com_netty_netty_netty-4.1.100.Final_NOTICE.txt} | 0 .../algebricks/algebricks-tests/pom.xml | 12 +++ hyracks-fullstack/hyracks/hyracks-client/pom.xml | 2 + .../hyracks-control/hyracks-control-cc/pom.xml | 21 ++++- .../hyracks/hyracks-dataflow-common/pom.xml | 1 + .../hyracks/hyracks-dataflow-std/pom.xml | 1 + .../hyracks-integration-tests/pom.xml | 19 +++++ .../hyracks-examples/hyracks-shutdown-test/pom.xml | 6 +- hyracks-fullstack/hyracks/hyracks-net/pom.xml | 1 + hyracks-fullstack/hyracks/hyracks-server/pom.xml | 7 ++ .../hyracks/hyracks-storage-am-btree/pom.xml | 1 + .../hyracks-dataflow-common-test/pom.xml | 6 ++ .../hyracks-storage-am-bloomfilter-test/pom.xml | 5 ++ .../hyracks-storage-am-btree-test/pom.xml | 13 ++++ .../hyracks-storage-am-lsm-btree-test/pom.xml | 16 ++++ .../hyracks-storage-am-lsm-common-test/pom.xml | 9 +++ .../pom.xml | 11 +++ .../hyracks-storage-am-lsm-rtree-test/pom.xml | 17 ++++ .../hyracks-storage-am-rtree-test/pom.xml | 18 +++++ .../hyracks-storage-common-test/pom.xml | 8 ++ hyracks-fullstack/hyracks/pom.xml | 2 +- hyracks-fullstack/pom.xml | 12 ++- 25 files changed, 229 insertions(+), 62 deletions(-) diff --cc hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/pom.xml index 01f426cc13,71139f9d0a..4bf1961323 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/pom.xml @@@ -24,9 -24,8 +24,8 @@@ <parent> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-control</artifactId> - <version>0.3.8.2-SNAPSHOT</version> + <version>0.3.9-SNAPSHOT</version> </parent> - <properties> <root.dir>${basedir}/../../..</root.dir> <sonar.sources>pom.xml,src/main/java,src/main/resources</sonar.sources> diff --cc hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/pom.xml index 700354e7ab,e4de6f2692..3b5ec200cb --- a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/pom.xml @@@ -181,14 -198,8 +198,15 @@@ <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-util</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-util</artifactId> + <version>${project.version}</version> + <type>test-jar</type> + <scope>test</scope> + </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-api</artifactId>
