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 e8e59d0e6e72ba3fd96074c021ff7180261dcd59 Author: Michael Blow <[email protected]> AuthorDate: Thu Sep 26 19:28:12 2019 -0400 [NO ISSUE] Update Guava, Jackson dependencies Change-Id: I1a415367b0e403237deab782dd99214b927138db Reviewed-on: https://asterix-gerrit.ics.uci.edu/3576 Tested-by: Jenkins <[email protected]> Integration-Tests: Jenkins <[email protected]> Reviewed-by: Till Westmann <[email protected]> --- .../appended-resources/supplemental-models.xml | 30 +++++++++++++++++++--- hyracks-fullstack/pom.xml | 30 +++++++++++++++++++--- 2 files changed, 53 insertions(+), 7 deletions(-) diff --git a/asterixdb/src/main/appended-resources/supplemental-models.xml b/asterixdb/src/main/appended-resources/supplemental-models.xml index 18ad7ef..fffa65c 100644 --- a/asterixdb/src/main/appended-resources/supplemental-models.xml +++ b/asterixdb/src/main/appended-resources/supplemental-models.xml @@ -173,8 +173,32 @@ <properties> <!-- guava is ALv2, and does not contain any embedded LICENSE or NOTICE file --> <!-- see https://github.com/google/guava/blob/v18.0/COPYING --> - <license.ignoreMissingEmbeddedNotice>18.0</license.ignoreMissingEmbeddedNotice> - <license.ignoreMissingEmbeddedLicense>18.0</license.ignoreMissingEmbeddedLicense> + <!-- see https://github.com/google/guava/tree/v28.0/COPYING --> + <license.ignoreMissingEmbeddedNotice>18.0,28.0-jre</license.ignoreMissingEmbeddedNotice> + <license.ignoreMissingEmbeddedLicense>18.0,28.0-jre</license.ignoreMissingEmbeddedLicense> + </properties> + </project> + </supplement> + <supplement> + <project> + <groupId>com.google.guava</groupId> + <artifactId>failureaccess</artifactId> + <properties> + <!-- guava is ALv2, and does not contain any embedded LICENSE or NOTICE file --> + <!-- see https://github.com/google/guava/tree/v28.0/ --> + <license.ignoreMissingEmbeddedLicense>1.0.1</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>1.0.1</license.ignoreMissingEmbeddedNotice> + </properties> + </project> + </supplement> + <supplement> + <project> + <groupId>com.google.errorprone</groupId> + <artifactId>error_prone_annotations</artifactId> + <!-- see https://github.com/google/error-prone/tree/v2.3.2/ --> + <properties> + <license.ignoreMissingEmbeddedLicense>2.3.2</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>2.3.2</license.ignoreMissingEmbeddedNotice> </properties> </project> </supplement> @@ -205,7 +229,7 @@ <artifactId>jackson-annotations</artifactId> <properties> <!-- jackson-annotation does not provide an embedded NOTICE file --> - <license.ignoreMissingEmbeddedNotice>2.8.4,2.9.7</license.ignoreMissingEmbeddedNotice> + <license.ignoreMissingEmbeddedNotice>2.8.4,2.9.7,2.9.10</license.ignoreMissingEmbeddedNotice> </properties> </project> </supplement> diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml index 6a4ecac..b9ac716 100644 --- a/hyracks-fullstack/pom.xml +++ b/hyracks-fullstack/pom.xml @@ -151,22 +151,44 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>2.9.7</version> + <version>2.9.10</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> - <version>2.9.7</version> + <version>2.9.10</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-annotations</artifactId> - <version>2.9.7</version> + <version>2.9.10</version> </dependency> <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>18.0</version> + <version>28.0-jre</version> + <exclusions> + <exclusion> + <groupId>com.google.code.findbugs</groupId> + <artifactId>jsr305</artifactId> + </exclusion> + <exclusion> + <groupId>com.google.guava</groupId> + <artifactId>listenablefuture</artifactId> + </exclusion> + <exclusion> + <groupId>org.checkerframework</groupId> + <artifactId>checker-qual</artifactId> + </exclusion> + <exclusion> + <groupId>com.google.j2objc</groupId> + <artifactId>j2objc-annotations</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.mojo</groupId> + <artifactId>animal-sniffer-annotations</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.commons</groupId>
