This is an automated email from the ASF dual-hosted git repository. imaxon pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit d30f9cca88273ff2168b2ee9ef1a0a0f4a054111 Merge: 59ea0058b5 359e5c259f Author: Hussain Towaileb <[email protected]> AuthorDate: Tue Aug 23 18:30:37 2022 +0300 Merge branch gerrit/neo Change-Id: Id53d5cc91eb7f8c4c62e6f8ce43e2bd70e9ba32b asterixdb/asterix-external-data/pom.xml | 10 ++++ asterixdb/pom.xml | 74 ++++++++++++++++++++++++++ hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml | 14 +++++ hyracks-fullstack/pom.xml | 51 ++++++++++++++++++ 4 files changed, 149 insertions(+) diff --cc asterixdb/pom.xml index 69452208a2,cd90712d5a..9fa2fc1d0e --- a/asterixdb/pom.xml +++ b/asterixdb/pom.xml @@@ -1940,21 -1989,32 +1990,45 @@@ <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-azure</artifactId> <version>${hadoop.version}</version> + <exclusions> + <!-- TODO(htowaileb): Remove after updating to hadoop 3.3.4 --> + <exclusion> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util-ajax</artifactId> + </exclusion> + </exclusions> </dependency> <!-- Hadoop Azure end --> + <!-- Hadoop GCS start --> + <dependency> + <groupId>com.google.cloud.bigdataoss</groupId> + <artifactId>gcs-connector</artifactId> + <version>${hadoop-gcs.version}</version> + <exclusions> + <exclusion> + <groupId>org.checkerframework</groupId> + <artifactId>checker-compat-qual</artifactId> + </exclusion> + </exclusions> + </dependency> + <!-- Hadoop GCS end --> + + <!-- TODO(htowaileb): removed from hadoop transitively and added separately to avoid CVEs, can + be removed once upgraded to hadoop 3.3.4 as it addresses the CVEs --> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util</artifactId> + <version>9.4.48.v20220622</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util-ajax</artifactId> + <version>9.4.48.v20220622</version> + </dependency> </dependencies> </dependencyManagement>
