Upgrade org.springframework:spring-framework-bom 5.3.27 -> 6.0.8 - abandoned

.github/ISSUE_TEMPLATE/bug_report.md

@@ -42,9 +42,9 @@ Please replace this sentence with log output, if applicable.
 <!-- Please complete the following information: -->
 
 - Operating system (e.g. MacOS Monterey).
-- Java version (i.e. `java --version`, e.g. `17.0.6`).
+- Java version (i.e. `java --version`, e.g. `17.0.7`).
 - Error Prone version (e.g. `2.18.0`).
-- Error Prone Support version (e.g. `0.8.0`).
+- Error Prone Support version (e.g. `0.9.0`).
 
 ### Additional context
 

.github/workflows/build-jdk11.yaml

@@ -0,0 +1,35 @@
+name: Build with JDK 17 and test against JDK 11
+on:
+  pull_request:
+  push:
+    branches: [ master ]
+permissions:
+  contents: read
+jobs:
+  build:
+    runs-on: ubuntu-22.04
+    steps:
+      # We run the build twice: once against the original Error Prone
+      # release, and once against the Picnic Error Prone fork. In both cases
+      # the code is compiled using JDK 17, while the tests are executed
+      # using JDK 11.
+      - name: Check out code
+        uses: actions/[email protected]
+        with:
+          persist-credentials: false
+      - name: Set up JDK
+        uses: actions/[email protected]
+        with:
+          java-version: |
+            11.0.19
+            17.0.7
+          distribution: temurin
+          cache: maven
+      - name: Display build environment details
+        run: mvn --version
+      - name: Build project against vanilla Error Prone
+        run: mvn -T1C install -Dsurefire.jdk-toolchain-version=11.0.19
+      - name: Build project with self-check against Error Prone fork
+        run: mvn -T1C clean verify -Perror-prone-fork -Dsurefire.jdk-toolchain-version=11.0.19 -s settings.xml
+      - name: Remove installed project artifacts
+        run: mvn build-helper:remove-project-artifact

.github/workflows/build.yaml

@@ -10,22 +10,18 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-22.04 ]
-        jdk: [ 11.0.18, 17.0.6, 19.0.2 ]
+        jdk: [ 17.0.7, 20.0.1 ]
         distribution: [ temurin ]
         experimental: [ false ]
         include:
           - os: macos-12
-            jdk: 17.0.6
+            jdk: 17.0.7
             distribution: temurin
             experimental: false
           - os: windows-2022
-            jdk: 17.0.6
+            jdk: 17.0.7
             distribution: temurin
             experimental: false
-          - os: ubuntu-22.04
-            jdk: 20-ea
-            distribution: zulu
-            experimental: true
     runs-on: ${{ matrix.os }}
     continue-on-error: ${{ matrix.experimental }}
     steps:

.github/workflows/codeql.yml

@@ -28,7 +28,7 @@ jobs:
       - name: Set up JDK
         uses: actions/[email protected]
         with:
-          java-version: 17.0.6
+          java-version: 17.0.7
           distribution: temurin
           cache: maven
       - name: Initialize CodeQL

.github/workflows/pitest-analyze-pr.yml

@@ -19,7 +19,7 @@ jobs:
       - name: Set up JDK
         uses: actions/[email protected]
         with:
-          java-version: 17.0.6
+          java-version: 17.0.7
           distribution: temurin
           cache: maven
       - name: Run Pitest

.github/workflows/pitest-update-pr.yml

@@ -26,7 +26,7 @@ jobs:
       - name: Set up JDK
         uses: actions/[email protected]
         with:
-          java-version: 17.0.6
+          java-version: 17.0.7
           distribution: temurin
           cache: maven
       - name: Download Pitest analysis artifact

.github/workflows/sonarcloud.yml

@@ -23,7 +23,7 @@ jobs:
       - name: Set up JDK
         uses: actions/[email protected]
         with:
-          java-version: 17.0.6
+          java-version: 17.0.7
           distribution: temurin
           cache: maven
       - name: Create missing `test` directory

README.md

@@ -227,18 +227,6 @@ Other highly relevant commands:
   `target/pit-reports/index.html` files. For more information check the [PIT
   Maven plugin][pitest-maven].
 
-When running the project's tests in IntelliJ IDEA, you might see the following
-error:
-
-```
-java: exporting a package from system module jdk.compiler is not allowed with --release
-```
-
-If this happens, go to _Settings -> Build, Execution, Deployment -> Compiler ->
-Java Compiler_ and deselect the option _Use '--release' option for
-cross-compilation (Java 9 and later)_. See [IDEA-288052][idea-288052] for
-details.
-
 ## 💡 How it works
 
 This project provides additional [`BugChecker`][error-prone-bugchecker]
