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 8b67de4caaf2455155c52896df4bb16f0591a73e Author: Michael Blow <[email protected]> AuthorDate: Wed Jun 28 11:14:13 2023 -0400 [NO ISSUE][*DB] Update dependencies - Jetty: 9.4.48.v20220622 -> 9.4.51.v20230217 - Jackson: 2.14.1 -> 2.14.3 - Snappy-Java: 1.1.8.4 -> 1.1.10.1 Change-Id: I4cd3cf27423c23cfbb0b5528026ebcf5840d7539 Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17621 Integration-Tests: Jenkins <[email protected]> Reviewed-by: Michael Blow <[email protected]> Tested-by: Michael Blow <[email protected]> --- .../org/apache/asterix/test/common/ResultExtractor.java | 4 ++-- asterixdb/pom.xml | 4 ++-- .../src/main/appended-resources/supplemental-models.xml | 7 ++++--- ...ercontent.com_xerial_snappy-java_v1.1.10.1_NOTICE.txt | 16 ++++++++++++++++ hyracks-fullstack/pom.xml | 8 ++++---- 5 files changed, 28 insertions(+), 11 deletions(-) diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/ResultExtractor.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/ResultExtractor.java index 091fc20408..05b8bbfdea 100644 --- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/ResultExtractor.java +++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/ResultExtractor.java @@ -214,8 +214,8 @@ public class ResultExtractor { result = OBJECT_READER.readValue(resultStr); } catch (Exception e) { // whoops, not JSON (e.g. 404) - just include the body - GlobalConfig.ASTERIX_LOGGER.log(Level.ERROR, resultStr); - throw new Exception(resultStr); + GlobalConfig.ASTERIX_LOGGER.log(Level.ERROR, "result: {} json parse exception: {}", resultStr, e); + throw new Exception(resultStr, e); } final boolean isJsonFormat = isJsonFormat(fmt); diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml index 33ca4a80d9..9181f142d5 100644 --- a/asterixdb/pom.xml +++ b/asterixdb/pom.xml @@ -1974,12 +1974,12 @@ <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util</artifactId> - <version>9.4.48.v20220622</version> + <version>9.4.51.v20230217</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util-ajax</artifactId> - <version>9.4.48.v20220622</version> + <version>9.4.51.v20230217</version> </dependency> </dependencies> </dependencyManagement> diff --git a/asterixdb/src/main/appended-resources/supplemental-models.xml b/asterixdb/src/main/appended-resources/supplemental-models.xml index d33451f77e..740cba9b34 100644 --- a/asterixdb/src/main/appended-resources/supplemental-models.xml +++ b/asterixdb/src/main/appended-resources/supplemental-models.xml @@ -463,9 +463,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://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/v1.1.10.1/LICENSE --> + <license.ignoreMissingEmbeddedLicense>1.1.10.1</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>1.1.10.1</license.ignoreMissingEmbeddedNotice> + <license.ignoreNoticeOverride>1.1.10.1</license.ignoreNoticeOverride> </properties> </project> </supplement> diff --git a/asterixdb/src/main/licenses/content/raw.githubusercontent.com_xerial_snappy-java_v1.1.10.1_NOTICE.txt b/asterixdb/src/main/licenses/content/raw.githubusercontent.com_xerial_snappy-java_v1.1.10.1_NOTICE.txt new file mode 100644 index 0000000000..19301705e1 --- /dev/null +++ b/asterixdb/src/main/licenses/content/raw.githubusercontent.com_xerial_snappy-java_v1.1.10.1_NOTICE.txt @@ -0,0 +1,16 @@ +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 containd 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 diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml index 3d57c15c28..843167a470 100644 --- a/hyracks-fullstack/pom.xml +++ b/hyracks-fullstack/pom.xml @@ -73,8 +73,8 @@ <hadoop.version>3.3.1</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> - <jackson.version>2.14.1</jackson.version> + <snappy.version>1.1.10.1</snappy.version> + <jackson.version>2.14.3</jackson.version> <jackson-databind.version>${jackson.version}</jackson-databind.version> <netty.version>4.1.87.Final</netty.version> @@ -482,12 +482,12 @@ <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util</artifactId> - <version>9.4.48.v20220622</version> + <version>9.4.51.v20230217</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util-ajax</artifactId> - <version>9.4.48.v20220622</version> + <version>9.4.51.v20230217</version> </dependency> <!-- Manually included to avoid CVE-2023-1370 --> <dependency>
