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 790ce54088dd9bebc949b11ad86908abfb1399a1 Author: Wail Alkowaileet <[email protected]> AuthorDate: Sat Aug 7 16:21:17 2021 -0700 [ASTERIXDB-2943][STO] Upgrade Snappy to v1.1.8.4 - user model changes: no - storage format changes: no - interface changes: no Details: - The current Snappy version v1.1.7.1 has a bug when running on aarch64 - Also, it is not supported by the new Apple Silicon - Probably uses the Java-pure version - v1.1.8.4 solves those two issues Change-Id: Id82da58edbdee8a80a419fafcd474880a235e3aa Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/12703 Integration-Tests: Jenkins <[email protected]> Tested-by: Jenkins <[email protected]> Reviewed-by: Michael Blow <[email protected]> --- asterixdb/asterix-server/pom.xml | 1 + asterixdb/src/main/appended-resources/supplemental-models.xml | 7 ++++--- hyracks-fullstack/hyracks/hyracks-storage-common/pom.xml | 1 - hyracks-fullstack/pom.xml | 6 ++++++ 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/asterixdb/asterix-server/pom.xml b/asterixdb/asterix-server/pom.xml index ce943ad..0176ef8 100644 --- a/asterixdb/asterix-server/pom.xml +++ b/asterixdb/asterix-server/pom.xml @@ -254,6 +254,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> <aliasUrl>https://aws.amazon.com/apache2.0</aliasUrl> </aliasUrls> <metric>1</metric> diff --git a/asterixdb/src/main/appended-resources/supplemental-models.xml b/asterixdb/src/main/appended-resources/supplemental-models.xml index 79ece5e..4849544 100644 --- a/asterixdb/src/main/appended-resources/supplemental-models.xml +++ b/asterixdb/src/main/appended-resources/supplemental-models.xml @@ -287,9 +287,10 @@ <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://github.com/xerial/snappy-java/blob/1.1.7.1/LICENSE --> - <license.ignoreMissingEmbeddedLicense>1.1.7.1</license.ignoreMissingEmbeddedLicense> - <license.ignoreMissingEmbeddedNotice>1.1.7.1</license.ignoreMissingEmbeddedNotice> + <!-- see https://github.com/xerial/snappy-java/blob/1.1.8.4/LICENSE --> + <license.ignoreMissingEmbeddedLicense>1.1.7.1,1.1.8.4</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>1.1.7.1,1.1.8.4</license.ignoreMissingEmbeddedNotice> + <license.ignoreLicenseOverride>1.1.7.1</license.ignoreLicenseOverride> </properties> </project> </supplement> diff --git a/hyracks-fullstack/hyracks/hyracks-storage-common/pom.xml b/hyracks-fullstack/hyracks/hyracks-storage-common/pom.xml index d0dfbf4..7ed6d34 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-common/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-storage-common/pom.xml @@ -69,7 +69,6 @@ <dependency> <groupId>org.xerial.snappy</groupId> <artifactId>snappy-java</artifactId> - <version>1.1.7.1</version> </dependency> <dependency> <groupId>com.google.guava</groupId> diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml index 09ae228..81970b4 100644 --- a/hyracks-fullstack/pom.xml +++ b/hyracks-fullstack/pom.xml @@ -73,6 +73,7 @@ <hadoop.version>2.8.5</hadoop.version> <jacoco.version>0.7.6.201602180812</jacoco.version> <log4j.version>2.14.1</log4j.version> + <snappy.version>1.1.8.4</snappy.version> <implementation.title>Apache Hyracks and Algebricks - ${project.name}</implementation.title> <implementation.url>https://asterixdb.apache.org/</implementation.url> @@ -331,6 +332,11 @@ <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> <build>
