Bump guava to 31.0.1

https://github.com/google/guava/releases/tag/v31.0
https://github.com/google/guava/releases/tag/v31.0.1

Change-Id: Iaba80e84da100965652c0190bd771f8adaa8f714
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/docs/pom.xml b/docs/pom.xml
index cb26dc39dacae18d45123328a7ef9277ada17485..a236ff91a81d363fdf1f36332c31d2476d3ccf45 100644 (file)
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -218,7 +218,7 @@
                         <link>http://hamcrest.org/JavaHamcrest/javadoc/2.2/</link>
                         <link>http://google.github.io/truth/api/1.0.1/</link>
                         <link>https://www.slf4j.org/apidocs/</link>
-                        <link>https://google.github.io/guava/releases/30.1.1-jre/api/docs/</link>
+                        <link>https://google.github.io/guava/releases/31.0.1-jre/api/docs/</link>
                         <link>https://commons.apache.org/proper/commons-lang/javadocs/api-2.6/</link>
                         <link>https://commons.apache.org/proper/commons-lang/javadocs/api-3.11/</link>
                         <link>https://commons.apache.org/proper/commons-codec/apidocs/</link>

diff --git a/features/odl-guava/pom.xml b/features/odl-guava/pom.xml
index d7fe02ef7887bb8f81675479a0a91c9ff7582efb..0db52ee98087e28f5630415ed9c721d10baac4e3 100644 (file)
--- a/features/odl-guava/pom.xml
+++ b/features/odl-guava/pom.xml
@@ -23,7 +23,7 @@
     <version>10.0.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
-    <name>OpenDaylight :: Guava 30.1.1</name>
+    <name>OpenDaylight :: Guava 31.0.1</name>
 
     <properties>
         <checkDependencyChange>true</checkDependencyChange>

diff --git a/features/odl-guava/src/main/history/dependencies.xml b/features/odl-guava/src/main/history/dependencies.xml
index ab95ce92ef59de72e3b525d2b6ea302622fd1664..52d0725bae5508aff9f23a096fb49e86d593d72b 100644 (file)
--- a/features/odl-guava/src/main/history/dependencies.xml
+++ b/features/odl-guava/src/main/history/dependencies.xml
@@ -2,7 +2,7 @@
 <ns2:features xmlns:ns2="http://karaf.apache.org/xmlns/features/v1.6.0" name="odl-guava">
     <ns2:feature version="0.0.0">
         <ns2:bundle>mvn:com.google.guava/failureaccess/1.0.1</ns2:bundle>
-        <ns2:bundle>mvn:com.google.guava/guava/30.1.1-jre</ns2:bundle>
-        <ns2:bundle>mvn:org.checkerframework/checker-qual/3.8.0</ns2:bundle>
+        <ns2:bundle>mvn:com.google.guava/guava/31.0.1-jre</ns2:bundle>
+        <ns2:bundle>mvn:org.checkerframework/checker-qual/3.12.0</ns2:bundle>
     </ns2:feature>
 </ns2:features>

diff --git a/odlparent-lite/pom.xml b/odlparent-lite/pom.xml
index 3f00c11f1823ab1a8236dcfd0821d9d68e15e0bd..aee2bcf3ca6fa7825a59ff72538e99bc40d463d9 100644 (file)
--- a/odlparent-lite/pom.xml
+++ b/odlparent-lite/pom.xml
@@ -585,7 +585,7 @@
                 <link>http://google.github.io/truth/api/1.1/</link>
                 <link>http://www.slf4j.org/apidocs/</link>
                 <link>https://xerces.apache.org/xerces2-j/javadocs/api/</link>
-                <link>https://google.github.io/guava/releases/30.1.1-jre/api/docs/</link>
+                <link>https://google.github.io/guava/releases/31.0.1-jre/api/docs/</link>
                 <link>http://netty.io/4.1/api/</link>
                 <link>https://commons.apache.org/proper/commons-lang/javadocs/api-2.6/</link>
                 <link>https://commons.apache.org/proper/commons-lang/javadocs/api-release/</link>

diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index ee7d792f5862574e930d2d8ce429b7f2f12ac000..938d037337b8b6854af477ea78c58951a9ef4cb2 100644 (file)
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml
@@ -250,7 +250,7 @@
         <groupId>com.google.guava</groupId>
         <artifactId>guava</artifactId>
         <!-- When bumping this version, remember to also change the JavaDoc link in odlparent-lite and docs -->
-        <version>30.1.1-jre</version>
+        <version>31.0.1-jre</version>
         <exclusions>
           <exclusion>
             <!-- Do not leak JSR305 onto the classpath by default -->
@@ -263,7 +263,7 @@
         <groupId>com.google.guava</groupId>
         <artifactId>guava-testlib</artifactId>
         <!-- When bumping this version, remember to also change the JavaDoc link in odlparent-lite and docs -->
-        <version>30.1.1-jre</version>
+        <version>31.0.1-jre</version>
         <scope>test</scope>
         <exclusions>
           <exclusion>
@@ -276,12 +276,12 @@
       <dependency>
         <groupId>org.checkerframework</groupId>
         <artifactId>checker-qual</artifactId>
-        <version>3.8.0</version>
+        <version>3.12.0</version>
       </dependency>
       <dependency>
         <groupId>com.google.errorprone</groupId>
         <artifactId>error_prone_annotations</artifactId>
-        <version>2.5.1</version>
+        <version>2.7.1</version>
       </dependency>
 
       <dependency>