From 21fc31d86665adaf5f7080c2e30461aa12391315 Mon Sep 17 00:00:00 2001
From: Kasra Madadipouya <kasra_mp@yahoo.com>
Date: Fri, 9 Jun 2023 19:29:29 +0200
Subject: [PATCH] JAVA-20632 move checker-framework module to JDK 11 (#14203)

---
 checker-framework/pom.xml | 60 ++++++++++++++-------------------------
 pom.xml                   |  4 +--
 2 files changed, 24 insertions(+), 40 deletions(-)

diff --git a/checker-framework/pom.xml b/checker-framework/pom.xml
index a348745343..d8a44ec0c9 100644
--- a/checker-framework/pom.xml
+++ b/checker-framework/pom.xml
@@ -19,24 +19,13 @@
         <dependency>
             <groupId>org.checkerframework</groupId>
             <artifactId>checker-qual</artifactId>
-            <version>${checker-qual.version}</version>
+            <version>${checker.version}</version>
         </dependency>
         <dependency>
             <groupId>org.checkerframework</groupId>
             <artifactId>checker</artifactId>
             <version>${checker.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.checkerframework</groupId>
-            <artifactId>jdk8</artifactId>
-            <version>${jdk8.version}</version>
-        </dependency>
-        <!-- The Type Annotations compiler. Uncomment if using annotations in comments. -->
-        <dependency>
-            <groupId>org.checkerframework</groupId>
-            <artifactId>compiler</artifactId>
-            <version>${checkerframework.compiler.version}</version>
-        </dependency>
     </dependencies>
 
     <build>
@@ -45,32 +34,34 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>${maven-compiler-plugin.version}</version>
                 <configuration>
-                    <source>${java.version}</source>
-                    <target>${java.version}</target>
-                    <!-- Uncomment the following line to use the type annotations compiler. -->
-                    <!-- <fork>true</fork> -->
-                    <compilerArguments>
-                        <Xmaxerrs>10000</Xmaxerrs>
-                        <Xmaxwarns>10000</Xmaxwarns>
-                    </compilerArguments>
+                    <fork>true</fork>
+                    <compilerArgument>-Xlint:all</compilerArgument>
+                    <showWarnings>true</showWarnings>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>org.checkerframework</groupId>
+                            <artifactId>checker</artifactId>
+                            <version>${checker.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
                     <annotationProcessors>
-                        <!-- Add all the checkers you want to enable here -->
                         <annotationProcessor>org.checkerframework.checker.nullness.NullnessChecker</annotationProcessor>
                         <annotationProcessor>org.checkerframework.checker.interning.InterningChecker</annotationProcessor>
                         <annotationProcessor>org.checkerframework.checker.fenum.FenumChecker</annotationProcessor>
                         <annotationProcessor>org.checkerframework.checker.formatter.FormatterChecker</annotationProcessor>
                         <annotationProcessor>org.checkerframework.checker.regex.RegexChecker</annotationProcessor>
                     </annotationProcessors>
-                    <compilerArgs>
-                        <arg>-AprintErrorStack</arg>
-
-                        <!-- location of the annotated JDK, which comes from a Maven dependency -->
-                        <arg>-Xbootclasspath/p:${annotatedJdk}</arg>
-                        <!-- -->
-                        <!-- Uncomment the following line to use the type annotations compiler. -->
-                        <!-- <arg>-J-Xbootclasspath/p:${typeAnnotationsJavac}</arg> -->
-                        <!-- Uncomment the following line to turn type-checking warnings into errors. -->
+                    <compilerArgs combine.children="append">
                         <arg>-Awarns</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>
+                        <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED</arg>
+                        <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED</arg>
+                        <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED</arg>
+                        <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED</arg>
+                        <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED</arg>
+                        <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED</arg>
                     </compilerArgs>
                 </configuration>
             </plugin>
@@ -78,14 +69,7 @@
     </build>
 
     <properties>
-        <!-- These properties will be set by the Maven Dependency plugin -->
-        <annotatedJdk>${org.checkerframework:jdk8:jar}</annotatedJdk>
-        <!-- Uncomment to use the Type Annotations compiler. -->
-        <!-- <typeAnnotationsJavac>${org.checkerframework:compiler:jar}</typeAnnotationsJavac> -->
-        <checker-qual.version>2.3.1</checker-qual.version>
-        <checker.version>2.3.1</checker.version>
-        <jdk8.version>2.3.1</jdk8.version>
-        <checkerframework.compiler.version>2.3.1</checkerframework.compiler.version>
+        <checker.version>3.35.0</checker.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 76a9265877..8f4ed62de0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -334,7 +334,6 @@
                 <module>parent-spring-6</module>
                 <module>parent-java</module>
 
-                <module>checker-framework</module>
                 <!-- <module>clojure-modules</module> --> <!-- Not a maven project -->
 
                 <module>core-java-modules/core-java-8</module>
@@ -515,7 +514,6 @@
                 <module>parent-spring-6</module>
                 <module>parent-java</module>
 
-                <module>checker-framework</module>
                 <!-- <module>clojure-modules</module> --> <!-- Not a maven project -->
 
                 <module>core-java-modules/core-java-8</module>
@@ -768,6 +766,7 @@
                 <module>asciidoctor</module>
                 <module>aws-modules</module>
 
+                <module>checker-framework</module>
                 <module>couchbase</module>
                 <module>core-groovy-modules</module>
 
@@ -1028,6 +1027,7 @@
                 <module>asciidoctor</module>
                 <module>aws-modules</module>
 
+                <module>checker-framework</module>
                 <module>couchbase</module>
 
                 <module>core-groovy-modules</module>