Skip to content
Permalink
Browse files
[NO ISSUE][MISC] Update dependencies
 - AWS Java SDK version ................ 2.10.83 -> 2.17.116
 - org.apache.maven.plugin-tools:
       maven-plugin-annotations ............. 3.6.0 -> 3.6.4
 - org.apache.maven.plugins:
       maven-remote-resources-plugin ........ 1.6.0 -> 1.7.0

Change-Id: Icdd8555e595e7d157578621e918c2d176ca86de0
Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14923
Integration-Tests: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Tested-by: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Reviewed-by: Michael Blow <mblow@apache.org>
Reviewed-by: Hussain Towaileb <hussainht@gmail.com>
  • Loading branch information
mblow committed Jan 23, 2022
1 parent 6410663 commit fa0ddb63dd35c5dea4bd6a04b8b3a2cbbf11dddd
Show file tree
Hide file tree
Showing 10 changed files with 63 additions and 178 deletions.
@@ -101,7 +101,7 @@
<test-case FilePath="external-dataset">
<compilation-unit name="aws/s3/bucket-does-not-exist">
<output-dir compare="Text">aws/s3/bucket-does-not-exist</output-dir>
<expected-error>External source error. The specified bucket does not exist (Service: S3, Status Code: 404, Request ID: null)</expected-error>
<expected-error>External source error. The specified bucket does not exist (Service: S3, Status Code: 404, Request ID: null, Extended Request ID: null)</expected-error>
</compilation-unit>
</test-case>
<test-case FilePath="external-dataset" check-warnings="true">
@@ -45,7 +45,6 @@
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
<version>3.6.0</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -308,6 +308,13 @@
<url>PUBLIC_DOMAIN</url>
<aliasUrls>Public Domain</aliasUrls>
</license>
<license>
<url>https://creativecommons.org/publicdomain/zero/1.0/legalcode.txt</url>
<aliasUrls>https://creativecommons.org/publicdomain/zero/1.0/legalcode</aliasUrls>
<aliasUrls>https://creativecommons.org/publicdomain/zero/1.0/</aliasUrls>
<aliasUrls>http://creativecommons.org/publicdomain/zero/1.0/legalcode</aliasUrls>
<aliasUrls>http://creativecommons.org/publicdomain/zero/1.0/</aliasUrls>
</license>
</licenses>
<templateProperties>
<packageName>Apache AsterixDB Server Install</packageName>
@@ -83,7 +83,7 @@
<hadoop.version>2.8.5</hadoop.version>
<jacoco.version>0.7.6.201602180812</jacoco.version>
<log4j.version>2.17.1</log4j.version>
<awsjavasdk.version>2.10.83</awsjavasdk.version>
<awsjavasdk.version>2.17.116</awsjavasdk.version>

