From c5829b92458cc2b306f7d0ed90df7d3b87c4069e Mon Sep 17 00:00:00 2001 From: Stephan Schroevers Date: Sat, 4 Mar 2023 14:05:26 +0100 Subject: [PATCH 1/2] Upgrade JDKs used by GitHub Actions builds Additionally: - Update the example version numbers mentioned in the issue template. - Drop some redundant whitespace from `SourceCodeTest` test code. See: - https://www.oracle.com/java/technologies/javase/11-0-17-relnotes.html - https://www.oracle.com/java/technologies/javase/11-0-18-relnotes.html - https://www.oracle.com/java/technologies/javase/17-0-5-relnotes.html - https://www.oracle.com/java/technologies/javase/17-0-6-relnotes.html - https://www.oracle.com/java/technologies/javase/19-0-1-relnotes.html - https://www.oracle.com/java/technologies/javase/19-0-2-relnotes.html --- .github/ISSUE_TEMPLATE/bug_report.md | 6 +++--- .github/workflows/build.yaml | 6 +++--- .github/workflows/pitest-analyze-pr.yml | 2 +- .github/workflows/pitest-update-pr.yml | 2 +- .../picnic/errorprone/bugpatterns/util/SourceCodeTest.java | 4 ---- 5 files changed, 8 insertions(+), 12 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 9f7e1941b6..fce8a8f1af 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -42,9 +42,9 @@ Please replace this sentence with log output, if applicable. - Operating system (e.g. MacOS Monterey). -- Java version (i.e. `java --version`, e.g. `17.0.3`). -- Error Prone version (e.g. `2.15.0`). -- Error Prone Support version (e.g. `0.3.0`). +- Java version (i.e. `java --version`, e.g. `17.0.6`). +- Error Prone version (e.g. `2.18.0`). +- Error Prone Support version (e.g. `0.8.0`). ### Additional context diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 188450955e..5eab31a497 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -10,16 +10,16 @@ jobs: strategy: matrix: os: [ ubuntu-22.04 ] - jdk: [ 11.0.16, 17.0.4, 19 ] + jdk: [ 11.0.18, 17.0.6, 19.0.2 ] distribution: [ temurin ] experimental: [ false ] include: - os: macos-12 - jdk: 17.0.4 + jdk: 17.0.6 distribution: temurin experimental: false - os: windows-2022 - jdk: 17.0.4 + jdk: 17.0.6 distribution: temurin experimental: false - os: ubuntu-22.04 diff --git a/.github/workflows/pitest-analyze-pr.yml b/.github/workflows/pitest-analyze-pr.yml index 1c536124a8..db23d0b958 100644 --- a/.github/workflows/pitest-analyze-pr.yml +++ b/.github/workflows/pitest-analyze-pr.yml @@ -18,7 +18,7 @@ jobs: - name: Set up JDK uses: actions/setup-java@v3.8.0 with: - java-version: 17.0.4 + java-version: 17.0.6 distribution: temurin cache: maven - name: Run Pitest diff --git a/.github/workflows/pitest-update-pr.yml b/.github/workflows/pitest-update-pr.yml index 240f14275f..1e3283b27a 100644 --- a/.github/workflows/pitest-update-pr.yml +++ b/.github/workflows/pitest-update-pr.yml @@ -22,7 +22,7 @@ jobs: - name: Set up JDK uses: actions/setup-java@v3.8.0 with: - java-version: 17.0.4 + java-version: 17.0.6 distribution: temurin cache: maven - name: Download Pitest analysis artifact diff --git a/error-prone-contrib/src/test/java/tech/picnic/errorprone/bugpatterns/util/SourceCodeTest.java b/error-prone-contrib/src/test/java/tech/picnic/errorprone/bugpatterns/util/SourceCodeTest.java index 56668a1506..76089514b7 100644 --- a/error-prone-contrib/src/test/java/tech/picnic/errorprone/bugpatterns/util/SourceCodeTest.java +++ b/error-prone-contrib/src/test/java/tech/picnic/errorprone/bugpatterns/util/SourceCodeTest.java @@ -31,7 +31,6 @@ void deleteWithTrailingWhitespaceAnnotations() { .expectUnchanged() .addInputLines( "AnnotationDeletions.java", - "", "interface AnnotationDeletions {", " class SoleAnnotation {", " @AnnotationToBeDeleted", @@ -66,7 +65,6 @@ void deleteWithTrailingWhitespaceAnnotations() { "}") .addOutputLines( "AnnotationDeletions.java", - "", "interface AnnotationDeletions {", " class SoleAnnotation {", " void m() {}", @@ -101,7 +99,6 @@ void deleteWithTrailingWhitespaceMethods() { refactoringTestHelper .addInputLines( "MethodDeletions.java", - "", "interface MethodDeletions {", " class SoleMethod {", " void methodToBeDeleted() {}", @@ -141,7 +138,6 @@ void deleteWithTrailingWhitespaceMethods() { "}") .addOutputLines( "MethodDeletions.java", - "", "interface MethodDeletions {", " class SoleMethod {}", "", From 4764ae79a9449eb27348c41cdc68e0c29bdee516 Mon Sep 17 00:00:00 2001 From: Stephan Schroevers Date: Sun, 5 Mar 2023 11:39:29 +0100 Subject: [PATCH 2/2] One more tweak --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4777ae1dec..0cabf8d9ac 100644 --- a/pom.xml +++ b/pom.xml @@ -862,8 +862,8 @@ --add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED - --add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED + --add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED