From 7d9b2004a2a0e14c56dd247d21999f37ce0c2b82 Mon Sep 17 00:00:00 2001
From: Maxim Nesen <maxim.nesen@oracle.com>
Date: Fri, 20 Jul 2018 13:22:56 +0200
Subject: [PATCH] workaround for guava CVE-2018-10237 vulnerability

Signed-off-by: Maxim Nesen <maxim.nesen@oracle.com>
---
 wadl/pom.xml                   |  1 +
 wadl/wadl-maven-plugin/pom.xml | 17 ++++++++++++-----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/wadl/pom.xml b/wadl/pom.xml
index fe65d18..70a7cf1 100644
--- a/wadl/pom.xml
+++ b/wadl/pom.xml
@@ -379,6 +379,7 @@
         <jersey2.version>2.9</jersey2.version>
         <junit.version>4.10</junit.version>
         <jaxb.version>2.2.6</jaxb.version>
+        <maven.plugin.version>3.5.3</maven.plugin.version>
     </properties>
 
 </project>
diff --git a/wadl/wadl-maven-plugin/pom.xml b/wadl/wadl-maven-plugin/pom.xml
index afbfdc5..9ff2da6 100644
--- a/wadl/wadl-maven-plugin/pom.xml
+++ b/wadl/wadl-maven-plugin/pom.xml
@@ -81,17 +81,26 @@
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-core</artifactId>
-            <version>3.5.3</version>
+            <version>${maven.plugin.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-plugin-api</artifactId>
-            <version>3.5.3</version>
+            <version>${maven.plugin.version}</version>
+        </dependency>
+        <!--
+        maven-core related
+        guava dependency which fixes known vulnerability CVE-2018-10237
+        -->
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>24.1.1-android</version>
         </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-compat</artifactId>
-            <version>3.5.3</version>
+            <version>${maven.plugin.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -167,6 +176,4 @@
             <version>1.9.11</version>
         </dependency>
     </dependencies>
-
-
 </project>