From e0459d0c0d1b7ad217a4d8cc75029d8fe518c7bf Mon Sep 17 00:00:00 2001 From: Viktor Lofgren Date: Wed, 12 Jun 2024 08:57:22 +0200 Subject: [PATCH] (build) Upgrade parquet dependencies to 1.14.0 This gets rid of a vulnerable transitive dependency. --- code/libraries/array/cpp/resources/libcpp.so | Bin 16040 -> 15600 bytes settings.gradle | 4 ++-- third-party/parquet-floor/build.gradle | 2 +- .../org/apache/hadoop/conf/Configuration.java | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/code/libraries/array/cpp/resources/libcpp.so b/code/libraries/array/cpp/resources/libcpp.so index 9d6d9616786258903a462cbf295a9cdf0150d75c..b247f7981b36614f7e67d889cfd190fa3d3298f6 100755 GIT binary patch literal 15600 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 diff --git a/settings.gradle b/settings.gradle index b2f795f9..a67a0310 100644 --- a/settings.gradle +++ b/settings.gradle @@ -208,8 +208,8 @@ dependencyResolutionManagement { library('sqlite','org.xerial','sqlite-jdbc').version('3.41.2.2') library('javax.annotation','javax.annotation','javax.annotation-api').version('1.3.2') - library('parquet-column', 'org.apache.parquet','parquet-column').version('1.13.1') - library('parquet-hadoop', 'org.apache.parquet','parquet-hadoop').version('1.13.1') + library('parquet-column', 'org.apache.parquet','parquet-column').version('1.14.0') + library('parquet-hadoop', 'org.apache.parquet','parquet-hadoop').version('1.14.0') library('curator-framework', 'org.apache.curator','curator-framework').version('5.6.0') library('curator-x-discovery', 'org.apache.curator','curator-x-discovery').version('5.6.0') diff --git a/third-party/parquet-floor/build.gradle b/third-party/parquet-floor/build.gradle index 7b0de520..08443bb0 100644 --- a/third-party/parquet-floor/build.gradle +++ b/third-party/parquet-floor/build.gradle @@ -9,7 +9,7 @@ java { } dependencies { - implementation ('org.apache.parquet:parquet-column:1.13.1') { + implementation ('org.apache.parquet:parquet-column:1.14.0') { transitive = true } implementation('org.apache.parquet:parquet-hadoop:1.13.1') { diff --git a/third-party/parquet-floor/src/main/java/org/apache/hadoop/conf/Configuration.java b/third-party/parquet-floor/src/main/java/org/apache/hadoop/conf/Configuration.java index a9c3231d..9b0fda55 100644 --- a/third-party/parquet-floor/src/main/java/org/apache/hadoop/conf/Configuration.java +++ b/third-party/parquet-floor/src/main/java/org/apache/hadoop/conf/Configuration.java @@ -1,6 +1,7 @@ package org.apache.hadoop.conf; public class Configuration { + public Configuration(boolean x) {} public boolean getBoolean(String x, boolean y) { return y;