From 200b7642d4c4f3dc96928c5b85b3f94be29dd005 Mon Sep 17 00:00:00 2001
From: Liam Miller-Cushon <cushon@google.com>
Date: Mon, 19 Aug 2024 15:57:07 -0700
Subject: [PATCH] Run Error Prone tests against the configured JDK version

The adoption of maven toolchains meant this was accidentally always running tests against the latest JDK we had a toolchain for, instead of the default JDK  version configured for the current CI run.

PiperOrigin-RevId: 665021442
---
 pom.xml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pom.xml b/pom.xml
index 2992590fe2c..2181e204e5b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -246,6 +246,19 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <version>3.1.0</version>
         <configuration>
+          <jdkToolchain>
+            <!--
+            Test against the current default JDK, not the latest JDK a toolchain is registered for. 
+
+            On Error Prone's CI, the JDK we want to run the tests against is installed last, to
+            make it the default on the PATH and for JAVA_HOME:
+            https://github.com/google/error-prone/blob/master/.github/workflows/ci.yml
+
+            See also Guava's similar logic here:
+            https://github.com/google/guava/blob/781068569f0a275ac3c4bce08c9a1fe4d624048a/pom.xml#L20
+            -->
+            <version>${java.specification.version}</version>
+          </jdkToolchain>
           <argLine>
             -Xmx1g
             --add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED