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 9868a03db307d3917b3f42e9951152bb6a597289 Author: Michael Blow <[email protected]> AuthorDate: Thu Mar 5 21:16:35 2020 -0500 [NO ISSUE] Update maven dependencies Change-Id: Ibb1b50dd55e47e807f27b45268be4268b20f3904 Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/5246 Integration-Tests: Jenkins <[email protected]> Tested-by: Jenkins <[email protected]> Reviewed-by: Michael Blow <[email protected]> Reviewed-by: Till Westmann <[email protected]> Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/5263 --- asterixdb/asterix-server/pom.xml | 4 +- asterixdb/pom.xml | 14 +++---- .../appended-resources/supplemental-models.xml | 23 +++++------ ....com_netty_netty_netty-4.1.46.Final_NOTICE.txt} | 11 +++++- .../license-automation-plugin/pom.xml | 4 -- .../hyracks/hyracks-maven-plugins/pom.xml | 1 - hyracks-fullstack/pom.xml | 45 +++++++++++++++++----- 7 files changed, 66 insertions(+), 36 deletions(-) diff --git a/asterixdb/asterix-server/pom.xml b/asterixdb/asterix-server/pom.xml index 8bcba6d..519abc1 100644 --- a/asterixdb/asterix-server/pom.xml +++ b/asterixdb/asterix-server/pom.xml @@ -169,8 +169,8 @@ <url>https://raw.githubusercontent.com/mojohaus/appassembler/appassembler-2.0.0/LICENSE.txt</url> </override> <override> - <gav>io.netty:netty-all:4.1.25.Final</gav> - <noticeUrl>https://raw.githubusercontent.com/netty/netty/netty-4.1.25.Final/NOTICE.txt</noticeUrl> + <gav>io.netty:netty-all:4.1.46.Final</gav> + <noticeUrl>https://raw.githubusercontent.com/netty/netty/netty-4.1.46.Final/NOTICE.txt</noticeUrl> </override> </overrides> <licenses> diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml index cb6c1ad..c05e236 100644 --- a/asterixdb/pom.xml +++ b/asterixdb/pom.xml @@ -877,12 +877,12 @@ <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-plugin-api</artifactId> - <version>3.6.2</version> + <version>3.6.3</version> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-model</artifactId> - <version>3.6.2</version> + <version>3.6.3</version> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> @@ -989,7 +989,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-compress</artifactId> - <version>1.19</version> + <version>1.20</version> </dependency> <dependency> <groupId>commons-logging</groupId> @@ -1280,7 +1280,7 @@ <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> - <version>1.13</version> + <version>1.14</version> </dependency> <dependency> <groupId>it.unimi.dsi</groupId> @@ -1310,12 +1310,12 @@ <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-core</artifactId> - <version>3.6.2</version> + <version>3.6.3</version> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-compat</artifactId> - <version>3.6.2</version> + <version>3.6.3</version> </dependency> <dependency> <groupId>com.esri.geometry</groupId> @@ -1325,7 +1325,7 @@ <dependency> <groupId>org.reflections</groupId> <artifactId>reflections</artifactId> - <version>0.9.10</version> + <version>0.9.12</version> </dependency> </dependencies> </dependencyManagement> diff --git a/asterixdb/src/main/appended-resources/supplemental-models.xml b/asterixdb/src/main/appended-resources/supplemental-models.xml index 24b812f..da178c6 100644 --- a/asterixdb/src/main/appended-resources/supplemental-models.xml +++ b/asterixdb/src/main/appended-resources/supplemental-models.xml @@ -160,9 +160,9 @@ <artifactId>netty-all</artifactId> <properties> <!-- netty is ALv2, and does not contain any embedded LICENSE or NOTICE file --> - <license.ignoreMissingEmbeddedLicense>4.1.25.Final,4.1.32.Final,4.1.42.Final</license.ignoreMissingEmbeddedLicense> - <license.ignoreMissingEmbeddedNotice>4.1.25.Final,4.1.32.Final,4.1.42.Final</license.ignoreMissingEmbeddedNotice> - <license.ignoreNoticeOverride>4.1.25.Final,4.1.32.Final,4.1.42.Final</license.ignoreNoticeOverride> + <license.ignoreMissingEmbeddedLicense>4.1.25.Final,4.1.32.Final,4.1.42.Final,4.1.46.Final</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>4.1.25.Final,4.1.32.Final,4.1.42.Final,4.1.46.Final</license.ignoreMissingEmbeddedNotice> + <license.ignoreNoticeOverride>4.1.25.Final,4.1.32.Final,4.1.42.Final,4.1.46.Final</license.ignoreNoticeOverride> </properties> </project> </supplement> @@ -173,9 +173,9 @@ <properties> <!-- guava is ALv2, and does not contain any embedded LICENSE or NOTICE file --> <!-- see https://github.com/google/guava/blob/v18.0/COPYING --> - <!-- see https://github.com/google/guava/tree/v28.0/COPYING --> - <license.ignoreMissingEmbeddedNotice>18.0,28.0-jre,28.1-jre</license.ignoreMissingEmbeddedNotice> - <license.ignoreMissingEmbeddedLicense>18.0,28.0-jre,28.1-jre</license.ignoreMissingEmbeddedLicense> + <!-- see https://github.com/google/guava/tree/v28.[012]/COPYING --> + <license.ignoreMissingEmbeddedNotice>18.0,28.0-jre,28.1-jre,28.2-jre</license.ignoreMissingEmbeddedNotice> + <license.ignoreMissingEmbeddedLicense>18.0,28.0-jre,28.1-jre,28.2-jre</license.ignoreMissingEmbeddedLicense> </properties> </project> </supplement> @@ -195,10 +195,10 @@ <project> <groupId>com.google.errorprone</groupId> <artifactId>error_prone_annotations</artifactId> - <!-- see https://github.com/google/error-prone/tree/v2.3.2/ --> + <!-- see https://github.com/google/error-prone/tree/v2.3.[24]/ --> <properties> - <license.ignoreMissingEmbeddedLicense>2.3.2</license.ignoreMissingEmbeddedLicense> - <license.ignoreMissingEmbeddedNotice>2.3.2</license.ignoreMissingEmbeddedNotice> + <license.ignoreMissingEmbeddedLicense>2.3.2,2.3.4</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>2.3.2,2.3.4</license.ignoreMissingEmbeddedNotice> </properties> </project> </supplement> @@ -228,8 +228,8 @@ <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-annotations</artifactId> <properties> - <!-- jackson-annotation does not provide an embedded NOTICE file --> - <license.ignoreMissingEmbeddedNotice>2.8.4,2.9.7,2.9.10,2.10.0</license.ignoreMissingEmbeddedNotice> + <!-- jackson-annotations does not provide an embedded NOTICE file --> + <license.ignoreMissingEmbeddedNotice>2.8.4,2.9.7,2.9.10,2.10.0,2.10.3</license.ignoreMissingEmbeddedNotice> </properties> </project> </supplement> @@ -252,6 +252,7 @@ <!-- fastutil is ALv2, and does not contain any embedded LICENSE or NOTICE file --> <!-- see https://github.com/vigna/fastutil/blob/8.1.1/LICENSE-2.0 --> <!-- see https://github.com/vigna/fastutil/blob/8.2.2/LICENSE-2.0 --> + <!-- see https://github.com/vigna/fastutil/blob/8.3.0/LICENSE-2.0 --> <license.ignoreMissingEmbeddedLicense>8.1.1,8.2.2,8.3.0</license.ignoreMissingEmbeddedLicense> <license.ignoreMissingEmbeddedNotice>8.1.1,8.2.2,8.3.0</license.ignoreMissingEmbeddedNotice> </properties> diff --git a/asterixdb/src/main/licenses/content/raw.githubusercontent.com_netty_netty_netty-4.1.42.Final_NOTICE.txt b/asterixdb/src/main/licenses/content/raw.githubusercontent.com_netty_netty_netty-4.1.46.Final_NOTICE.txt similarity index 94% rename from asterixdb/src/main/licenses/content/raw.githubusercontent.com_netty_netty_netty-4.1.42.Final_NOTICE.txt rename to asterixdb/src/main/licenses/content/raw.githubusercontent.com_netty_netty_netty-4.1.46.Final_NOTICE.txt index 5398818..d2fda58 100644 --- a/asterixdb/src/main/licenses/content/raw.githubusercontent.com_netty_netty_netty-4.1.42.Final_NOTICE.txt +++ b/asterixdb/src/main/licenses/content/raw.githubusercontent.com_netty_netty_netty-4.1.46.Final_NOTICE.txt @@ -236,4 +236,13 @@ This product contains the Maven wrapper scripts from 'Maven Wrapper', that provi * LICENSE: * license/LICENSE.mvn-wrapper.txt (Apache License 2.0) * HOMEPAGE: - * https://github.com/takari/maven-wrapper \ No newline at end of file + * https://github.com/takari/maven-wrapper + +This product contains the dnsinfo.h header file, that provides a way to retrieve the system DNS configuration on MacOS. +This private header is also used by Apple's open source + mDNSResponder (https://opensource.apple.com/tarballs/mDNSResponder/). + + * LICENSE: + * license/LICENSE.dnsinfo.txt (Apache License 2.0) + * HOMEPAGE: + * http://www.opensource.apple.com/source/configd/configd-453.19/dnsinfo/dnsinfo.h \ No newline at end of file diff --git a/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/pom.xml b/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/pom.xml index 1dd0335..03294a8 100644 --- a/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/pom.xml @@ -41,7 +41,6 @@ <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-core</artifactId> - <version>3.6.2</version> </dependency> <dependency> <groupId>org.apache.maven.plugins</groupId> @@ -72,7 +71,6 @@ <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-model</artifactId> - <version>3.6.2</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> @@ -86,12 +84,10 @@ <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-artifact</artifactId> - <version>3.6.2</version> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-compat</artifactId> - <version>3.6.2</version> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> diff --git a/hyracks-fullstack/hyracks/hyracks-maven-plugins/pom.xml b/hyracks-fullstack/hyracks/hyracks-maven-plugins/pom.xml index 19888a2..ffb7255 100644 --- a/hyracks-fullstack/hyracks/hyracks-maven-plugins/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-maven-plugins/pom.xml @@ -46,7 +46,6 @@ <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-plugin-api</artifactId> - <version>3.6.2</version> </dependency> </dependencies> diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml index 4e3757c..47904f8 100644 --- a/hyracks-fullstack/pom.xml +++ b/hyracks-fullstack/pom.xml @@ -80,12 +80,12 @@ <dependency> <groupId>io.netty</groupId> <artifactId>netty-all</artifactId> - <version>4.1.42.Final</version> + <version>4.1.46.Final</version> </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.12</version> + <version>4.13</version> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> @@ -151,22 +151,22 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>2.10.0</version> + <version>2.10.3</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> - <version>2.10.0</version> + <version>2.10.3</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-annotations</artifactId> - <version>2.10.0</version> + <version>2.10.3</version> </dependency> <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>28.1-jre</version> + <version>28.2-jre</version> <exclusions> <exclusion> <groupId>com.google.code.findbugs</groupId> @@ -203,12 +203,12 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpcore</artifactId> - <version>4.4.12</version> + <version>4.4.13</version> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> - <version>4.5.10</version> + <version>4.5.11</version> </dependency> <dependency> <groupId>org.apache.rat</groupId> @@ -228,12 +228,12 @@ <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-api</artifactId> - <version>2.12.1</version> + <version>2.13.1</version> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-core</artifactId> - <version>2.12.1</version> + <version>2.13.1</version> </dependency> <dependency> <groupId>org.mockito</groupId> @@ -250,6 +250,31 @@ <artifactId>maven-project</artifactId> <version>2.2.1</version> </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-model</artifactId> + <version>3.6.3</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-artifact</artifactId> + <version>3.6.3</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-compat</artifactId> + <version>3.6.3</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-core</artifactId> + <version>3.6.3</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-plugin-api</artifactId> + <version>3.6.3</version> + </dependency> </dependencies> </dependencyManagement> <build>
