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 761f0b354a6ecf5be3bee5aaef0167109668d783 Merge: 8363dcb 55e1980 Author: Michael Blow <[email protected]> AuthorDate: Thu Jan 20 21:42:18 2022 -0500 Merge branch 'gerrit/stabilization-5949a1cb71' Change-Id: I6d9ed728c40d740cdecde440cadce441ce515798 asterixdb/asterix-runtime/pom.xml | 1 - asterixdb/asterix-server/pom.xml | 35 ++++-------- asterixdb/pom.xml | 12 ++-- .../appended-resources/supplemental-models.xml | 65 +++++++++++++--------- ...e_netty-tcnative-parent-2.0.46.Final_NOTICE.txt | 51 +++++++++++++++++ ....com_netty_netty_netty-4.1.73.Final_NOTICE.txt} | 0 hyracks-fullstack/hyracks/hyracks-http/pom.xml | 2 +- .../license-automation-plugin/pom.xml | 2 +- hyracks-fullstack/pom.xml | 36 ++++++------ 9 files changed, 129 insertions(+), 75 deletions(-) diff --cc asterixdb/asterix-server/pom.xml index 2044fe2,e912257..5300fa8 --- a/asterixdb/asterix-server/pom.xml +++ b/asterixdb/asterix-server/pom.xml @@@ -193,38 -181,10 +181,39 @@@ <noticeUrl>https://raw.githubusercontent.com/netty/netty/netty-4.1.69.Final/NOTICE.txt</noticeUrl> </override> <override> - <gav>io.netty:netty-codec-http:4.1.69.Final</gav> - <noticeUrl>https://raw.githubusercontent.com/netty/netty/netty-4.1.69.Final/NOTICE.txt</noticeUrl> + <gav>io.netty:netty-tcnative-classes:2.0.46.Final</gav> + <url>http://www.apache.org/licenses/LICENSE-2.0</url> + <noticeUrl>https://raw.githubusercontent.com/netty/netty-tcnative/netty-tcnative-parent-2.0.46.Final/NOTICE.txt</noticeUrl> </override> + <override> + <gav>org.reactivestreams:reactive-streams:1.0.2</gav> + <noticeUrl>https://raw.githubusercontent.com/reactive-streams/reactive-streams-jvm/v1.0.2/COPYING.txt</noticeUrl> + <url>https://raw.githubusercontent.com/reactive-streams/reactive-streams-jvm/v1.0.2/LICENSE.txt</url> + </override> + <override> + <gavs> + <gav>software.amazon.awssdk:sdk-core:2.10.83</gav> + <gav>software.amazon.awssdk:aws-core:2.10.83</gav> + <gav>software.amazon.awssdk:auth:2.10.83</gav> + <gav>software.amazon.awssdk:arns:2.10.83</gav> + <gav>software.amazon.awssdk:annotations:2.10.83</gav> + <gav>software.amazon.awssdk:utils:2.10.83</gav> + <gav>software.amazon.awssdk:aws-query-protocol:2.10.83</gav> + <gav>software.amazon.awssdk:profiles:2.10.83</gav> + <gav>software.amazon.awssdk:protocol-core:2.10.83</gav> + <gav>software.amazon.awssdk:s3:2.10.83</gav> + <gav>software.amazon.awssdk:netty-nio-client:2.10.83</gav> + <gav>software.amazon.awssdk:apache-client:2.10.83</gav> + <gav>software.amazon.awssdk:aws-xml-protocol:2.10.83</gav> + <gav>software.amazon.awssdk:regions:2.10.83</gav> + <gav>software.amazon.awssdk:http-client-spi:2.10.83</gav> + </gavs> + <noticeUrl>https://raw.githubusercontent.com/aws/aws-sdk-java-v2/2.10.83/NOTICE.txt</noticeUrl> + </override> + <override> + <gav>software.amazon.eventstream:eventstream:1.0.1</gav> + <noticeUrl>https://raw.githubusercontent.com/awslabs/aws-eventstream-java/7be2dd80e12f8835674c8ffb0f4a2efb64c7b585/NOTICE</noticeUrl> + </override> </overrides> <licenses> <license> diff --cc asterixdb/pom.xml index 946cc3a,8a94592..f5bfc60 --- a/asterixdb/pom.xml +++ b/asterixdb/pom.xml @@@ -82,8 -81,7 +82,8 @@@ <hyracks.version>0.3.5-SNAPSHOT</hyracks.version> <hadoop.version>2.8.5</hadoop.version> <jacoco.version>0.7.6.201602180812</jacoco.version> - <log4j.version>2.14.1</log4j.version> + <log4j.version>2.17.1</log4j.version> + <awsjavasdk.version>2.10.83</awsjavasdk.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 999b414,138a39b..4799310 --- a/asterixdb/src/main/appended-resources/supplemental-models.xml +++ b/asterixdb/src/main/appended-resources/supplemental-models.xml @@@ -370,231 -384,4 +384,232 @@@ </properties> </project> </supplement> + + <!-- AWS SDK begin --> + <!-- software.amazon.awssdk is ALv2, and does not contain any embedded LICENSE or NOTICE file --> + <!-- license override not needed, ALv2 is specified in its pom.xml --> + <!-- see https://github.com/aws/aws-sdk-java-v2/blob/master/LICENSE.txt --> + <supplement> + <project> + <groupId>software.amazon.awssdk</groupId> + <artifactId>sdk-core</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>2.10.83</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>2.10.83</license.ignoreMissingEmbeddedNotice> + <license.ignoreNoticeOverride>2.10.83</license.ignoreNoticeOverride> + </properties> + </project> + </supplement> + <supplement> + <project> + <groupId>software.amazon.awssdk</groupId> + <artifactId>aws-core</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>2.10.83</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>2.10.83</license.ignoreMissingEmbeddedNotice> + <license.ignoreNoticeOverride>2.10.83</license.ignoreNoticeOverride> + </properties> + </project> + </supplement> + <supplement> + <project> + <groupId>software.amazon.awssdk</groupId> + <artifactId>s3</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>2.10.83</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>2.10.83</license.ignoreMissingEmbeddedNotice> + <license.ignoreNoticeOverride>2.10.83</license.ignoreNoticeOverride> + </properties> + </project> + </supplement> + <supplement> + <project> + <groupId>software.amazon.awssdk</groupId> + <artifactId>auth</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>2.10.83</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>2.10.83</license.ignoreMissingEmbeddedNotice> + <license.ignoreNoticeOverride>2.10.83</license.ignoreNoticeOverride> + </properties> + </project> + </supplement> + <supplement> + <project> + <groupId>software.amazon.awssdk</groupId> + <artifactId>protocol-core</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>2.10.83</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>2.10.83</license.ignoreMissingEmbeddedNotice> + <license.ignoreNoticeOverride>2.10.83</license.ignoreNoticeOverride> + </properties> + </project> + </supplement> + <supplement> + <project> + <groupId>software.amazon.awssdk</groupId> + <artifactId>regions</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>2.10.83</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>2.10.83</license.ignoreMissingEmbeddedNotice> + <license.ignoreNoticeOverride>2.10.83</license.ignoreNoticeOverride> + </properties> + </project> + </supplement> + <supplement> + <project> + <groupId>software.amazon.awssdk</groupId> + <artifactId>arns</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>2.10.83</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>2.10.83</license.ignoreMissingEmbeddedNotice> + <license.ignoreNoticeOverride>2.10.83</license.ignoreNoticeOverride> + </properties> + </project> + </supplement> + <supplement> + <project> + <groupId>software.amazon.awssdk</groupId> + <artifactId>netty-nio-client</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>2.10.83</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>2.10.83</license.ignoreMissingEmbeddedNotice> + <license.ignoreNoticeOverride>2.10.83</license.ignoreNoticeOverride> + </properties> + </project> + </supplement> + <supplement> + <project> + <groupId>software.amazon.awssdk</groupId> + <artifactId>aws-xml-protocol</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>2.10.83</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>2.10.83</license.ignoreMissingEmbeddedNotice> + <license.ignoreNoticeOverride>2.10.83</license.ignoreNoticeOverride> + </properties> + </project> + </supplement> + <supplement> + <project> + <groupId>software.amazon.awssdk</groupId> + <artifactId>annotations</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>2.10.83</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>2.10.83</license.ignoreMissingEmbeddedNotice> + <license.ignoreNoticeOverride>2.10.83</license.ignoreNoticeOverride> + </properties> + </project> + </supplement> + <supplement> + <project> + <groupId>software.amazon.awssdk</groupId> + <artifactId>apache-client</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>2.10.83</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>2.10.83</license.ignoreMissingEmbeddedNotice> + <license.ignoreNoticeOverride>2.10.83</license.ignoreNoticeOverride> + </properties> + </project> + </supplement> + <supplement> + <project> + <groupId>software.amazon.awssdk</groupId> + <artifactId>utils</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>2.10.83</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>2.10.83</license.ignoreMissingEmbeddedNotice> + <license.ignoreNoticeOverride>2.10.83</license.ignoreNoticeOverride> + </properties> + </project> + </supplement> + <supplement> + <project> + <groupId>software.amazon.awssdk</groupId> + <artifactId>http-client-spi</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>2.10.83</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>2.10.83</license.ignoreMissingEmbeddedNotice> + <license.ignoreNoticeOverride>2.10.83</license.ignoreNoticeOverride> + </properties> + </project> + </supplement> + <supplement> + <project> + <groupId>software.amazon.awssdk</groupId> + <artifactId>aws-query-protocol</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>2.10.83</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>2.10.83</license.ignoreMissingEmbeddedNotice> + <license.ignoreNoticeOverride>2.10.83</license.ignoreNoticeOverride> + </properties> + </project> + </supplement> + <supplement> + <project> + <groupId>software.amazon.awssdk</groupId> + <artifactId>profiles</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>2.10.83</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>2.10.83</license.ignoreMissingEmbeddedNotice> + <license.ignoreNoticeOverride>2.10.83</license.ignoreNoticeOverride> + </properties> + </project> + </supplement> + + <!-- software.amazon.eventstream is ALv2, and does not contain any embedded LICENSE or NOTICE file --> + <!-- license override not needed, ALv2 is specified in its pom.xml --> + <!-- see https://github.com/awslabs/aws-eventstream-java --> + <supplement> + <project> + <groupId>software.amazon.eventstream</groupId> + <artifactId>eventstream</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>1.0.1</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>1.0.1</license.ignoreMissingEmbeddedNotice> + <license.ignoreNoticeOverride>1.0.1</license.ignoreNoticeOverride> + </properties> + </project> + </supplement> + <!-- AWS SDK end --> + + <!-- com.typesafe.netty is ALv2, and does not contain any embedded LICENSE or NOTICE file --> + <!-- license override not needed, ALv2 is specified in its pom.xml --> + <!-- see https://github.com/playframework/netty-reactive-streams --> + <supplement> + <project> + <groupId>com.typesafe.netty</groupId> + <artifactId>netty-reactive-streams</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>2.0.4</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>2.0.4</license.ignoreMissingEmbeddedNotice> + </properties> + </project> + </supplement> + + <supplement> + <project> + <groupId>com.typesafe.netty</groupId> + <artifactId>netty-reactive-streams-http</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>2.0.4</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>2.0.4</license.ignoreMissingEmbeddedNotice> + </properties> + </project> + </supplement> + + <!-- org.reactivestreams does not contain any embedded LICENSE or NOTICE file --> + <!-- see https://github.com/reactive-streams/reactive-streams-jvm --> + <supplement> + <project> + <groupId>org.reactivestreams</groupId> + <artifactId>reactive-streams</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>1.0.2</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>1.0.2</license.ignoreMissingEmbeddedNotice> + <license.ignoreLicenseOverride>1.0.2</license.ignoreLicenseOverride> + <license.ignoreNoticeOverride>1.0.2</license.ignoreNoticeOverride> + </properties> + </project> + </supplement> + ++ </supplementalDataModels>
