This is an automated email from the ASF dual-hosted git repository. mhubail pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 0428c81fc30dc4c9350017a376bf91997024a18b Merge: 37e3f5cc0a 4f3e48f971 Author: Ian Maxon <[email protected]> AuthorDate: Wed Mar 15 08:57:31 2023 -0700 Merge branch 'release-0.9.8' Change-Id: I511044b28d6a0f2f2d2639ea1432281f4b2a5c21 asterixdb/asterix-active/pom.xml | 2 +- asterixdb/asterix-algebra/pom.xml | 2 +- asterixdb/asterix-app/pom.xml | 2 +- asterixdb/asterix-benchmark/pom.xml | 2 +- asterixdb/asterix-client-helper/pom.xml | 2 +- asterixdb/asterix-column/pom.xml | 2 +- asterixdb/asterix-common/pom.xml | 2 +- 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 | 2 +- asterixdb/asterix-fuzzyjoin/pom.xml | 2 +- asterixdb/asterix-geo/pom.xml | 2 +- asterixdb/asterix-lang-common/pom.xml | 2 +- asterixdb/asterix-lang-sqlpp/pom.xml | 2 +- asterixdb/asterix-license/pom.xml | 2 +- .../asterix-grammar-extension-maven-plugin/pom.xml | 2 +- .../asterix-test-datagenerator-maven-plugin/pom.xml | 2 +- .../asterix-maven-plugins/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 +- asterixdb/asterix-om/pom.xml | 2 +- asterixdb/asterix-podman/pom.xml | 2 +- asterixdb/asterix-replication/pom.xml | 2 +- asterixdb/asterix-runtime/pom.xml | 2 +- asterixdb/asterix-server/pom.xml | 2 +- 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 +- asterixdb/pom.xml | 6 +++--- hyracks-fullstack/algebricks/algebricks-common/pom.xml | 2 +- hyracks-fullstack/algebricks/algebricks-compiler/pom.xml | 2 +- hyracks-fullstack/algebricks/algebricks-core/pom.xml | 2 +- hyracks-fullstack/algebricks/algebricks-data/pom.xml | 2 +- hyracks-fullstack/algebricks/algebricks-rewriter/pom.xml | 2 +- hyracks-fullstack/algebricks/algebricks-runtime/pom.xml | 2 +- hyracks-fullstack/algebricks/algebricks-tests/pom.xml | 2 +- hyracks-fullstack/algebricks/pom.xml | 2 +- hyracks-fullstack/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/hyracks-control/hyracks-control-cc/pom.xml | 2 +- .../hyracks/hyracks-control/hyracks-control-common/pom.xml | 2 +- .../hyracks/hyracks-control/hyracks-control-nc/pom.xml | 2 +- .../hyracks/hyracks-control/hyracks-nc-service/pom.xml | 2 +- hyracks-fullstack/hyracks/hyracks-control/pom.xml | 2 +- hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/pom.xml | 2 +- hyracks-fullstack/hyracks/hyracks-data/pom.xml | 2 +- hyracks-fullstack/hyracks/hyracks-dataflow-common/pom.xml | 2 +- hyracks-fullstack/hyracks/hyracks-dataflow-std/pom.xml | 2 +- hyracks-fullstack/hyracks/hyracks-dist/pom.xml | 2 +- hyracks-fullstack/hyracks/hyracks-documentation/pom.xml | 2 +- .../hyracks/hyracks-examples/btree-example/btreeclient/pom.xml | 2 +- .../hyracks/hyracks-examples/btree-example/btreehelper/pom.xml | 2 +- .../hyracks/hyracks-examples/btree-example/btreeserver/pom.xml | 2 +- hyracks-fullstack/hyracks/hyracks-examples/btree-example/pom.xml | 2 +- .../hyracks/hyracks-examples/hyracks-integration-tests/pom.xml | 2 +- .../hyracks/hyracks-examples/hyracks-shutdown-test/pom.xml | 2 +- hyracks-fullstack/hyracks/hyracks-examples/pom.xml | 2 +- hyracks-fullstack/hyracks/hyracks-examples/text-example/pom.xml | 2 +- .../hyracks/hyracks-examples/text-example/textclient/pom.xml | 2 +- .../hyracks/hyracks-examples/text-example/texthelper/pom.xml | 2 +- .../hyracks/hyracks-examples/text-example/textserver/pom.xml | 2 +- hyracks-fullstack/hyracks/hyracks-examples/tpch-example/pom.xml | 2 +- .../hyracks/hyracks-examples/tpch-example/tpchclient/pom.xml | 2 +- .../hyracks/hyracks-examples/tpch-example/tpchserver/pom.xml | 2 +- hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml | 2 +- hyracks-fullstack/hyracks/hyracks-http/pom.xml | 2 +- hyracks-fullstack/hyracks/hyracks-ipc/pom.xml | 2 +- .../hyracks-virtualcluster-maven-plugin/pom.xml | 2 +- .../hyracks/hyracks-maven-plugins/license-automation-plugin/pom.xml | 2 +- hyracks-fullstack/hyracks/hyracks-maven-plugins/pom.xml | 2 +- hyracks-fullstack/hyracks/hyracks-net/pom.xml | 2 +- hyracks-fullstack/hyracks/hyracks-server/pom.xml | 2 +- hyracks-fullstack/hyracks/hyracks-storage-am-bloomfilter/pom.xml | 2 +- hyracks-fullstack/hyracks/hyracks-storage-am-btree/pom.xml | 2 +- hyracks-fullstack/hyracks/hyracks-storage-am-common/pom.xml | 2 +- .../hyracks/hyracks-storage-am-lsm-btree-column/pom.xml | 4 ++-- hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/pom.xml | 2 +- hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/pom.xml | 2 +- .../hyracks/hyracks-storage-am-lsm-invertedindex/pom.xml | 2 +- hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/pom.xml | 2 +- hyracks-fullstack/hyracks/hyracks-storage-am-rtree/pom.xml | 2 +- hyracks-fullstack/hyracks/hyracks-storage-common/pom.xml | 2 +- hyracks-fullstack/hyracks/hyracks-test-support/pom.xml | 2 +- .../hyracks/hyracks-tests/hyracks-dataflow-common-test/pom.xml | 2 +- .../hyracks-tests/hyracks-storage-am-bloomfilter-test/pom.xml | 2 +- .../hyracks/hyracks-tests/hyracks-storage-am-btree-test/pom.xml | 2 +- .../hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/pom.xml | 2 +- .../hyracks-tests/hyracks-storage-am-lsm-common-test/pom.xml | 2 +- .../hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/pom.xml | 2 +- .../hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/pom.xml | 2 +- .../hyracks/hyracks-tests/hyracks-storage-am-rtree-test/pom.xml | 2 +- .../hyracks/hyracks-tests/hyracks-storage-common-test/pom.xml | 2 +- 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 | 2 +- pom.xml | 2 +- 103 files changed, 106 insertions(+), 106 deletions(-) diff --cc asterixdb/asterix-column/pom.xml index 2ee75c84a7,0000000000..ef87c9190a mode 100644,000000..100644 --- a/asterixdb/asterix-column/pom.xml +++ b/asterixdb/asterix-column/pom.xml @@@ -1,151 -1,0 +1,151 @@@ +<!-- + ! 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.9-SNAPSHOT</version> + </parent> + <artifactId>asterix-column</artifactId> + + <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> + + <build> + <plugins> + <plugin> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <executions> + <execution> + <id>default</id> + <phase>validate</phase> + <goals> + <goal>check</goal> + </goals> + <configuration> + <licenses> + <license implementation="org.apache.rat.analysis.license.ApacheSoftwareLicense20"/> + </licenses> + <excludes combine.children="append"> + <exclude>src/test/resources/result/**</exclude> + </excludes> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>org.apache.asterix</groupId> + <artifactId>asterix-common</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.asterix</groupId> + <artifactId>asterix-om</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.asterix</groupId> + <artifactId>asterix-runtime</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.asterix</groupId> + <artifactId>asterix-external-data</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-util</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-data-std</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-dataflow-common</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-storage-am-lsm-btree-column</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>algebricks-data</artifactId> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-storage-am-common</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-storage-common</artifactId> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + </dependency> + <dependency> + <groupId>it.unimi.dsi</groupId> + <artifactId>fastutil</artifactId> + </dependency> + <dependency> + <groupId>org.apache.parquet</groupId> + <artifactId>parquet-column</artifactId> + </dependency> + <dependency> + <groupId>org.apache.parquet</groupId> + <artifactId>parquet-common</artifactId> + </dependency> + <dependency> + <groupId>org.apache.parquet</groupId> + <artifactId>parquet-encoding</artifactId> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + </dependencies> +</project> diff --cc asterixdb/asterix-podman/pom.xml index 3d32518587,0000000000..23928aa6a8 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.9-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/pom.xml index 85ee76d6fc,f550b6ab15..1c9db43d09 --- a/asterixdb/pom.xml +++ b/asterixdb/pom.xml @@@ -82,19 -82,18 +82,19 @@@ <skip-npm-touch.stage>none</skip-npm-touch.stage> <!-- Versions under dependencymanagement or used in many projects via properties --> - <algebricks.version>0.3.8-SNAPSHOT</algebricks.version> - <hyracks.version>0.3.8-SNAPSHOT</hyracks.version> + <algebricks.version>0.3.9-SNAPSHOT</algebricks.version> + <hyracks.version>0.3.9-SNAPSHOT</hyracks.version> - <hadoop.version>3.3.2</hadoop.version> + <hadoop.version>3.3.4</hadoop.version> <jacoco.version>0.7.6.201602180812</jacoco.version> - <log4j.version>2.17.1</log4j.version> - <awsjavasdk.version>2.17.116</awsjavasdk.version> - <parquet.version>1.12.0</parquet.version> - <hadoop-awsjavasdk.version>1.12.109</hadoop-awsjavasdk.version> + <log4j.version>2.19.0</log4j.version> + <awsjavasdk.version>2.17.218</awsjavasdk.version> + <parquet.version>1.12.3</parquet.version> + <hadoop-awsjavasdk.version>1.12.402</hadoop-awsjavasdk.version> <azureblobjavasdk.version>12.14.2</azureblobjavasdk.version> <azuredatalakejavasdk.version>12.7.2</azuredatalakejavasdk.version> - <gcsjavasdk.version>2.3.0</gcsjavasdk.version> + <gcsjavasdk.version>2.17.2</gcsjavasdk.version> <hadoop-azuresdk.version>8.6.6</hadoop-azuresdk.version> + <hadoop-gcs.version>hadoop3-2.2.6</hadoop-gcs.version> <implementation.title>Apache AsterixDB - ${project.name}</implementation.title> <implementation.url>https://asterixdb.apache.org/</implementation.url> diff --cc hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree-column/pom.xml index 24682a8098,0000000000..cadc71468c 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,95 -1,0 +1,95 @@@ +<!-- + ! 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.9-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> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + </dependency> + </dependencies> - </project> ++</project>
