From 9a7f771f1c86aced8c19612cc80545fa6756fcb2 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Tue, 22 Sep 2020 08:59:52 +0200
Subject: [PATCH] Realign checker-qual/error_prone-annotations to Guava

Guava is the component pulling these two in, relocate their
declaration to Guava and re-align with what 29.0 is using.

Change-Id: I8b024ea437bd24936b28c4394c57f5ba8b1db318
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 .../src/main/history/dependencies.xml         |  4 ++--
 odlparent/pom.xml                             | 21 +++++++++----------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/features/odl-guava/src/main/history/dependencies.xml b/features/odl-guava/src/main/history/dependencies.xml
index d4dd95776..14f223c8c 100644
--- a/features/odl-guava/src/main/history/dependencies.xml
+++ b/features/odl-guava/src/main/history/dependencies.xml
@@ -4,9 +4,9 @@
         <ns2:feature>wrap</ns2:feature>
         <ns2:bundle>mvn:com.google.guava/failureaccess/1.0.1</ns2:bundle>
         <ns2:bundle>mvn:com.google.guava/guava/29.0-jre</ns2:bundle>
-        <ns2:bundle>wrap:mvn:com.google.errorprone/error_prone_annotations/2.3.3</ns2:bundle>
+        <ns2:bundle>wrap:mvn:com.google.errorprone/error_prone_annotations/2.3.4</ns2:bundle>
         <ns2:bundle>wrap:mvn:com.google.guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava</ns2:bundle>
         <ns2:bundle>wrap:mvn:com.google.j2objc/j2objc-annotations/1.3</ns2:bundle>
-        <ns2:bundle>wrap:mvn:org.checkerframework/checker-qual/2.5.8</ns2:bundle>
+        <ns2:bundle>mvn:org.checkerframework/checker-qual/2.11.1</ns2:bundle>
     </ns2:feature>
 </ns2:features>
diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index 5bc34093f..8ffe02ab2 100644
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml
@@ -318,6 +318,16 @@
           </exclusion>
         </exclusions>
       </dependency>
+      <dependency>
+        <groupId>org.checkerframework</groupId>
+        <artifactId>checker-qual</artifactId>
+        <version>2.11.1</version>
+      </dependency>
+      <dependency>
+        <groupId>com.google.errorprone</groupId>
+        <artifactId>error_prone_annotations</artifactId>
+        <version>2.3.4</version>
+      </dependency>
 
       <dependency>
         <groupId>commons-beanutils</groupId>
@@ -360,17 +370,6 @@
         <scope>import</scope>
       </dependency>
 
-      <dependency>
-        <groupId>org.checkerframework</groupId>
-        <artifactId>checker-qual</artifactId>
-        <version>2.5.8</version>
-      </dependency>
-      <dependency>
-        <groupId>com.google.errorprone</groupId>
-        <artifactId>error_prone_annotations</artifactId>
-        <version>2.3.3</version>
-      </dependency>
-
       <dependency>
         <groupId>javax.activation</groupId>
         <artifactId>activation</artifactId>
-- 
2.36.6