@@ -273,7 +261,6 @@ channel; please see our [security policy][security] for details.
 [github-actions-build-badge]: https://github.com/PicnicSupermarket/error-prone-support/actions/workflows/build.yaml/badge.svg
 [github-actions-build-master]: https://github.com/PicnicSupermarket/error-prone-support/actions/workflows/build.yaml?query=branch:master&event=push
 [google-java-format]: https://github.com/google/google-java-format
-[idea-288052]: https://youtrack.jetbrains.com/issue/IDEA-288052
 [license-badge]: https://img.shields.io/github/license/PicnicSupermarket/error-prone-support
 [license]: https://github.com/PicnicSupermarket/error-prone-support/blob/master/LICENSE.md
 [maven-central-badge]: https://img.shields.io/maven-central/v/tech.picnic.error-prone-support/error-prone-support?color=blue

documentation-support/src/test/java/tech/picnic/errorprone/documentation/BugPatternExtractorTest.java

@@ -5,15 +5,13 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import com.google.common.io.Resources;
 import com.google.errorprone.BugPattern;
 import com.google.errorprone.CompilationTestHelper;
 import com.google.errorprone.VisitorState;
 import com.google.errorprone.bugpatterns.BugChecker;
 import com.google.errorprone.bugpatterns.BugChecker.ClassTreeMatcher;
 import com.google.errorprone.matchers.Description;
 import com.sun.source.tree.ClassTree;
-import java.io.IOException;
 import java.nio.file.Path;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
@@ -32,7 +30,7 @@ void noBugPattern(@TempDir Path outputDirectory) {
   }
 
   @Test
