From 9c61a7d1a7bfe339c8bc48e1c6a5ee32bf777718 Mon Sep 17 00:00:00 2001
From: Stephan Schroevers <stephan.schroevers@teampicnic.com>
Date: Thu, 27 Apr 2023 19:19:29 +0200
Subject: [PATCH] Try to fix some build issues

---
 .github/workflows/build-jdk11.yaml |  4 ++--
 .github/workflows/sonarcloud.yml   |  2 +-
 pom.xml                            | 19 ++++++++++---------
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build-jdk11.yaml b/.github/workflows/build-jdk11.yaml
index 956496fce9a..b9c58b4e7e8 100644
--- a/.github/workflows/build-jdk11.yaml
+++ b/.github/workflows/build-jdk11.yaml
@@ -27,8 +27,8 @@ jobs:
           cache: maven
       - name: Display build environment details
         run: mvn --version
-      - name: Build project against vanilla Error Prone, compile Javadoc
-        run: mvn -T1C install javadoc:jar -Dsurefire.jdk-toolchain-version=11.0.18
+      - name: Build project against vanilla Error Prone
+        run: mvn -T1C install -Dsurefire.jdk-toolchain-version=11.0.18
       - name: Build project with self-check against Error Prone fork
         run: mvn -T1C clean verify -Perror-prone-fork -Dsurefire.jdk-toolchain-version=11.0.18 -s settings.xml
       - name: Remove installed project artifacts
diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml
index 3966960a4b8..1f940e604e9 100644
--- a/.github/workflows/sonarcloud.yml
+++ b/.github/workflows/sonarcloud.yml
@@ -33,4 +33,4 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        run: mvn -T1C jacoco:prepare-agent verify jacoco:report sonar:sonar -Dverification.skip -Dsonar.projectKey=PicnicSupermarket_error-prone-support
+        run: mvn -T1C jacoco:prepare-agent verify jacoco:report sonar:sonar -Dversion.jdk.runtime=17 -Dverification.skip -Dsonar.projectKey=PicnicSupermarket_error-prone-support
diff --git a/pom.xml b/pom.xml
index 88abf30dfd3..8a351e3e5b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -207,7 +207,8 @@
         <version.jabel>1.0.0</version.jabel>
         <!-- Though the project targets JDK 11, the code base does use more
         recent language constructs, thanks to the Jabel compiler plugin. -->
-        <version.jdk>11</version.jdk>
+        <version.jdk.runtime>11</version.jdk.runtime>
+        <version.jdk.source>17</version.jdk.source>
         <version.maven>3.8.7</version.maven>
         <version.mockito>5.3.1</version.mockito>
         <version.nopen-checker>1.0.1</version.nopen-checker>
@@ -560,7 +561,7 @@
                         `provided`, but we'd rather not do that.) -->
                         <failOnMissingClasses>false</failOnMissingClasses>
                         <failOnViolation>false</failOnViolation>
-                        <targetVersion>${version.jdk}</targetVersion>
+                        <targetVersion>${version.jdk.runtime}</targetVersion>
                     </configuration>
                     <executions>
                         <execution>
@@ -940,8 +941,8 @@
                             <arg>10000</arg>
                         </compilerArgs>
                         <parameters>true</parameters>
-                        <source>${version.jdk}</source>
-                        <target>${version.jdk}</target>
+                        <source>${version.jdk.runtime}</source>
+                        <target>${version.jdk.runtime}</target>
                         <!-- Erroneously inverted logic... for details, see
                         https://issues.apache.org/jira/browse/MCOMPILER-209. -->
                         <useIncrementalCompilation>false</useIncrementalCompilation>
@@ -1006,7 +1007,7 @@
                             <banDynamicVersions />-->
                             <dependencyConvergence />
                             <enforceBytecodeVersion>
-                                <maxJdkVersion>${version.jdk}</maxJdkVersion>
+                                <maxJdkVersion>${version.jdk.runtime}</maxJdkVersion>
                             </enforceBytecodeVersion>
                             <requireEncoding>
                                 <acceptAsciiSubset>true</acceptAsciiSubset>
@@ -1014,7 +1015,7 @@
                                 <includes>src/main/resources/**/*.properties,src/test/resources/**/*.properties</includes>
                             </requireEncoding>
                             <requireJavaVersion>
-                                <version>${version.jdk}</version>
+                                <version>${version.jdk.runtime}</version>
                             </requireJavaVersion>
                             <requireMavenVersion>
                                 <version>${version.maven}</version>
@@ -1114,7 +1115,7 @@
                         the compilation phase; no need to recheck during
                         Javadoc generation. -->
                         <doclint>none</doclint>
-                        <source>${version.jdk}</source>
+                        <source>${version.jdk.source}</source>
                     </configuration>
                     <executions>
                         <execution>
@@ -1317,7 +1318,7 @@
                             patterns in their `@BeforeTemplate` methods. -->
                             <ignorePackage>tech.picnic.errorprone.refasterrules</ignorePackage>
                         </ignorePackages>
-                        <javaVersion>${version.jdk}</javaVersion>
+                        <javaVersion>${version.jdk.runtime}</javaVersion>
                     </configuration>
                     <executions>
                         <execution>
@@ -1942,7 +1943,7 @@
                             <groupId>org.apache.maven.plugins</groupId>
                             <artifactId>maven-compiler-plugin</artifactId>
                             <configuration>
-                                <release>17</release>
+                                <release>${version.jdk.source}</release>
                             </configuration>
                         </plugin>
                     </plugins>