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 6baf8ff08f92935a4b0cdef6b1cd1a81c4036dd7 Author: Michael Blow <mb...@apache.org> AuthorDate: Wed Oct 4 20:46:43 2023 -0400 [NO ISSUE][*DB] Update org.xerial.snappy:snappy-java to 1.1.10.5 Change-Id: I9e743060391936f78cade63be094704af1c6e35e Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17844 Integration-Tests: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Reviewed-by: Michael Blow <mb...@apache.org> Reviewed-by: Hussain Towaileb <hussai...@gmail.com> Tested-by: Michael Blow <mb...@apache.org> --- .../appended-resources/supplemental-models.xml | 9 ++++++--- ...ent.com_xerial_snappy-java_v1.1.10.5_NOTICE.txt | 22 ++++++++++++++++++++++ hyracks-fullstack/pom.xml | 2 +- 3 files changed, 29 insertions(+), 4 deletions(-) diff --git a/asterixdb/src/main/appended-resources/supplemental-models.xml b/asterixdb/src/main/appended-resources/supplemental-models.xml index 091cda7ce5..09bdea3f76 100644 --- a/asterixdb/src/main/appended-resources/supplemental-models.xml +++ b/asterixdb/src/main/appended-resources/supplemental-models.xml @@ -464,9 +464,12 @@ <properties> <!-- snappy-java is ALv2, and does not contain any embedded LICENSE or NOTICE file --> <!-- license override not needed, ALv2 is specified in its pom.xml --> - <!-- see https://raw.githubusercontent.com/xerial/snappy-java/1.1.8.4/LICENSE --> - <license.ignoreMissingEmbeddedLicense>1.1.8.4</license.ignoreMissingEmbeddedLicense> - <license.ignoreMissingEmbeddedNotice>1.1.8.4</license.ignoreMissingEmbeddedNotice> + <!-- see https://raw.githubusercontent.com/xerial/snappy-java/1.1.10.5/LICENSE --> + <license.ignoreMissingEmbeddedLicense>1.1.10.5</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>1.1.10.5</license.ignoreMissingEmbeddedNotice> + <!-- snappy does have a NOTICE file, we add an override to pick that up --> + <!-- see https://raw.githubusercontent.com/xerial/snappy-java/1.1.10.5/NOTICE --> + <license.ignoreNoticeOverride>1.1.10.5</license.ignoreNoticeOverride> </properties> </project> </supplement> diff --git a/asterixdb/src/main/licenses/content/raw.githubusercontent.com_xerial_snappy-java_v1.1.10.5_NOTICE.txt b/asterixdb/src/main/licenses/content/raw.githubusercontent.com_xerial_snappy-java_v1.1.10.5_NOTICE.txt new file mode 100644 index 0000000000..20b1317a8f --- /dev/null +++ b/asterixdb/src/main/licenses/content/raw.githubusercontent.com_xerial_snappy-java_v1.1.10.5_NOTICE.txt @@ -0,0 +1,22 @@ +This product includes software developed by Google + Snappy: http://code.google.com/p/snappy/ (New BSD License) + +This product includes software developed by Apache + PureJavaCrc32C from apache-hadoop-common http://hadoop.apache.org/ + (Apache 2.0 license) + +This library contains statically linked libstdc++. This inclusion is allowed by +"GCC Runtime Library Exception" +http://gcc.gnu.org/onlinedocs/libstdc++/manual/license.html + +== Contributors == + * Tatu Saloranta + * Providing benchmark suite + * Alec Wysoker + * Performance and memory usage improvement + +Third-Party Notices and Licenses: + +- Hadoop: Apache Hadoop is used as a dependency + License: Apache License 2.0 + Source/Reference: https://github.com/apache/hadoop/blob/trunk/NOTICE.txt \ No newline at end of file diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml index 9fdcc8d0d7..432947ebcb 100644 --- a/hyracks-fullstack/pom.xml +++ b/hyracks-fullstack/pom.xml @@ -73,7 +73,7 @@ <hadoop.version>3.3.6</hadoop.version> <jacoco.version>0.7.6.201602180812</jacoco.version> <log4j.version>2.19.0</log4j.version> - <snappy.version>1.1.8.4</snappy.version> + <snappy.version>1.1.10.5</snappy.version> <jackson.version>2.14.1</jackson.version> <jackson-databind.version>${jackson.version}</jackson-databind.version> <netty.version>4.1.87.Final</netty.version>