This is an automated email from the ASF dual-hosted git repository. dlych pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 43c9fa0d012d5cb33acc3ddeb2cabe2470d5c9ef Author: Michael Blow <[email protected]> AuthorDate: Thu Oct 28 20:11:23 2021 -0400 [NO ISSUE][MISC] Update dependencies - com.fasterxml.jackson.core:jackson-annotations .. 2.12.3 -> 2.13.0 - com.fasterxml.jackson.core:jackson-core ......... 2.12.3 -> 2.13.0 - com.fasterxml.jackson.core:jackson-databind ..... 2.12.3 -> 2.13.0 - com.google.guava:guava .................... 30.1-jre -> 31.0.1-jre - it.unimi.dsi:fastutil ............................. 8.3.0 -> 8.5.6 - it.unimi.dsi:fastutil-core ........................ 8.3.0 -> 8.5.6 - org.apache.commons:commons-csv ...................... 1.8 -> 1.9.0 - org.apache.logging.log4j:log4j-1.2-api .......... 2.13.1 -> 2.14.1 - org.apache.maven:maven-artifact ................... 3.6.3 -> 3.8.3 - org.apache.maven:maven-compat ..................... 3.6.3 -> 3.8.3 - org.apache.maven:maven-core ....................... 3.6.3 -> 3.8.3 - org.apache.maven:maven-model ...................... 3.6.3 -> 3.8.3 - org.apache.maven:maven-plugin-api ................. 3.6.3 -> 3.8.3 - org.xerial.snappy:snappy-java ................. 1.1.7.1 -> 1.1.8.4 - io.netty:netty-all:4.1.63.Final -> io.netty:netty-buffer:4.1.69.Final -> io.netty:netty-codec:4.1.69.Final -> io.netty:netty-codec-http:4.1.69.Final -> io.netty:netty-common:4.1.69.Final -> io.netty:netty-handler:4.1.69.Final -> io.netty:netty-resolver:4.1.69.Final -> io.netty:netty-transport:4.1.69.Final (cherry picked from commit 951b9cc768978ec809d68cc49be1fb29b9bc499a) Change-Id: I9aac58028de1a7c0e228eee3c78a39e7f3d0e431 Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14265 Reviewed-by: Michael Blow <[email protected]> Reviewed-by: Hussain Towaileb <[email protected]> Integration-Tests: Jenkins <[email protected]> Tested-by: Jenkins <[email protected]> (cherry picked from commit e8637d0f6c1dcebdbeb422cb73884a86eb6f9214) Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/15743 --- asterixdb/NOTICE | 2 +- asterixdb/asterix-app/pom.xml | 32 +++++- asterixdb/asterix-common/pom.xml | 2 +- asterixdb/asterix-dashboard/pom.xml | 8 +- asterixdb/asterix-server/pom.xml | 29 ++++- asterixdb/pom.xml | 10 +- .../appended-resources/supplemental-models.xml | 125 ++++++++++++++++++--- ....com_netty_netty_netty-4.1.69.Final_NOTICE.txt} | 20 +++- hyracks-fullstack/NOTICE | 2 +- .../hyracks-control/hyracks-control-cc/pom.xml | 6 +- hyracks-fullstack/hyracks/hyracks-http/pom.xml | 18 ++- .../maven/license/SourcePointerResolver.java | 10 ++ hyracks-fullstack/pom.xml | 91 +++++++++++++-- 13 files changed, 308 insertions(+), 47 deletions(-) diff --git a/asterixdb/NOTICE b/asterixdb/NOTICE index 7615782e6e..4aabe2709e 100644 --- a/asterixdb/NOTICE +++ b/asterixdb/NOTICE @@ -1,5 +1,5 @@ Apache AsterixDB -Copyright 2015-2019 The Apache Software Foundation +Copyright 2015-2021 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). diff --git a/asterixdb/asterix-app/pom.xml b/asterixdb/asterix-app/pom.xml index d23f76098c..8025be9759 100644 --- a/asterixdb/asterix-app/pom.xml +++ b/asterixdb/asterix-app/pom.xml @@ -474,6 +474,16 @@ <artifactId>hadoop-hdfs</artifactId> <classifier>tests</classifier> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty</artifactId> + </exclusion> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty-all</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> @@ -602,6 +612,16 @@ <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdfs</artifactId> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty</artifactId> + </exclusion> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty-all</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> @@ -617,10 +637,6 @@ <classifier>tests</classifier> <scope>test</scope> </dependency> - <dependency> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-storage-am-lsm-btree-test</artifactId> @@ -666,5 +682,13 @@ <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-storage-am-lsm-invertedindex</artifactId> </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-codec-http</artifactId> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-common</artifactId> + </dependency> </dependencies> </project> diff --git a/asterixdb/asterix-common/pom.xml b/asterixdb/asterix-common/pom.xml index 3945756dda..9f659ac988 100644 --- a/asterixdb/asterix-common/pom.xml +++ b/asterixdb/asterix-common/pom.xml @@ -264,7 +264,7 @@ </dependency> <dependency> <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> + <artifactId>netty-codec-http</artifactId> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> diff --git a/asterixdb/asterix-dashboard/pom.xml b/asterixdb/asterix-dashboard/pom.xml index 373503de4a..347cd7c307 100644 --- a/asterixdb/asterix-dashboard/pom.xml +++ b/asterixdb/asterix-dashboard/pom.xml @@ -45,14 +45,14 @@ <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-api</artifactId> </dependency> - <dependency> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-codec-http</artifactId> + </dependency> </dependencies> <build> diff --git a/asterixdb/asterix-server/pom.xml b/asterixdb/asterix-server/pom.xml index ee58e2d58b..4b02d3922c 100644 --- a/asterixdb/asterix-server/pom.xml +++ b/asterixdb/asterix-server/pom.xml @@ -169,8 +169,32 @@ <url>https://raw.githubusercontent.com/mojohaus/appassembler/appassembler-2.0.0/LICENSE.txt</url> </override> <override> - <gav>io.netty:netty-all:4.1.63.Final</gav> - <noticeUrl>https://raw.githubusercontent.com/netty/netty/netty-4.1.63.Final/NOTICE.txt</noticeUrl> + <gav>io.netty:netty-transport:4.1.69.Final</gav> + <noticeUrl>https://raw.githubusercontent.com/netty/netty/netty-4.1.69.Final/NOTICE.txt</noticeUrl> + </override> + <override> + <gav>io.netty:netty-codec:4.1.69.Final</gav> + <noticeUrl>https://raw.githubusercontent.com/netty/netty/netty-4.1.69.Final/NOTICE.txt</noticeUrl> + </override> + <override> + <gav>io.netty:netty-buffer:4.1.69.Final</gav> + <noticeUrl>https://raw.githubusercontent.com/netty/netty/netty-4.1.69.Final/NOTICE.txt</noticeUrl> + </override> + <override> + <gav>io.netty:netty-resolver:4.1.69.Final</gav> + <noticeUrl>https://raw.githubusercontent.com/netty/netty/netty-4.1.69.Final/NOTICE.txt</noticeUrl> + </override> + <override> + <gav>io.netty:netty-handler:4.1.69.Final</gav> + <noticeUrl>https://raw.githubusercontent.com/netty/netty/netty-4.1.69.Final/NOTICE.txt</noticeUrl> + </override> + <override> + <gav>io.netty:netty-common:4.1.69.Final</gav> + <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> </override> </overrides> <licenses> @@ -205,6 +229,7 @@ <aliasUrl>http://www.apache.org/licenses/LICENSE-2.0</aliasUrl> <aliasUrl>https://www.apache.org/licenses/LICENSE-2.0.txt</aliasUrl> <aliasUrl>http://www.apache.org/licenses/LICENSE-2.0.html</aliasUrl> + <aliasUrl>https://www.apache.org/licenses/LICENSE-2.0.html</aliasUrl> </aliasUrls> <metric>1</metric> </license> diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml index 9ed9453bec..11741343e6 100644 --- a/asterixdb/pom.xml +++ b/asterixdb/pom.xml @@ -878,12 +878,12 @@ <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-plugin-api</artifactId> - <version>3.6.3</version> + <version>3.8.3</version> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-model</artifactId> - <version>3.6.3</version> + <version>3.8.3</version> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> @@ -1286,7 +1286,7 @@ <dependency> <groupId>it.unimi.dsi</groupId> <artifactId>fastutil</artifactId> - <version>8.3.0</version> + <version>8.5.6</version> </dependency> <dependency> <groupId>com.sun.xml.bind</groupId> @@ -1311,12 +1311,12 @@ <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-core</artifactId> - <version>3.6.3</version> + <version>3.8.3</version> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-compat</artifactId> - <version>3.6.3</version> + <version>3.8.3</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 dd56718c0a..60fcf5e262 100644 --- a/asterixdb/src/main/appended-resources/supplemental-models.xml +++ b/asterixdb/src/main/appended-resources/supplemental-models.xml @@ -157,12 +157,84 @@ <supplement> <project> <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> + <artifactId>netty-transport</artifactId> <properties> <!-- netty is ALv2, and does not contain any embedded LICENSE or NOTICE file --> - <license.ignoreMissingEmbeddedLicense>4.1.63.Final</license.ignoreMissingEmbeddedLicense> - <license.ignoreMissingEmbeddedNotice>4.1.63.Final</license.ignoreMissingEmbeddedNotice> - <license.ignoreNoticeOverride>4.1.63.Final</license.ignoreNoticeOverride> + <license.ignoreMissingEmbeddedLicense>4.1.69.Final</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>4.1.69.Final</license.ignoreMissingEmbeddedNotice> + <license.ignoreNoticeOverride>4.1.69.Final</license.ignoreNoticeOverride> + </properties> + </project> + </supplement> + <supplement> + <project> + <groupId>io.netty</groupId> + <artifactId>netty-codec</artifactId> + <properties> + <!-- netty is ALv2, and does not contain any embedded LICENSE or NOTICE file --> + <license.ignoreMissingEmbeddedLicense>4.1.69.Final</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>4.1.69.Final</license.ignoreMissingEmbeddedNotice> + <license.ignoreNoticeOverride>4.1.69.Final</license.ignoreNoticeOverride> + </properties> + </project> + </supplement> + <supplement> + <project> + <groupId>io.netty</groupId> + <artifactId>netty-handler</artifactId> + <properties> + <!-- netty is ALv2, and does not contain any embedded LICENSE or NOTICE file --> + <license.ignoreMissingEmbeddedLicense>4.1.69.Final</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>4.1.69.Final</license.ignoreMissingEmbeddedNotice> + <license.ignoreNoticeOverride>4.1.69.Final</license.ignoreNoticeOverride> + </properties> + </project> + </supplement> + <supplement> + <project> + <groupId>io.netty</groupId> + <artifactId>netty-buffer</artifactId> + <properties> + <!-- netty is ALv2, and does not contain any embedded LICENSE or NOTICE file --> + <license.ignoreMissingEmbeddedLicense>4.1.69.Final</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>4.1.69.Final</license.ignoreMissingEmbeddedNotice> + <license.ignoreNoticeOverride>4.1.69.Final</license.ignoreNoticeOverride> + </properties> + </project> + </supplement> + <supplement> + <project> + <groupId>io.netty</groupId> + <artifactId>netty-common</artifactId> + <properties> + <!-- netty is ALv2, and does not contain any embedded LICENSE or NOTICE file --> + <license.ignoreMissingEmbeddedLicense>4.1.69.Final</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>4.1.69.Final</license.ignoreMissingEmbeddedNotice> + <license.ignoreNoticeOverride>4.1.69.Final</license.ignoreNoticeOverride> + </properties> + </project> + </supplement> + <supplement> + <project> + <groupId>io.netty</groupId> + <artifactId>netty-codec-http</artifactId> + <properties> + <!-- netty is ALv2, and does not contain any embedded LICENSE or NOTICE file --> + <license.ignoreMissingEmbeddedLicense>4.1.69.Final</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>4.1.69.Final</license.ignoreMissingEmbeddedNotice> + <license.ignoreNoticeOverride>4.1.69.Final</license.ignoreNoticeOverride> + </properties> + </project> + </supplement> + <supplement> + <project> + <groupId>io.netty</groupId> + <artifactId>netty-resolver</artifactId> + <properties> + <!-- netty is ALv2, and does not contain any embedded LICENSE or NOTICE file --> + <license.ignoreMissingEmbeddedLicense>4.1.69.Final</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>4.1.69.Final</license.ignoreMissingEmbeddedNotice> + <license.ignoreNoticeOverride>4.1.69.Final</license.ignoreNoticeOverride> </properties> </project> </supplement> @@ -174,8 +246,9 @@ <!-- 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.[012]/COPYING --> - <license.ignoreMissingEmbeddedNotice>18.0,28.0-jre,28.1-jre,28.2-jre,30.1-jre</license.ignoreMissingEmbeddedNotice> - <license.ignoreMissingEmbeddedLicense>18.0,28.0-jre,28.1-jre,28.2-jre,30.1-jre</license.ignoreMissingEmbeddedLicense> + <!-- see https://github.com/google/guava/blob/v31.0.1/COPYING --> + <license.ignoreMissingEmbeddedNotice>18.0,28.0-jre,28.1-jre,28.2-jre,30.1-jre,31.0.1-jre</license.ignoreMissingEmbeddedNotice> + <license.ignoreMissingEmbeddedLicense>18.0,28.0-jre,28.1-jre,28.2-jre,30.1-jre,31.0.1-jre</license.ignoreMissingEmbeddedLicense> </properties> </project> </supplement> @@ -196,9 +269,10 @@ <groupId>com.google.errorprone</groupId> <artifactId>error_prone_annotations</artifactId> <!-- see https://github.com/google/error-prone/tree/v2.3.[24]/ --> + <!-- see https://github.com/google/error-prone/blob/v2.7.1/COPYING --> <properties> - <license.ignoreMissingEmbeddedLicense>2.3.2,2.3.4</license.ignoreMissingEmbeddedLicense> - <license.ignoreMissingEmbeddedNotice>2.3.2,2.3.4</license.ignoreMissingEmbeddedNotice> + <license.ignoreMissingEmbeddedLicense>2.3.2,2.3.4,2.7.1</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>2.3.2,2.3.4,2.7.1</license.ignoreMissingEmbeddedNotice> </properties> </project> </supplement> @@ -229,7 +303,7 @@ <artifactId>jackson-annotations</artifactId> <properties> <!-- jackson-annotations does not provide an embedded NOTICE file --> - <license.ignoreMissingEmbeddedNotice>2.12.3</license.ignoreMissingEmbeddedNotice> + <license.ignoreMissingEmbeddedNotice>2.12.3,2.13.0</license.ignoreMissingEmbeddedNotice> </properties> </project> </supplement> @@ -250,11 +324,36 @@ <artifactId>fastutil</artifactId> <properties> <!-- 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> + <!-- see https://github.com/vigna/fastutil/blob/8.5.4/LICENSE-2.0 --> + <!-- see https://github.com/vigna/fastutil/blob/8.5.6/LICENSE-2.0 --> + <license.ignoreMissingEmbeddedLicense>8.3.0,8.5.4,8.5.6</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>8.3.0,8.5.4,8.5.6</license.ignoreMissingEmbeddedNotice> + </properties> + </project> + </supplement> + <supplement> + <project> + <groupId>it.unimi.dsi</groupId> + <artifactId>fastutil-core</artifactId> + <properties> + <!-- fastutil is ALv2, and does not contain any embedded LICENSE or NOTICE file --> + <!-- see https://github.com/vigna/fastutil/blob/8.5.4/LICENSE-2.0 --> + <!-- see https://github.com/vigna/fastutil/blob/8.5.6/LICENSE-2.0 --> + <license.ignoreMissingEmbeddedLicense>8.5.4,8.5.6</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>8.5.4,8.5.6</license.ignoreMissingEmbeddedNotice> + </properties> + </project> + </supplement> + <supplement> + <project> + <groupId>it.unimi.dsi</groupId> + <artifactId>fastutil-extra</artifactId> + <properties> + <!-- fastutil is ALv2, and does not contain any embedded LICENSE or NOTICE file --> + <!-- see https://github.com/vigna/fastutil/blob/8.5.4/LICENSE-2.0 --> + <license.ignoreMissingEmbeddedLicense>8.5.4</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>8.5.4</license.ignoreMissingEmbeddedNotice> </properties> </project> </supplement> diff --git a/asterixdb/src/main/licenses/content/raw.githubusercontent.com_netty_netty_netty-4.1.63.Final_NOTICE.txt b/asterixdb/src/main/licenses/content/raw.githubusercontent.com_netty_netty_netty-4.1.69.Final_NOTICE.txt similarity index 93% rename from asterixdb/src/main/licenses/content/raw.githubusercontent.com_netty_netty_netty-4.1.63.Final_NOTICE.txt rename to asterixdb/src/main/licenses/content/raw.githubusercontent.com_netty_netty_netty-4.1.69.Final_NOTICE.txt index a7715731d5..ad62b68eef 100644 --- a/asterixdb/src/main/licenses/content/raw.githubusercontent.com_netty_netty_netty-4.1.63.Final_NOTICE.txt +++ b/asterixdb/src/main/licenses/content/raw.githubusercontent.com_netty_netty_netty-4.1.69.Final_NOTICE.txt @@ -125,6 +125,14 @@ and decompression library, which can be obtained at: * HOMEPAGE: * https://github.com/jponge/lzma-java +This product optionally depends on 'zstd-jni', a zstd-jni Java compression +and decompression library, which can be obtained at: + + * LICENSE: + * license/LICENSE.zstd-jni.txt (Apache License 2.0) + * HOMEPAGE: + * https://github.com/luben/zstd-jni + This product contains a modified portion of 'jfastlz', a Java port of FastLZ compression and decompression library written by William Kinney. It can be obtained at: @@ -196,7 +204,7 @@ non-blocking XML processor, which can be obtained at: * LICENSE: * license/LICENSE.aalto-xml.txt (Apache License 2.0) * HOMEPAGE: - * http://wiki.fasterxml.com/AaltoHome + * https://wiki.fasterxml.com/AaltoHome This product contains a modified version of 'HPACK', a Java implementation of the HTTP/2 HPACK algorithm written by Twitter. It can be obtained at: @@ -245,4 +253,12 @@ This private header is also used by Apple's open source * LICENSE: * license/LICENSE.dnsinfo.txt (Apple Public Source License 2.0) * HOMEPAGE: - * https://www.opensource.apple.com/source/configd/configd-453.19/dnsinfo/dnsinfo.h \ No newline at end of file + * https://www.opensource.apple.com/source/configd/configd-453.19/dnsinfo/dnsinfo.h + +This product optionally depends on 'Brotli4j', Brotli compression and +decompression for Java., which can be obtained at: + + * LICENSE: + * license/LICENSE.brotli4j.txt (Apache License 2.0) + * HOMEPAGE: + * https://github.com/hyperxpro/Brotli4j \ No newline at end of file diff --git a/hyracks-fullstack/NOTICE b/hyracks-fullstack/NOTICE index 77f31ad02f..57c584396c 100644 --- a/hyracks-fullstack/NOTICE +++ b/hyracks-fullstack/NOTICE @@ -1,5 +1,5 @@ Apache Hyracks and Algebricks -Copyright 2015-2019 The Apache Software Foundation +Copyright 2015-2021 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/pom.xml b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/pom.xml index 0c94332fb9..52b61f4d4a 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/pom.xml @@ -49,7 +49,11 @@ </dependency> <dependency> <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> + <artifactId>netty-buffer</artifactId> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-codec-http</artifactId> </dependency> <dependency> <groupId>commons-io</groupId> diff --git a/hyracks-fullstack/hyracks/hyracks-http/pom.xml b/hyracks-fullstack/hyracks/hyracks-http/pom.xml index d97a1ee382..5a3f05892a 100644 --- a/hyracks-fullstack/hyracks/hyracks-http/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-http/pom.xml @@ -45,7 +45,23 @@ <dependencies> <dependency> <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> + <artifactId>netty-buffer</artifactId> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-common</artifactId> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-codec-http</artifactId> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-transport</artifactId> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-handler</artifactId> </dependency> <dependency> <groupId>commons-io</groupId> diff --git a/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/SourcePointerResolver.java b/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/SourcePointerResolver.java index 8ac8b12f5c..f7aee354f8 100644 --- a/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/SourcePointerResolver.java +++ b/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/SourcePointerResolver.java @@ -296,5 +296,15 @@ public class SourcePointerResolver { public void setMirroredRepositories(List<ArtifactRepository> list) { // unused } + + @java.lang.Override + public boolean isBlocked() { + return false; + } + + @java.lang.Override + public void setBlocked(boolean blocked) { + // unused + } } } diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml index 3ad53f21e2..1243fec5c9 100644 --- a/hyracks-fullstack/pom.xml +++ b/hyracks-fullstack/pom.xml @@ -70,6 +70,8 @@ <hadoop.version>2.8.5</hadoop.version> <jacoco.version>0.7.6.201602180812</jacoco.version> <log4j.version>2.15.0</log4j.version> + <snappy.version>1.1.8.4</snappy.version> + <jackson.version>2.13.0</jackson.version> <implementation.title>Apache Hyracks and Algebricks - ${project.name}</implementation.title> <implementation.url>https://asterixdb.apache.org/</implementation.url> @@ -80,8 +82,33 @@ <dependencies> <dependency> <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - <version>4.1.63.Final</version> + <artifactId>netty-buffer</artifactId> + <version>4.1.69.Final</version> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-common</artifactId> + <version>4.1.69.Final</version> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-codec-http</artifactId> + <version>4.1.69.Final</version> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-transport</artifactId> + <version>4.1.69.Final</version> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-codec</artifactId> + <version>4.1.69.Final</version> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-handler</artifactId> + <version>4.1.69.Final</version> </dependency> <dependency> <groupId>junit</groupId> @@ -152,22 +179,22 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>2.12.3</version> + <version>${jackson.version}</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> - <version>2.12.3</version> + <version>${jackson.version}</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-annotations</artifactId> - <version>2.12.3</version> + <version>${jackson.version}</version> </dependency> <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>30.1-jre</version> + <version>31.0.1-jre</version> <exclusions> <exclusion> <groupId>com.google.code.findbugs</groupId> @@ -259,27 +286,67 @@ <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-model</artifactId> - <version>3.6.3</version> + <version>3.8.3</version> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-artifact</artifactId> - <version>3.6.3</version> + <version>3.8.3</version> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-compat</artifactId> - <version>3.6.3</version> + <version>3.8.3</version> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-core</artifactId> - <version>3.6.3</version> - </dependency> + <version>3.8.3</version> + </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-plugin-api</artifactId> - <version>3.6.3</version> + <version>3.8.3</version> + </dependency> + <dependency> + <groupId>it.unimi.dsi</groupId> + <artifactId>fastutil-core</artifactId> + <version>8.5.6</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <version>1.7.28</version> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-1.2-api</artifactId> + <version>${log4j.version}</version> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <version>3.10.0</version> + </dependency> + <dependency> + <groupId>org.powermock</groupId> + <artifactId>powermock-api-mockito2</artifactId> + <version>2.0.9</version> + </dependency> + <dependency> + <groupId>org.powermock</groupId> + <artifactId>powermock-module-junit4</artifactId> + <version>2.0.9</version> + </dependency> + <dependency> + <groupId>org.powermock</groupId> + <artifactId>powermock-core</artifactId> + <version>2.0.9</version> + </dependency> + <dependency> + <groupId>org.xerial.snappy</groupId> + <artifactId>snappy-java</artifactId> + <version>${snappy.version}</version> </dependency> </dependencies> </dependencyManagement>
