This is an automated email from the ASF dual-hosted git repository.
andor pushed a commit to branch branch-3.4
in repository https://gitbox.apache.org/repos/asf/zookeeper.git
The following commit(s) were added to refs/heads/branch-3.4 by this push:
new 5207f27 ZOOKEEPER-3262: Update dependencies flagged by OWASP report
5207f27 is described below
commit 5207f27a892c286232acc8a284d6d2b17e75f82d
Author: Enrico Olivelli <[email protected]>
AuthorDate: Fri Feb 8 06:06:39 2019 +0100
ZOOKEEPER-3262: Update dependencies flagged by OWASP report
- Dropped unused dependencies BounceCastle, Jackson and Jetty
- Suppress false positives against ZooKeeper itself: CVE-2018-8012
Author: Enrico Olivelli <[email protected]>
Reviewers: [email protected]
Closes #806 from eolivelli/fix/owasp-34
---
owaspSuppressions.xml | 4 ++++
pom.xml | 18 ------------------
zookeeper-server/pom.xml | 22 +---------------------
3 files changed, 5 insertions(+), 39 deletions(-)
diff --git a/owaspSuppressions.xml b/owaspSuppressions.xml
index 0165b9a..3dd0f38 100644
--- a/owaspSuppressions.xml
+++ b/owaspSuppressions.xml
@@ -22,4 +22,8 @@
<!-- ZOOKEEPER-3217 -->
<cve>CVE-2018-8088</cve>
</suppress>
+ <suppress>
+ <!-- ZOOKEEPER-3262 -->
+ <cve>CVE-2018-8012</cve>
+ </suppress>
</suppressions>
diff --git a/pom.xml b/pom.xml
index 01819ed..32a9d23 100755
--- a/pom.xml
+++ b/pom.xml
@@ -271,12 +271,9 @@
<hamcrest.version>1.3</hamcrest.version>
<commons-cli.version>1.2</commons-cli.version>
<netty.version>3.10.6.Final</netty.version>
- <jetty.version>9.4.10.v20180503</jetty.version>
- <jackson.version>2.9.5</jackson.version>
<json.version>1.1.1</json.version>
<jline.version>0.9.94</jline.version>
<kerby.version>1.1.0</kerby.version>
- <bouncycastle.version>1.56</bouncycastle.version>
<commons-collections.version>3.2.2</commons-collections.version>
<commons-lang.version>2.4</commons-lang.version>
<apache-directory-server.version>2.0.0-M15</apache-directory-server.version>
@@ -344,16 +341,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
- <version>${bouncycastle.version}</version>
- </dependency>
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcpkix-jdk15on</artifactId>
- <version>${bouncycastle.version}</version>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
@@ -400,11 +387,6 @@
<version>${jetty.version}</version>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- <version>${jackson.version}</version>
- </dependency>
- <dependency>
<groupId>com.googlecode.json-simple</groupId>
<artifactId>json-simple</artifactId>
<version>${json.version}</version>
diff --git a/zookeeper-server/pom.xml b/zookeeper-server/pom.xml
index 44a58b5..fee4863 100755
--- a/zookeeper-server/pom.xml
+++ b/zookeeper-server/pom.xml
@@ -76,30 +76,10 @@
<artifactId>slf4j-log4j12</artifactId>
</dependency>
<dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-server</artifactId>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-servlet</artifactId>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- </dependency>
- <dependency>
<groupId>com.googlecode.json-simple</groupId>
<artifactId>json-simple</artifactId>
</dependency>
<dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
- </dependency>
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcpkix-jdk15on</artifactId>
- </dependency>
- <dependency>
<groupId>jline</groupId>
<artifactId>jline</artifactId>
</dependency>
@@ -307,4 +287,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
