Skip to content

Commit

Permalink
ZOOKEEPER-4531: Revert Netty TCNative changes (#27)
Browse files Browse the repository at this point in the history
Removed tcnative depdency as it is required after netty upgrade to 4.1.76
Removed tcnative CVE supressions

Author: Brahma Reddy Battula <brahma@apache.org>

Reviewers: Mohammad Arshad <arshad@apache.org>

Closes apache#1873 from brahmareddybattula/master

Co-authored-by: Brahma Reddy Battula <brahma@apache.org>
  • Loading branch information
anurag-harness and brahmareddybattula committed Jan 13, 2023
1 parent 7c4ecc6 commit d366646
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 230 deletions.
12 changes: 0 additions & 12 deletions owaspSuppressions.xml
Expand Up @@ -34,18 +34,6 @@
<!-- https://github.com/jeremylong/DependencyCheck/issues/1653
False positive on Netty 4.x-->
<cve>CVE-2018-12056</cve>
<!-- other false positives related to Netty TCNative 4.x -->
<cve>CVE-2021-43797</cve>
<cve>CVE-2019-16869</cve>
<cve>CVE-2015-2156</cve>
<cve>CVE-2021-37136</cve>
<cve>CVE-2014-3488</cve>
<cve>CVE-2021-37137</cve>
<cve>CVE-2019-20445</cve>
<cve>CVE-2019-20444</cve>
<cve>CVE-2021-21295</cve>
<cve>CVE-2021-21409</cve>
<cve>CVE-2021-21290</cve>
</suppress>
<suppress>
<!-- Seems like false positive - we are not using Prometheus
Expand Down
12 changes: 0 additions & 12 deletions pom.xml
Expand Up @@ -559,7 +559,6 @@
<hamcrest.version>2.2</hamcrest.version>
<commons-cli.version>1.4</commons-cli.version>
<netty.version>4.1.76.Final</netty.version>
<netty.tcnative.version>2.0.48.Final</netty.tcnative.version>
<jetty.version>9.4.43.v20210629</jetty.version>
<jackson.version>2.13.2.1</jackson.version>
<jline.version>2.14.6</jline.version>
Expand Down Expand Up @@ -708,23 +707,12 @@
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
<version>${netty.version}</version>
<exclusions>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-tcnative-classes</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId>
<version>${netty.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-tcnative</artifactId>
<version>${netty.tcnative.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
Expand Down
4 changes: 0 additions & 4 deletions zookeeper-server/pom.xml
Expand Up @@ -66,10 +66,6 @@
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-tcnative</artifactId>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId>
Expand Down

This file was deleted.

0 comments on commit d366646

Please sign in to comment.