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 23fc48b4e2bd97ccde155119c51f9913c3108779 Merge: 023e28c15d 85a3f577df Author: Michael Blow <[email protected]> AuthorDate: Mon Jan 16 21:25:12 2023 -0500 Merge branch 'gerrit/mad-hatter' Change-Id: I47d4bbea8cccc2bbf3cd1ad7fedccf7d54d3b498 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/test/support/LicensingTestBase.java | 4 +- hyracks-fullstack/pom.xml | 35 +++++---- 10 files changed, 68 insertions(+), 68 deletions(-) diff --cc asterixdb/pom.xml index f4bca0dabb,2975dc9c89..5d6a5fe962 --- a/asterixdb/pom.xml +++ b/asterixdb/pom.xml @@@ -76,20 -76,14 +76,20 @@@ <itest.excludes>${global.itest.excludes}</itest.excludes> <license.stage>compile</license.stage> <resource.stage>process-classes</resource.stage> + <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.5-SNAPSHOT</algebricks.version> - <hyracks.version>0.3.5-SNAPSHOT</hyracks.version> + <algebricks.version>0.3.6-SNAPSHOT</algebricks.version> + <hyracks.version>0.3.6-SNAPSHOT</hyracks.version> <hadoop.version>2.8.5</hadoop.version> <jacoco.version>0.7.6.201602180812</jacoco.version> - <log4j.version>2.17.1</log4j.version> + <log4j.version>2.19.0</log4j.version> <awsjavasdk.version>2.17.218</awsjavasdk.version> + <azurejavasdk.version>12.12.0</azurejavasdk.version> + <parquet.version>1.8.2</parquet.version> <implementation.title>Apache AsterixDB - ${project.name}</implementation.title> <implementation.url>https://asterixdb.apache.org/</implementation.url> diff --cc asterixdb/src/main/appended-resources/supplemental-models.xml index 8458724bdc,5e871f2bb0..24eca6a3fc --- a/asterixdb/src/main/appended-resources/supplemental-models.xml +++ b/asterixdb/src/main/appended-resources/supplemental-models.xml @@@ -202,30 -202,6 +202,30 @@@ </properties> </project> </supplement> + <supplement> + <project> + <groupId>io.netty</groupId> + <artifactId>netty-codec-dns</artifactId> + <properties> + <!-- netty is ALv2, and does not contain any embedded LICENSE or NOTICE file --> - <license.ignoreMissingEmbeddedLicense>4.1.84.Final</license.ignoreMissingEmbeddedLicense> - <license.ignoreMissingEmbeddedNotice>4.1.84.Final</license.ignoreMissingEmbeddedNotice> - <license.ignoreNoticeOverride>4.1.84.Final</license.ignoreNoticeOverride> ++ <license.ignoreMissingEmbeddedLicense>4.1.87.Final</license.ignoreMissingEmbeddedLicense> ++ <license.ignoreMissingEmbeddedNotice>4.1.87.Final</license.ignoreMissingEmbeddedNotice> ++ <license.ignoreNoticeOverride>4.1.87.Final</license.ignoreNoticeOverride> + </properties> + </project> + </supplement> + <supplement> + <project> + <groupId>io.netty</groupId> + <artifactId>netty-codec-http2</artifactId> + <properties> + <!-- netty is ALv2, and does not contain any embedded LICENSE or NOTICE file --> - <license.ignoreMissingEmbeddedLicense>4.1.84.Final</license.ignoreMissingEmbeddedLicense> - <license.ignoreMissingEmbeddedNotice>4.1.84.Final</license.ignoreMissingEmbeddedNotice> - <license.ignoreNoticeOverride>4.1.84.Final</license.ignoreNoticeOverride> ++ <license.ignoreMissingEmbeddedLicense>4.1.87.Final</license.ignoreMissingEmbeddedLicense> ++ <license.ignoreMissingEmbeddedNotice>4.1.87.Final</license.ignoreMissingEmbeddedNotice> ++ <license.ignoreNoticeOverride>4.1.87.Final</license.ignoreNoticeOverride> + </properties> + </project> + </supplement> <supplement> <project> <groupId>io.netty</groupId> @@@ -286,18 -262,6 +286,18 @@@ </properties> </project> </supplement> + <supplement> + <project> + <groupId>io.netty</groupId> + <artifactId>netty-resolver-dns</artifactId> + <properties> + <!-- netty is ALv2, and does not contain any embedded LICENSE or NOTICE file --> - <license.ignoreMissingEmbeddedLicense>4.1.84.Final</license.ignoreMissingEmbeddedLicense> - <license.ignoreMissingEmbeddedNotice>4.1.84.Final</license.ignoreMissingEmbeddedNotice> - <license.ignoreNoticeOverride>4.1.84.Final</license.ignoreNoticeOverride> ++ <license.ignoreMissingEmbeddedLicense>4.1.87.Final</license.ignoreMissingEmbeddedLicense> ++ <license.ignoreMissingEmbeddedNotice>4.1.87.Final</license.ignoreMissingEmbeddedNotice> ++ <license.ignoreNoticeOverride>4.1.87.Final</license.ignoreNoticeOverride> + </properties> + </project> + </supplement> <supplement> <project> <groupId>io.netty</groupId> diff --cc hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/test/support/LicensingTestBase.java index 9e52785009,9e52785009..283c12c35a --- a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/test/support/LicensingTestBase.java +++ b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/test/support/LicensingTestBase.java @@@ -22,7 -22,7 +22,6 @@@ import java.io.File import java.io.IOException; import java.nio.charset.StandardCharsets; import java.util.ArrayList; --import java.util.Arrays; import java.util.List; import org.apache.commons.io.FileUtils; @@@ -47,8 -47,8 +46,7 @@@ public abstract class LicensingTestBas } installerDir = FileUtil.joinPath(targetDir, list[0], topLevel[0]); Assert.assertNotNull("installerDir", list); -- Assert.assertFalse("Ambiguous install dir (" + pattern + "): " + Arrays.toString(topLevel), -- list.length > 1); ++ Assert.assertFalse("Ambiguous install dir (" + pattern + "): " + list, list.length > 1); Assert.assertEquals("Can't find install dir (" + pattern + ")", 1, topLevel.length); } } diff --cc hyracks-fullstack/pom.xml index 1ca6b2a050,5e07d9be9d..b91cbd1afb --- a/hyracks-fullstack/pom.xml +++ b/hyracks-fullstack/pom.xml @@@ -72,9 -72,10 +72,11 @@@ <!-- Versions under dependencymanagement or used in many projects via properties --> <hadoop.version>2.8.5</hadoop.version> <jacoco.version>0.7.6.201602180812</jacoco.version> - <log4j.version>2.17.1</log4j.version> + <log4j.version>2.19.0</log4j.version> <snappy.version>1.1.8.4</snappy.version> - <jackson.version>2.13.4</jackson.version> + <jackson.version>2.14.1</jackson.version> + <jackson-databind.version>${jackson.version}</jackson-databind.version> ++ <netty.version>4.1.87.Final</netty.version> <implementation.title>Apache Hyracks and Algebricks - ${project.name}</implementation.title> <implementation.url>https://asterixdb.apache.org/</implementation.url> @@@ -86,52 -87,37 +88,52 @@@ <dependency> <groupId>io.netty</groupId> <artifactId>netty-buffer</artifactId> - <version>4.1.84.Final</version> - <version>4.1.87.Final</version> ++ <version>${netty.version}</version> </dependency> <dependency> <groupId>io.netty</groupId> <artifactId>netty-common</artifactId> - <version>4.1.84.Final</version> - <version>4.1.87.Final</version> ++ <version>${netty.version}</version> </dependency> <dependency> <groupId>io.netty</groupId> <artifactId>netty-codec-http</artifactId> - <version>4.1.84.Final</version> - <version>4.1.87.Final</version> ++ <version>${netty.version}</version> </dependency> <dependency> <groupId>io.netty</groupId> <artifactId>netty-transport</artifactId> - <version>4.1.84.Final</version> - <version>4.1.87.Final</version> ++ <version>${netty.version}</version> </dependency> <dependency> <groupId>io.netty</groupId> <artifactId>netty-codec</artifactId> - <version>4.1.84.Final</version> - <version>4.1.87.Final</version> ++ <version>${netty.version}</version> </dependency> <dependency> <groupId>io.netty</groupId> <artifactId>netty-handler</artifactId> - <version>4.1.84.Final</version> - <version>4.1.87.Final</version> ++ <version>${netty.version}</version> </dependency> <dependency> <groupId>io.netty</groupId> <artifactId>netty-transport-classes-epoll</artifactId> - <version>4.1.84.Final</version> - <version>4.1.87.Final</version> ++ <version>${netty.version}</version> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-resolver-dns</artifactId> - <version>4.1.84.Final</version> ++ <version>${netty.version}</version> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-codec-http2</artifactId> - <version>4.1.84.Final</version> ++ <version>${netty.version}</version> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-transport-native-unix-common</artifactId> - <version>4.1.84.Final</version> ++ <version>${netty.version}</version> </dependency> <dependency> <groupId>junit</groupId> @@@ -208,13 -180,12 +210,18 @@@ <version>${hadoop.version}</version> <classifier>tests</classifier> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> </dependency> + <dependency> + <groupId>com.e-movimento.tinytools</groupId> + <artifactId>privilegedaccessor</artifactId> + <version>1.3</version> + </dependency> <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId>
