Bump Guava 23.6 to 23.6.1

Commit log: https://github.com/google/guava/compare/v23.6...v23.6.1

This addresses CVE-2018-10237 (and only that).

Change-Id: I41e9fd17f8edad70f1501807966201e4f0b6aff6
JIRA: ODLPARENT-155
Signed-off-by: Stephen Kitt <skitt@redhat.com>
(cherry picked from commit 1b3a506244b751f6d74a7a9747daeef2b7b950b7)

diff --git a/features/odl-guava-23/pom.xml b/features/odl-guava-23/pom.xml
index a31c0a1fb854b4cee7a3a30171a73578d4cb45a1..e54c3eeb9e4707d10a1e2891e298cbd97169c906 100644 (file)
--- a/features/odl-guava-23/pom.xml
+++ b/features/odl-guava-23/pom.xml
@@ -34,7 +34,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>23.6-jre</version>
+            <version>23.6.1-jre</version>
         </dependency>
     </dependencies>
 

diff --git a/features/odl-guava-23/src/main/history/dependencies.xml b/features/odl-guava-23/src/main/history/dependencies.xml
index 6201b3e56597bd8735b08b723da44cb1b29c541a..ac13fc53b1b754967c508e020691b6f1a53141fa 100644 (file)
--- a/features/odl-guava-23/src/main/history/dependencies.xml
+++ b/features/odl-guava-23/src/main/history/dependencies.xml
@@ -2,7 +2,7 @@
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-guava-23">
     <feature version="0.0.0">
         <feature prerequisite="false" dependency="false">wrap</feature>
-        <bundle>mvn:com.google.guava/guava/23.6-jre</bundle>
+        <bundle>mvn:com.google.guava/guava/23.6.1-jre</bundle>
         <bundle>wrap:mvn:com.google.errorprone/error_prone_annotations/2.1.3</bundle>
         <bundle>wrap:mvn:com.google.j2objc/j2objc-annotations/1.1</bundle>
         <bundle>wrap:mvn:org.checkerframework/checker-compat-qual/2.0.0</bundle>

diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index 3c528ddef75a5ab187bfffa9223a3cc489020fd2..f64956a9d1c40a6f4c0c15e4dffb77caa4cdc760 100644 (file)
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml
@@ -300,7 +300,7 @@
       <dependency>
         <groupId>com.google.guava</groupId>
         <artifactId>guava</artifactId>
-        <version>23.6-jre</version>
+        <version>23.6.1-jre</version>
         <exclusions>
           <exclusion>
             <groupId>com.google.code.findbugs</groupId>
@@ -312,7 +312,7 @@
       <dependency>
         <groupId>com.google.guava</groupId>
         <artifactId>guava-testlib</artifactId>
-        <version>23.6-jre</version>
+        <version>23.6.1-jre</version>
         <scope>test</scope>
         <exclusions>
           <exclusion>