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 b8df1c5f90aca0fe32e22a6ce32d8a6e9b1169ca Author: Michael Blow <[email protected]> AuthorDate: Fri Nov 8 14:15:42 2019 -0500 [NO ISSUE] Update dependencies Change-Id: I7c668c680057344c7f83c600a2e9adff43a2fefc Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/4063 Tested-by: Jenkins <[email protected]> Integration-Tests: Jenkins <[email protected]> Reviewed-by: Till Westmann <[email protected]> --- asterixdb/asterix-app/pom.xml | 2 +- asterixdb/asterix-external-data/pom.xml | 2 +- .../pom.xml | 4 +-- .../record-manager-generator-maven-plugin/pom.xml | 1 - asterixdb/asterix-runtime/pom.xml | 2 +- asterixdb/pom.xml | 25 ++++++++----------- .../appended-resources/supplemental-models.xml | 20 +++++++-------- ....com_netty_netty_netty-4.1.42.Final_NOTICE.txt} | 24 +++++++++++++++--- .../www.eclipse.org_org_documents_edl-v10.php.txt | 12 +++++++++ .../license-automation-plugin/pom.xml | 11 ++++---- .../hyracks/hyracks-maven-plugins/pom.xml | 2 +- hyracks-fullstack/pom.xml | 29 +++++++++++++--------- 12 files changed, 80 insertions(+), 54 deletions(-) diff --git a/asterixdb/asterix-app/pom.xml b/asterixdb/asterix-app/pom.xml index a1e79b5..b10265d 100644 --- a/asterixdb/asterix-app/pom.xml +++ b/asterixdb/asterix-app/pom.xml @@ -639,7 +639,7 @@ <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-jul</artifactId> - <version>2.11.1</version> + <version>2.12.1</version> </dependency> <dependency> <groupId>org.apache.asterix</groupId> diff --git a/asterixdb/asterix-external-data/pom.xml b/asterixdb/asterix-external-data/pom.xml index e7e0b6a..2dad620 100644 --- a/asterixdb/asterix-external-data/pom.xml +++ b/asterixdb/asterix-external-data/pom.xml @@ -401,7 +401,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-collections4</artifactId> - <version>4.2</version> + <version>4.4</version> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> diff --git a/asterixdb/asterix-maven-plugins/asterix-evaluator-generator-maven-plugin/pom.xml b/asterixdb/asterix-maven-plugins/asterix-evaluator-generator-maven-plugin/pom.xml index 16ae7c0..564d4ad 100644 --- a/asterixdb/asterix-maven-plugins/asterix-evaluator-generator-maven-plugin/pom.xml +++ b/asterixdb/asterix-maven-plugins/asterix-evaluator-generator-maven-plugin/pom.xml @@ -78,12 +78,12 @@ <dependency> <groupId>org.ow2.asm</groupId> <artifactId>asm</artifactId> - <version>6.2</version> + <version>7.2</version> </dependency> <dependency> <groupId>org.ow2.asm</groupId> <artifactId>asm-tree</artifactId> - <version>6.2</version> + <version>7.2</version> </dependency> </dependencies> </project> diff --git a/asterixdb/asterix-maven-plugins/record-manager-generator-maven-plugin/pom.xml b/asterixdb/asterix-maven-plugins/record-manager-generator-maven-plugin/pom.xml index 57e71bd..5d4c516 100644 --- a/asterixdb/asterix-maven-plugins/record-manager-generator-maven-plugin/pom.xml +++ b/asterixdb/asterix-maven-plugins/record-manager-generator-maven-plugin/pom.xml @@ -43,7 +43,6 @@ <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-project</artifactId> - <version>2.2.1</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> diff --git a/asterixdb/asterix-runtime/pom.xml b/asterixdb/asterix-runtime/pom.xml index c976c67..016d65c 100644 --- a/asterixdb/asterix-runtime/pom.xml +++ b/asterixdb/asterix-runtime/pom.xml @@ -194,7 +194,7 @@ <dependency> <groupId>it.unimi.dsi</groupId> <artifactId>fastutil</artifactId> - <version>8.2.2</version> + <version>8.3.0</version> </dependency> </dependencies> </project> diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml index 7d7e8f7..cb6c1ad 100644 --- a/asterixdb/pom.xml +++ b/asterixdb/pom.xml @@ -872,22 +872,17 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-simple</artifactId> - <version>1.7.25</version> + <version>1.7.28</version> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-plugin-api</artifactId> - <version>3.6.0</version> + <version>3.6.2</version> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-model</artifactId> - <version>3.6.0</version> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-project</artifactId> - <version>2.2.1</version> + <version>3.6.2</version> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> @@ -994,7 +989,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-compress</artifactId> - <version>1.18</version> + <version>1.19</version> </dependency> <dependency> <groupId>commons-logging</groupId> @@ -1269,7 +1264,7 @@ <dependency> <groupId>javax.xml.bind</groupId> <artifactId>jaxb-api</artifactId> - <version>2.3.0</version> + <version>2.3.1</version> </dependency> <dependency> <groupId>org.codehaus.mojo.appassembler</groupId> @@ -1285,12 +1280,12 @@ <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> - <version>1.11</version> + <version>1.13</version> </dependency> <dependency> <groupId>it.unimi.dsi</groupId> <artifactId>fastutil</artifactId> - <version>8.2.2</version> + <version>8.3.0</version> </dependency> <dependency> <groupId>com.sun.xml.bind</groupId> @@ -1300,7 +1295,7 @@ <dependency> <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-impl</artifactId> - <version>2.3.0</version> + <version>2.3.2</version> </dependency> <dependency> <groupId>javax.activation</groupId> @@ -1315,12 +1310,12 @@ <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-core</artifactId> - <version>3.3.9</version> + <version>3.6.2</version> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-compat</artifactId> - <version>3.3.9</version> + <version>3.6.2</version> </dependency> <dependency> <groupId>com.esri.geometry</groupId> diff --git a/asterixdb/src/main/appended-resources/supplemental-models.xml b/asterixdb/src/main/appended-resources/supplemental-models.xml index fffa65c..24b812f 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</license.ignoreMissingEmbeddedLicense> - <license.ignoreMissingEmbeddedNotice>4.1.25.Final,4.1.32.Final</license.ignoreMissingEmbeddedNotice> - <license.ignoreNoticeOverride>4.1.25.Final,4.1.32.Final</license.ignoreNoticeOverride> + <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> </properties> </project> </supplement> @@ -174,8 +174,8 @@ <!-- 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</license.ignoreMissingEmbeddedNotice> - <license.ignoreMissingEmbeddedLicense>18.0,28.0-jre</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>18.0,28.0-jre,28.1-jre</license.ignoreMissingEmbeddedNotice> + <license.ignoreMissingEmbeddedLicense>18.0,28.0-jre,28.1-jre</license.ignoreMissingEmbeddedLicense> </properties> </project> </supplement> @@ -229,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,2.9.10</license.ignoreMissingEmbeddedNotice> + <license.ignoreMissingEmbeddedNotice>2.8.4,2.9.7,2.9.10,2.10.0</license.ignoreMissingEmbeddedNotice> </properties> </project> </supplement> @@ -239,8 +239,8 @@ <artifactId>esri-geometry-api</artifactId> <properties> <!-- esri is ALv2, and does not contain any embedded LICENSE or NOTICE file --> - <license.ignoreMissingEmbeddedLicense>2.0.0</license.ignoreMissingEmbeddedLicense> - <license.ignoreMissingEmbeddedNotice>2.0.0</license.ignoreMissingEmbeddedNotice> + <license.ignoreMissingEmbeddedLicense>2.0.0,2.2.3</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>2.0.0,2.2.3</license.ignoreMissingEmbeddedNotice> </properties> </project> </supplement> @@ -252,8 +252,8 @@ <!-- 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 --> - <license.ignoreMissingEmbeddedLicense>8.1.1,8.2.2</license.ignoreMissingEmbeddedLicense> - <license.ignoreMissingEmbeddedNotice>8.1.1,8.2.2</license.ignoreMissingEmbeddedNotice> + <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> </project> </supplement> diff --git a/asterixdb/src/main/licenses/content/raw.githubusercontent.com_netty_netty_netty-4.1.32.Final_NOTICE.txt b/asterixdb/src/main/licenses/content/raw.githubusercontent.com_netty_netty_netty-4.1.42.Final_NOTICE.txt similarity index 90% rename from asterixdb/src/main/licenses/content/raw.githubusercontent.com_netty_netty_netty-4.1.32.Final_NOTICE.txt rename to asterixdb/src/main/licenses/content/raw.githubusercontent.com_netty_netty_netty-4.1.42.Final_NOTICE.txt index f973663..5398818 100644 --- a/asterixdb/src/main/licenses/content/raw.githubusercontent.com_netty_netty_netty-4.1.32.Final_NOTICE.txt +++ b/asterixdb/src/main/licenses/content/raw.githubusercontent.com_netty_netty_netty-4.1.42.Final_NOTICE.txt @@ -4,7 +4,7 @@ Please visit the Netty web site for more information: - * http://netty.io/ + * https://netty.io/ Copyright 2014 The Netty Project @@ -162,9 +162,9 @@ This product optionally depends on 'JBoss Marshalling', an alternative Java serialization API, which can be obtained at: * LICENSE: - * license/LICENSE.jboss-marshalling.txt (GNU LGPL 2.1) + * license/LICENSE.jboss-marshalling.txt (Apache License 2.0) * HOMEPAGE: - * http://www.jboss.org/jbossmarshalling + * https://github.com/jboss-remoting/jboss-marshalling This product optionally depends on 'Caliper', Google's micro- benchmarking framework, which can be obtained at: @@ -206,6 +206,22 @@ the HTTP/2 HPACK algorithm written by Twitter. It can be obtained at: * HOMEPAGE: * https://github.com/twitter/hpack +This product contains a modified version of 'HPACK', a Java implementation of +the HTTP/2 HPACK algorithm written by Cory Benfield. It can be obtained at: + + * LICENSE: + * license/LICENSE.hyper-hpack.txt (MIT License) + * HOMEPAGE: + * https://github.com/python-hyper/hpack/ + +This product contains a modified version of 'HPACK', a Java implementation of +the HTTP/2 HPACK algorithm written by Tatsuhiro Tsujikawa. It can be obtained at: + + * LICENSE: + * license/LICENSE.nghttp2-hpack.txt (MIT License) + * HOMEPAGE: + * https://github.com/nghttp2/nghttp2/ + This product contains a modified portion of 'Apache Commons Lang', a Java library provides utilities for the java.lang API, which can be obtained at: @@ -220,4 +236,4 @@ 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 + * https://github.com/takari/maven-wrapper \ No newline at end of file diff --git a/asterixdb/src/main/licenses/content/www.eclipse.org_org_documents_edl-v10.php.txt b/asterixdb/src/main/licenses/content/www.eclipse.org_org_documents_edl-v10.php.txt new file mode 100644 index 0000000..a4a267e --- /dev/null +++ b/asterixdb/src/main/licenses/content/www.eclipse.org_org_documents_edl-v10.php.txt @@ -0,0 +1,12 @@ +Eclipse Distribution License - v 1.0 + +Copyright (c) 2007, Eclipse Foundation, Inc. and its licensors. + +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + +Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. +Neither the name of the Eclipse Foundation, Inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFI [...] \ 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 4366d82..1dd0335 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,7 @@ <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-core</artifactId> - <version>3.6.0</version> + <version>3.6.2</version> </dependency> <dependency> <groupId>org.apache.maven.plugins</groupId> @@ -55,7 +55,7 @@ <dependency> <groupId>org.freemarker</groupId> <artifactId>freemarker</artifactId> - <version>2.3.28</version> + <version>2.3.29</version> </dependency> <dependency> <groupId>commons-io</groupId> @@ -68,12 +68,11 @@ <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-project</artifactId> - <version>2.2.1</version> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-model</artifactId> - <version>3.6.0</version> + <version>3.6.2</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> @@ -87,12 +86,12 @@ <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-artifact</artifactId> - <version>3.6.0</version> + <version>3.6.2</version> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-compat</artifactId> - <version>3.6.0</version> + <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 358b546..19888a2 100644 --- a/hyracks-fullstack/hyracks/hyracks-maven-plugins/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-maven-plugins/pom.xml @@ -46,7 +46,7 @@ <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-plugin-api</artifactId> - <version>3.6.0</version> + <version>3.6.2</version> </dependency> </dependencies> diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml index b9ac716..4e3757c 100644 --- a/hyracks-fullstack/pom.xml +++ b/hyracks-fullstack/pom.xml @@ -80,7 +80,7 @@ <dependency> <groupId>io.netty</groupId> <artifactId>netty-all</artifactId> - <version>4.1.32.Final</version> + <version>4.1.42.Final</version> </dependency> <dependency> <groupId>junit</groupId> @@ -146,27 +146,27 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-text</artifactId> - <version>1.6</version> + <version>1.8</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>2.9.10</version> + <version>2.10.0</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> - <version>2.9.10</version> + <version>2.10.0</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-annotations</artifactId> - <version>2.9.10</version> + <version>2.10.0</version> </dependency> <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>28.0-jre</version> + <version>28.1-jre</version> <exclusions> <exclusion> <groupId>com.google.code.findbugs</groupId> @@ -193,22 +193,22 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>3.8.1</version> + <version>3.9</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-collections4</artifactId> - <version>4.2</version> + <version>4.4</version> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpcore</artifactId> - <version>4.4.10</version> + <version>4.4.12</version> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> - <version>4.5.6</version> + <version>4.5.10</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.11.1</version> + <version>2.12.1</version> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-core</artifactId> - <version>2.11.1</version> + <version>2.12.1</version> </dependency> <dependency> <groupId>org.mockito</groupId> @@ -245,6 +245,11 @@ <artifactId>jaxb-api</artifactId> <version>2.3.0</version> </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-project</artifactId> + <version>2.2.1</version> + </dependency> </dependencies> </dependencyManagement> <build>
