From 91dbd7474041880d2babc7124fcce20fe61493c1 Mon Sep 17 00:00:00 2001
From: Matthias Andreas Benkard <code@mail.matthias.benkard.de>
Date: Mon, 17 Oct 2022 19:38:56 +0200
Subject: Remove Checker Framework; add NullAway, Picnic Error Prone Support.

Change-Id: I6558f0b4db0f9a192c18bbe45e2eaf10595bc666
---
 jgvariant-parent/pom.xml | 37 +++++++++++++++++--------------------
 1 file changed, 17 insertions(+), 20 deletions(-)

(limited to 'jgvariant-parent')

diff --git a/jgvariant-parent/pom.xml b/jgvariant-parent/pom.xml
index 5c3f27b..41b2c59 100644
--- a/jgvariant-parent/pom.xml
+++ b/jgvariant-parent/pom.xml
@@ -70,12 +70,13 @@ SPDX-License-Identifier: LGPL-3.0-or-later
 
     <apiguardian.version>1.1.2</apiguardian.version>
     <errorprone.version>2.15.0</errorprone.version>
+    <error-prone-support.version>0.4.0</error-prone-support.version>
     <google-java-format.version>1.15.0</google-java-format.version>
     <inject-resources.version>0.3.2</inject-resources.version>
     <jetbrains-annotations.version>23.0.0</jetbrains-annotations.version>
     <junit-jupiter.version>5.9.0</junit-jupiter.version>
+    <nullaway.version>0.10.2</nullaway.version>
     <xz.version>1.9</xz.version>
-    <checker-framework.version>3.25.0</checker-framework.version>
   </properties>
 
   <distributionManagement>
@@ -104,18 +105,6 @@ SPDX-License-Identifier: LGPL-3.0-or-later
         <version>${apiguardian.version}</version>
       </dependency>
 
-      <!-- Static analysis -->
-      <dependency>
-        <groupId>org.checkerframework</groupId>
-        <artifactId>checker</artifactId>
-        <version>${checker-framework.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.checkerframework</groupId>
-        <artifactId>checker-qual</artifactId>
-        <version>${checker-framework.version}</version>
-      </dependency>
-
       <!-- OSTree compression support -->
       <dependency>
         <groupId>org.tukaani</groupId>
@@ -178,9 +167,10 @@ SPDX-License-Identifier: LGPL-3.0-or-later
           <version>${compiler-plugin.version}</version>
           <configuration>
             <fork>true</fork>
+            <showWarnings>true</showWarnings>
             <compilerArgs>
               <arg>-XDcompilePolicy=simple</arg>
-              <arg>-Xplugin:ErrorProne -Xep:InvalidParam:OFF</arg>
+              <arg>-Xplugin:ErrorProne -Xep:InvalidParam:OFF -Xep:CollectorMutability:OFF -Xep:LexicographicalAnnotationListing:OFF -XepOpt:NullAway:AnnotatedPackages=eu.mulk</arg>
               <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED</arg>
               <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED</arg>
               <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED</arg>
@@ -200,14 +190,21 @@ SPDX-License-Identifier: LGPL-3.0-or-later
                 <version>${errorprone.version}</version>
               </path>
               <path>
-                <groupId>org.checkerframework</groupId>
-                <artifactId>checker</artifactId>
-                <version>${checker-framework.version}</version>
+                <groupId>tech.picnic.error-prone-support</groupId>
+                <artifactId>error-prone-contrib</artifactId>
+                <version>${error-prone-support.version}</version>
+              </path>
+              <path>
+                <groupId>tech.picnic.error-prone-support</groupId>
+                <artifactId>refaster-runner</artifactId>
+                <version>${error-prone-support.version}</version>
+              </path>
+              <path>
+                <groupId>com.uber.nullaway</groupId>
+                <artifactId>nullaway</artifactId>
+                <version>${nullaway.version}</version>
               </path>
             </annotationProcessorPaths>
-            <annotationProcessors>
-              <annotationProcessor>org.checkerframework.checker.nullness.NullnessChecker</annotationProcessor>
-            </annotationProcessors>
           </configuration>
         </plugin>
 
-- 
cgit v1.2.3