<implementation.title>Apache AsterixDB - ${project.name}</implementation.title>
<implementation.url>https://asterixdb.apache.org/</implementation.url>
@@ -166,6 +166,30 @@
</properties>
</project>
</supplement>
<supplement>
<project>
<groupId>io.netty</groupId>
<artifactId>netty-transport-classes-epoll</artifactId>
<properties>
<!-- netty is ALv2, and does not contain any embedded LICENSE or NOTICE file -->
<license.ignoreMissingEmbeddedLicense>4.1.72.Final</license.ignoreMissingEmbeddedLicense>
<license.ignoreMissingEmbeddedNotice>4.1.72.Final</license.ignoreMissingEmbeddedNotice>
<license.ignoreNoticeOverride>4.1.712.Final</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
<supplement>
<project>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-unix-common</artifactId>
<properties>
<!-- netty is ALv2, and does not contain any embedded LICENSE or NOTICE file -->
<license.ignoreMissingEmbeddedLicense>4.1.72.Final</license.ignoreMissingEmbeddedLicense>
<license.ignoreMissingEmbeddedNotice>4.1.72.Final</license.ignoreMissingEmbeddedNotice>
<license.ignoreNoticeOverride>4.1.712.Final</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
<supplement>
<project>
<groupId>io.netty</groupId>
@@ -385,172 +409,13 @@
</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>
<artifactId>third-party-jackson-core</artifactId>
<properties>
<license.ignoreMissingEmbeddedLicense>2.10.83</license.ignoreMissingEmbeddedLicense>
<license.ignoreMissingEmbeddedNotice>2.10.83</license.ignoreMissingEmbeddedNotice>
<license.ignoreNoticeOverride>2.10.83</license.ignoreNoticeOverride>
<license.alternateNoticeFile>2.17.116:META-INF/NOTICE.txt</license.alternateNoticeFile>
<license.alternateLicenseFile>2.17.116:META-INF/LICENSE.txt</license.alternateLicenseFile>
</properties>
</project>
</supplement>
@@ -579,8 +444,8 @@
<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>
<license.ignoreMissingEmbeddedLicense>2.0.5</license.ignoreMissingEmbeddedLicense>
<license.ignoreMissingEmbeddedNotice>2.0.5</license.ignoreMissingEmbeddedNotice>
</properties>
</project>
</supplement>
@@ -590,8 +455,8 @@
<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>
<license.ignoreMissingEmbeddedLicense>2.0.5</license.ignoreMissingEmbeddedLicense>
<license.ignoreMissingEmbeddedNotice>2.0.5</license.ignoreMissingEmbeddedNotice>
</properties>
</project>
</supplement>
@@ -603,10 +468,9 @@
<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>
<license.ignoreMissingEmbeddedLicense>1.0.3</license.ignoreMissingEmbeddedLicense>
<license.ignoreMissingEmbeddedNotice>1.0.3</license.ignoreMissingEmbeddedNotice>
<license.ignoreNoticeOverride>1.0.3</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -36,7 +36,7 @@
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
<version>3.6.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
@@ -45,7 +45,6 @@
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
<version>1.6.0</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
@@ -20,8 +20,8 @@

import static org.apache.hyracks.maven.license.LicenseUtil.toGav;

import java.util.Arrays;
import java.util.Properties;
import java.util.stream.Stream;

import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.tuple.Pair;
@@ -50,7 +50,7 @@ void visit(MavenProject depObj, Properties properties, LicenseMojo licenseMojo)
case IGNORE_MISSING_EMBEDDED_NOTICE:
case IGNORE_LICENSE_OVERRIDE:
case IGNORE_NOTICE_OVERRIDE:
if (Stream.of(StringUtils.split(value, ",")).anyMatch(depObj.getVersion()::equals)) {
if (Arrays.asList(StringUtils.split(value, ",")).contains(depObj.getVersion())) {
licenseMojo.getProjectFlags().put(Pair.of(toGav(depObj), this), Boolean.TRUE);
} else {
licenseMojo.getLog().info(propName() + " defined on versions that *do not* match: " + value
@@ -59,15 +59,21 @@ void visit(MavenProject depObj, Properties properties, LicenseMojo licenseMojo)
break;
case ALTERNATE_LICENSE_FILE:
case ALTERNATE_NOTICE_FILE:
boolean found = false;
for (String spec : StringUtils.split(value, ",")) {
String[] specSplit = StringUtils.split(spec, ":");
if (specSplit.length != 2) {
throw new IllegalArgumentException(spec);
}
if (specSplit[0].equals(depObj.getVersion())) {
licenseMojo.getProjectFlags().put(Pair.of(toGav(depObj), this), specSplit[1]);
found = true;
}
}
if (!found) {
licenseMojo.getLog().info(propName() + " defined on versions that *do not* match: " + value
+ " for " + toGav(depObj));
}
break;
default:
throw new IllegalStateException("NYI: " + this);
@@ -306,12 +306,22 @@
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>3.8.4</version>
</dependency>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>3.8.4</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
<version>3.6.4</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
<version>1.7.0</version>
</dependency>
<dependency>
<groupId>it.unimi.dsi</groupId>
<artifactId>fastutil-core</artifactId>

0 comments on commit fa0ddb6

Please sign in to comment.