-  void minimalBugPattern(@TempDir Path outputDirectory) throws IOException {
+  void minimalBugPattern(@TempDir Path outputDirectory) {
     Compilation.compileWithDocumentationGenerator(
         outputDirectory,
         "MinimalBugChecker.java",
@@ -45,14 +43,29 @@ void minimalBugPattern(@TempDir Path outputDirectory) throws IOException {
         "@BugPattern(summary = \"MinimalBugChecker summary\", severity = SeverityLevel.ERROR)",
         "public final class MinimalBugChecker extends BugChecker {}");
 
-    verifyFileMatchesResource(
+    verifyFileContent(
         outputDirectory,
         "bugpattern-MinimalBugChecker.json",
-        "bugpattern-documentation-minimal.json");
+        """
+        {
+          "fullyQualifiedName": "pkg.MinimalBugChecker",
+          "name": "MinimalBugChecker",
+          "altNames": [],
+          "link": "",
+          "tags": [],
+          "summary": "MinimalBugChecker summary",
+          "explanation": "",
+          "severityLevel": "ERROR",
+          "canDisable": true,
+          "suppressionAnnotations": [
+            "java.lang.SuppressWarnings"
+          ]
+        }
+        """);
   }
 
   @Test
-  void completeBugPattern(@TempDir Path outputDirectory) throws IOException {
+  void completeBugPattern(@TempDir Path outputDirectory) {
     Compilation.compileWithDocumentationGenerator(
         outputDirectory,
         "CompleteBugChecker.java",
@@ -76,14 +89,34 @@ void completeBugPattern(@TempDir Path outputDirectory) throws IOException {
         "    suppressionAnnotations = {BugPattern.class, Test.class})",
         "public final class CompleteBugChecker extends BugChecker {}");
 
-    verifyFileMatchesResource(
+    verifyFileContent(
         outputDirectory,
         "bugpattern-CompleteBugChecker.json",
-        "bugpattern-documentation-complete.json");
+        """
+        {
+          "fullyQualifiedName": "pkg.CompleteBugChecker",
+          "name": "OtherName",
+          "altNames": [
+            "Check"
+          ],
+          "link": "https://error-prone.picnic.tech",
+          "tags": [
+            "Simplification"
+          ],
+          "summary": "CompleteBugChecker summary",
+          "explanation": "Example explanation",
+          "severityLevel": "SUGGESTION",
+          "canDisable": false,
+          "suppressionAnnotations": [
+            "com.google.errorprone.BugPattern",
+            "org.junit.jupiter.api.Test"
+          ]
+        }
+        """);
   }
 
   @Test
-  void undocumentedSuppressionBugPattern(@TempDir Path outputDirectory) throws IOException {
+  void undocumentedSuppressionBugPattern(@TempDir Path outputDirectory) {
     Compilation.compileWithDocumentationGenerator(
         outputDirectory,
         "UndocumentedSuppressionBugPattern.java",
@@ -99,10 +132,23 @@ void undocumentedSuppressionBugPattern(@TempDir Path outputDirectory) throws IOE
         "    documentSuppression = false)",
         "public final class UndocumentedSuppressionBugPattern extends BugChecker {}");
 
-    verifyFileMatchesResource(
+    verifyFileContent(
         outputDirectory,
         "bugpattern-UndocumentedSuppressionBugPattern.json",
-        "bugpattern-documentation-undocumented-suppression.json");
+        """
+        {
+          "fullyQualifiedName": "pkg.UndocumentedSuppressionBugPattern",
+          "name": "UndocumentedSuppressionBugPattern",
+          "altNames": [],
+          "link": "",
+          "tags": [],
+          "summary": "UndocumentedSuppressionBugPattern summary",
+          "explanation": "",
+          "severityLevel": "WARNING",
+          "canDisable": true,
+          "suppressionAnnotations": []
+        }
+        """);
   }
 
   @Test
@@ -117,19 +163,11 @@ void bugPatternAnnotationIsAbsent() {
         .doTest();
   }
 
-  private static void verifyFileMatchesResource(
-      Path outputDirectory, String fileName, String resourceName) throws IOException {
+  private static void verifyFileContent(
+      Path outputDirectory, String fileName, String expectedContent) {
     assertThat(outputDirectory.resolve(fileName))
         .content(UTF_8)
-        .isEqualToIgnoringWhitespace(getResource(resourceName));
-  }
-
-  // XXX: Once we support only JDK 15+, drop this method in favour of including the resources as
-  // text blocks in this class. (This also requires renaming the `verifyFileMatchesResource`
-  // method.)
-  private static String getResource(String resourceName) throws IOException {
-    return Resources.toString(
-        Resources.getResource(BugPatternExtractorTest.class, resourceName), UTF_8);
+        .isEqualToIgnoringWhitespace(expectedContent);
   }
 
   /** A {@link BugChecker} that validates the {@link BugPatternExtractor}. */

error-prone-contrib/pom.xml

@@ -238,7 +238,6 @@
                             </path>
                         </annotationProcessorPaths>
                         <compilerArgs combine.children="append">
-                            <arg>-Xplugin:RefasterRuleCompiler</arg>
                             <arg>-Xplugin:DocumentationGenerator -XoutputDirectory=${project.build.directory}/docs</arg>
                         </compilerArgs>
                     </configuration>

error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/AmbiguousJsonCreator.java

@@ -18,7 +18,7 @@
 import com.sun.source.tree.AnnotationTree;
 import com.sun.source.tree.ClassTree;
 import com.sun.source.tree.MethodTree;
-import com.sun.source.tree.Tree;
+import com.sun.source.tree.Tree.Kind;
 import com.sun.tools.javac.code.Symbol;
 import java.util.Map;
 import javax.lang.model.element.AnnotationValue;
@@ -46,7 +46,7 @@ public Description matchAnnotation(AnnotationTree tree, VisitorState state) {
     }
 
     ClassTree clazz = state.findEnclosing(ClassTree.class);
-    if (clazz == null || clazz.getKind() != Tree.Kind.ENUM) {
+    if (clazz == null || clazz.getKind() != Kind.ENUM) {
       return Description.NO_MATCH;
     }
 

error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/CanonicalAnnotationSyntax.java

@@ -19,7 +19,6 @@
 import com.sun.source.tree.AssignmentTree;
 import com.sun.source.tree.ExpressionTree;
 import com.sun.source.tree.NewArrayTree;
-import com.sun.source.tree.Tree.Kind;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
@@ -119,7 +118,7 @@ private static Optional<Fix> dropRedundantCurlies(AnnotationTree tree, VisitorSt
        * the expression as a whole.
        */
       ExpressionTree value =
-          (arg.getKind() == Kind.ASSIGNMENT) ? ((AssignmentTree) arg).getExpression() : arg;
+          (arg instanceof AssignmentTree assignment) ? assignment.getExpression() : arg;
 
       /* Store a fix for each expression that was successfully simplified. */
       simplifyAttributeValue(value, state)
@@ -130,13 +129,10 @@ private static Optional<Fix> dropRedundantCurlies(AnnotationTree tree, VisitorSt
   }
 
   private static Optional<String> simplifyAttributeValue(ExpressionTree expr, VisitorState state) {
-    if (expr.getKind() != Kind.NEW_ARRAY) {
-      /* There are no curly braces or commas to be dropped here. */
-      return Optional.empty();
-    }
-
-    NewArrayTree array = (NewArrayTree) expr;
-    return simplifySingletonArray(array, state).or(() -> dropTrailingComma(array, state));
+    /* Drop curly braces or commas if possible. */
+    return expr instanceof NewArrayTree newArray
+        ? simplifySingletonArray(newArray, state).or(() -> dropTrailingComma(newArray, state))
+        : Optional.empty();
   }
 
   /** Returns the expression describing the array's sole element, if any. */