Bump Guava to 31.1

https://github.com/google/guava/releases/tag/v31.1

Also update errorprone-annotations version to match.

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

diff --git a/docs/pom.xml b/docs/pom.xml
index 752939c102d2a9f496d034ba0f2530208fc37056..566573231811df94eed5ea055865623b46e292da 100644 (file)
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -224,7 +224,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/31.0.1-jre/api/docs/</link>
+                        <link>https://google.github.io/guava/releases/31.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 0db52ee98087e28f5630415ed9c721d10baac4e3..41cb71a9f35cfcbc4586c1c42fde549dc9204477 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 31.0.1</name>
+    <name>OpenDaylight :: Guava 31.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 52d0725bae5508aff9f23a096fb49e86d593d72b..a28e19f211a33d6604a7f7f8aa66e6554bf606cb 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/31.0.1-jre</ns2:bundle>
+        <ns2:bundle>mvn:com.google.guava/guava/31.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 0d8915e7dc1e1bb947c9b5a91575d5a7f650e17b..81156d99258568d5478269b981c5212d5bf5903d 100644 (file)
--- a/odlparent-lite/pom.xml
+++ b/odlparent-lite/pom.xml
@@ -605,7 +605,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/31.0.1-jre/api/docs/</link>
+                <link>https://google.github.io/guava/releases/31.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 2876c491afca25da1d80b1464f274a32d3759c8f..f43a640ba4ab3489b688f789b96c18ed5defee56 100644 (file)
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml
@@ -256,7 +256,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>31.0.1-jre</version>
+        <version>31.1-jre</version>
         <exclusions>
           <exclusion>
             <!-- Do not leak JSR305 onto the classpath by default -->
@@ -269,7 +269,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>31.0.1-jre</version>
+        <version>31.1-jre</version>
         <scope>test</scope>
         <exclusions>
           <exclusion>
@@ -287,7 +287,7 @@
       <dependency>
         <groupId>com.google.errorprone</groupId>
         <artifactId>error_prone_annotations</artifactId>
-        <version>2.7.1</version>
+        <version>2.11.0</version>
       </dependency>
 
       <dependency>