This is an automated email from the ASF dual-hosted git repository. htowaileb pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit c8233ab68d3fa0f4c34fac10f80b0c8981aa3185 Author: Hussain Towaileb <[email protected]> AuthorDate: Sat Aug 27 02:17:18 2022 +0300 Update Hadoop to 3.3.4 and Parquet to 1.12.3 Change-Id: Ib78172183426934009021eeb377bfa9876f88a9a Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17203 Integration-Tests: Jenkins <[email protected]> Reviewed-by: Hussain Towaileb <[email protected]> Reviewed-by: Michael Blow <[email protected]> Tested-by: Hussain Towaileb <[email protected]> --- asterixdb/asterix-server/pom.xml | 17 ++++-------- asterixdb/pom.xml | 4 +-- .../appended-resources/supplemental-models.xml | 32 +++++++++++++++------- ...ontent.com_luben_zstd-jni_v1.5.0-1_LICENSE.txt} | 0 ...ercontent.com_qos-ch_slf4j_v_1.7.36_LICENSE.txt | 21 ++++++++++++++ 5 files changed, 51 insertions(+), 23 deletions(-) diff --git a/asterixdb/asterix-server/pom.xml b/asterixdb/asterix-server/pom.xml index 53a773ee03..16edbb8294 100644 --- a/asterixdb/asterix-server/pom.xml +++ b/asterixdb/asterix-server/pom.xml @@ -415,8 +415,12 @@ <noticeUrl>https://raw.githubusercontent.com/msgpack/msgpack-java/0.8.20/NOTICE</noticeUrl> </override> <override> - <gav>com.github.luben:zstd-jni:1.4.9-1</gav> - <url>https://raw.githubusercontent.com/luben/zstd-jni/v1.4.9-1/LICENSE</url> + <gav>com.github.luben:zstd-jni:1.5.0-1</gav> + <url>https://raw.githubusercontent.com/luben/zstd-jni/v1.5.0-1/LICENSE</url> + </override> + <override> + <gav>org.slf4j:slf4j-reload4j:1.7.36</gav> + <url>https://raw.githubusercontent.com/qos-ch/slf4j/v_1.7.36/LICENSE.txt</url> </override> </overrides> <licenses> @@ -543,15 +547,6 @@ <aliasUrls>http://creativecommons.org/publicdomain/zero/1.0/legalcode</aliasUrls> <aliasUrls>http://creativecommons.org/publicdomain/zero/1.0/</aliasUrls> </license> - <license> - <displayName>The 2-Clause BSD License</displayName> - <url>https://opensource.org/licenses/BSD-2-Clause</url> - <contentFile>raw.githubusercontent.com_luben_zstd-jni_v1.4.9-1_LICENSE.txt</contentFile> - <aliasUrls> - <aliasURL>https://opensource.org/licenses/bsd-license.php</aliasURL> - <aliasUrl>https://raw.githubusercontent.com/luben/zstd-jni/v1.4.9-1/LICENSE</aliasUrl> - </aliasUrls> - </license> <license> <displayName>The Go license</displayName> <url>http://golang.org/LICENSE</url> diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml index cd90712d5a..d48eb8a6a5 100644 --- a/asterixdb/pom.xml +++ b/asterixdb/pom.xml @@ -84,11 +84,11 @@ <!-- Versions under dependencymanagement or used in many projects via properties --> <algebricks.version>0.3.8-SNAPSHOT</algebricks.version> <hyracks.version>0.3.8-SNAPSHOT</hyracks.version> - <hadoop.version>3.3.2</hadoop.version> + <hadoop.version>3.3.4</hadoop.version> <jacoco.version>0.7.6.201602180812</jacoco.version> <log4j.version>2.17.1</log4j.version> <awsjavasdk.version>2.17.218</awsjavasdk.version> - <parquet.version>1.12.0</parquet.version> + <parquet.version>1.12.3</parquet.version> <hadoop-awsjavasdk.version>1.12.109</hadoop-awsjavasdk.version> <azureblobjavasdk.version>12.14.2</azureblobjavasdk.version> <azuredatalakejavasdk.version>12.7.2</azuredatalakejavasdk.version> diff --git a/asterixdb/src/main/appended-resources/supplemental-models.xml b/asterixdb/src/main/appended-resources/supplemental-models.xml index cc1749b3ce..8af8ec1592 100644 --- a/asterixdb/src/main/appended-resources/supplemental-models.xml +++ b/asterixdb/src/main/appended-resources/supplemental-models.xml @@ -1652,9 +1652,21 @@ <groupId>com.github.luben</groupId> <artifactId>zstd-jni</artifactId> <properties> - <license.ignoreMissingEmbeddedLicense>1.4.9-1</license.ignoreMissingEmbeddedLicense> - <license.ignoreMissingEmbeddedNotice>1.4.9-1</license.ignoreMissingEmbeddedNotice> - <license.ignoreLicenseOverride>1.4.9-1</license.ignoreLicenseOverride> + <license.ignoreMissingEmbeddedLicense>1.5.0-1</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>1.5.0-1</license.ignoreMissingEmbeddedNotice> + <license.ignoreLicenseOverride>1.5.0-1</license.ignoreLicenseOverride> + </properties> + </project> + </supplement> + + <supplement> + <project> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-reload4j</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>1.7.36</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>1.7.36</license.ignoreMissingEmbeddedNotice> + <license.ignoreLicenseOverride>1.7.36</license.ignoreLicenseOverride> </properties> </project> </supplement> @@ -1664,8 +1676,8 @@ <groupId>org.apache.parquet</groupId> <artifactId>parquet-format-structures</artifactId> <properties> - <license.ignoreMissingEmbeddedLicense>1.12.0</license.ignoreMissingEmbeddedLicense> - <license.ignoreMissingEmbeddedNotice>1.12.0</license.ignoreMissingEmbeddedNotice> + <license.ignoreMissingEmbeddedLicense>1.12.3</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>1.12.3</license.ignoreMissingEmbeddedNotice> </properties> </project> </supplement> @@ -1675,8 +1687,8 @@ <groupId>org.apache.parquet</groupId> <artifactId>parquet-common</artifactId> <properties> - <license.ignoreMissingEmbeddedLicense>1.12.0</license.ignoreMissingEmbeddedLicense> - <license.ignoreMissingEmbeddedNotice>1.12.0</license.ignoreMissingEmbeddedNotice> + <license.ignoreMissingEmbeddedLicense>1.12.3</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>1.12.3</license.ignoreMissingEmbeddedNotice> </properties> </project> </supplement> @@ -1687,7 +1699,7 @@ <groupId>org.apache.parquet</groupId> <artifactId>parquet-column</artifactId> <properties> - <license.ignoreMissingEmbeddedNotice>1.12.0</license.ignoreMissingEmbeddedNotice> + <license.ignoreMissingEmbeddedNotice>1.12.3</license.ignoreMissingEmbeddedNotice> </properties> </project> </supplement> @@ -1698,7 +1710,7 @@ <groupId>org.apache.parquet</groupId> <artifactId>parquet-encoding</artifactId> <properties> - <license.ignoreMissingEmbeddedNotice>1.12.0</license.ignoreMissingEmbeddedNotice> + <license.ignoreMissingEmbeddedNotice>1.12.3</license.ignoreMissingEmbeddedNotice> </properties> </project> </supplement> @@ -1709,7 +1721,7 @@ <groupId>org.apache.parquet</groupId> <artifactId>parquet-hadoop</artifactId> <properties> - <license.ignoreMissingEmbeddedNotice>1.12.0</license.ignoreMissingEmbeddedNotice> + <license.ignoreMissingEmbeddedNotice>1.12.3</license.ignoreMissingEmbeddedNotice> </properties> </project> </supplement> diff --git a/asterixdb/src/main/licenses/content/raw.githubusercontent.com_luben_zstd-jni_v1.4.9-1_LICENSE.txt b/asterixdb/src/main/licenses/content/raw.githubusercontent.com_luben_zstd-jni_v1.5.0-1_LICENSE.txt similarity index 100% rename from asterixdb/src/main/licenses/content/raw.githubusercontent.com_luben_zstd-jni_v1.4.9-1_LICENSE.txt rename to asterixdb/src/main/licenses/content/raw.githubusercontent.com_luben_zstd-jni_v1.5.0-1_LICENSE.txt diff --git a/asterixdb/src/main/licenses/content/raw.githubusercontent.com_qos-ch_slf4j_v_1.7.36_LICENSE.txt b/asterixdb/src/main/licenses/content/raw.githubusercontent.com_qos-ch_slf4j_v_1.7.36_LICENSE.txt new file mode 100644 index 0000000000..f687729a0b --- /dev/null +++ b/asterixdb/src/main/licenses/content/raw.githubusercontent.com_qos-ch_slf4j_v_1.7.36_LICENSE.txt @@ -0,0 +1,21 @@ +Copyright (c) 2004-2022 QOS.ch Sarl (Switzerland) +All rights reserved. + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
