You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@asterixdb.apache.org by AsterixDB Code Review <do...@asterix-gerrit.ics.uci.edu> on 2023/02/16 00:19:34 UTC
Change in asterixdb[neo]: [NO ISSUE] remove jetty workaround due to Hadoop 3.3.4
From Michael Blow <mb...@apache.org>:
Michael Blow has uploaded this change for review. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17384 )
Change subject: [NO ISSUE] remove jetty workaround due to Hadoop 3.3.4
......................................................................
[NO ISSUE] remove jetty workaround due to Hadoop 3.3.4
Change-Id: I22bb85250d0d66c1bf7e9170daacff406599a0b7
---
M asterixdb/asterix-external-data/pom.xml
M asterixdb/pom.xml
M hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml
M hyracks-fullstack/pom.xml
4 files changed, 9 insertions(+), 149 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/84/17384/1
diff --git a/asterixdb/asterix-external-data/pom.xml b/asterixdb/asterix-external-data/pom.xml
index dec2ad8..7fee2f0 100644
--- a/asterixdb/asterix-external-data/pom.xml
+++ b/asterixdb/asterix-external-data/pom.xml
@@ -541,16 +541,6 @@
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-unix-common</artifactId>
</dependency>
- <!-- 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>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util-ajax</artifactId>
- </dependency>
</dependencies>
<!-- apply patch for HADOOP-17225 to workaround CVE-2019-10172 -->
<repositories>
diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index 6e198a7..49535ab 100644
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@ -1003,15 +1003,6 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
- <!-- 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>
<dependency>
@@ -1075,15 +1066,6 @@
<groupId>javax.ws.rs</groupId>
<artifactId>jsr311-api</artifactId>
</exclusion>
- <!-- 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>
<dependency>
@@ -1127,15 +1109,6 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
- <!-- 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>
<dependency>
@@ -1163,11 +1136,6 @@
<groupId>org.jline</groupId>
<artifactId>jline</artifactId>
</exclusion>
- <!-- TODO(htowaileb): Remove after updating to hadoop 3.3.4 -->
- <exclusion>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -1206,15 +1174,6 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
- <!-- 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>
<dependency>
@@ -1239,15 +1198,6 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
- <!-- 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>
<dependency>
@@ -1989,32 +1939,8 @@
<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 -->
-
- <!-- 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>
diff --git a/hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml b/hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml
index b16904d..985515c 100644
--- a/hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml
@@ -163,15 +163,6 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
- <!-- 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>
<dependency>
@@ -194,11 +185,6 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
- <!-- TODO(htowaileb): Remove after updating to hadoop 3.3.4 -->
- <exclusion>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml
index 69a8279..9d2e76f 100644
--- a/hyracks-fullstack/pom.xml
+++ b/hyracks-fullstack/pom.xml
@@ -183,15 +183,6 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
- <!-- 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>
<dependency>
@@ -207,15 +198,6 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
- <!-- 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>
<dependency>
@@ -227,28 +209,12 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
- <!-- 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>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-mapreduce-client-core</artifactId>
<version>${hadoop.version}</version>
- <!-- TODO(htowaileb): Remove after updating to hadoop 3.3.4 -->
- <exclusions>
- <exclusion>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
@@ -261,11 +227,6 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
- <!-- TODO(htowaileb): Remove after updating to hadoop 3.3.4 -->
- <exclusion>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -460,18 +421,6 @@
<artifactId>snappy-java</artifactId>
<version>${snappy.version}</version>
</dependency>
- <!-- 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>
<build>
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17384
To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: neo
Gerrit-Change-Id: I22bb85250d0d66c1bf7e9170daacff406599a0b7
Gerrit-Change-Number: 17384
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-MessageType: newchange