ci: add JDK 26 testing support (#13352)

lqiu96 · web-flow · commit db88a283e3b4 · 2026-06-11T15:45:51.000Z
Add JDK 26 to build matrices in GitHub Actions workflows. Update Bazel integration tests in sdk-platform-java to run on JDK 25 and 26 with Security Manager override. # High Level Changes 1. Update errorprone version to a version that supports JDK 26 (Centralize all the configs so that the version is set from shared-deps). Added the additional configs necessary for the newer JDK versions 2. ErrorProne changes in BigTable and Datastore - New flagged changes from newer versions # BigTable and Datastore Changes Due to ErrorProne # Datastore ``` 01:52:32:119 [ERROR] Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:3.13.0:compile (default-compile) on project google-cloud-datastore: Compilation failure: Compilation failure: 01:52:32:119 [ERROR] /tmpfs/src/github/google-cloud-java/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreHelper.java:[41,58] error: [NullArgumentForNonNullParameter] Null is not permitted for this parameter. 01:52:32:119 [ERROR] (see https://errorprone.info/bugpattern/NullArgumentForNonNullParameter) 01:52:32:119 [ERROR] /tmpfs/src/github/google-cloud-java/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreHelper.java:[45,82] error: [NullArgumentForNonNullParameter] Null is not permitted for this parameter. 01:52:32:119 [ERROR] (see https://errorprone.info/bugpattern/NullArgumentForNonNullParameter) ``` ## BigTable ``` 01:49:56:149 [ERROR] Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:3.13.0:testCompile (default-testCompile) on project google-cloud-bigtable: Compilation failure: Compilation failure: 01:49:56:149 [ERROR] /tmpfs/src/github/google-cloud-java/java-bigtable/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/models/ClusterTest.java:[50,49] error: [NullArgumentForNonNullParameter] Null is not permitted for this parameter. 01:49:56:149 [ERROR] (see https://errorprone.info/bugpattern/NullArgumentForNonNullParameter) 01:49:56:149 [ERROR] /tmpfs/src/github/google-cloud-java/java-bigtable/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/internal/csm/attributes/EnvInfoTest.java:[36,73] error: [NullArgumentForNonNullParameter] Null is not permitted for this parameter. 01:49:56:149 [ERROR] (see https://errorprone.info/bugpattern/NullArgumentForNonNullParameter) 01:49:56:149 [ERROR] /tmpfs/src/github/google-cloud-java/java-bigtable/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/internal/csm/opencensus/MetricsTracerTest.java:[252,20] error: [NullArgumentForNonNullParameter] Null is not permitted for this parameter. 01:49:56:149 [ERROR] (see https://errorprone.info/bugpattern/NullArgumentForNonNullParameter) 01:49:56:149 [ERROR] /tmpfs/src/github/google-cloud-java/java-bigtable/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/internal/test_helpers/VRpcResultSubject.java:[55,23] error: [NullArgumentForNonNullParameter] Null is not permitted for this parameter. 01:49:56:149 [ERROR] (see https://errorprone.info/bugpattern/NullArgumentForNonNullParameter) 01:49:56:149 [ERROR] /tmpfs/src/github/google-cloud-java/java-bigtable/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStubCloseTest.java:[95,28] error: [NullArgumentForNonNullParameter] Null is not permitted for this parameter. 01:49:56:150 [ERROR] (see https://errorprone.info/bugpattern/NullArgumentForNonNullParameter) 01:49:56:150 [ERROR] /tmpfs/src/github/google-cloud-java/java-bigtable/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStubCloseTest.java:[106,33] error: [NullArgumentForNonNullParameter] Null is not permitted for this parameter. 01:49:56:150 [ERROR] (see https://errorprone.info/bugpattern/NullArgumentForNonNullParameter) 01:49:56:150 [ERROR] /tmpfs/src/github/google-cloud-java/java-bigtable/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStubTest.java:[388,34] error: [NullArgumentForNonNullParameter] Null is not permitted for this parameter. 01:49:56:150 [ERROR] (see https://errorprone.info/bugpattern/NullArgumentForNonNullParameter) 01:49:56:150 [ERROR] /tmpfs/src/github/google-cloud-java/java-bigtable/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStubTest.java:[388,20] error: [NullArgumentForNonNullParameter] Null is not permitted for this parameter. 01:49:56:150 [ERROR] (see https://errorprone.info/bugpattern/NullArgumentForNonNullParameter) 01:49:56:150 [ERROR] /tmpfs/src/github/google-cloud-java/java-bigtable/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStubTest.java:[410,34] error: [NullArgumentForNonNullParameter] Null is not permitted for this parameter. 01:49:56:150 [ERROR] (see https://errorprone.info/bugpattern/NullArgumentForNonNullParameter) 01:49:56:150 [ERROR] /tmpfs/src/github/google-cloud-java/java-bigtable/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStubTest.java:[410,20] error: [NullArgumentForNonNullParameter] Null is not permitted for this parameter. 01:49:56:150 [ERROR] (see https://errorprone.info/bugpattern/NullArgumentForNonNullParameter) 01:49:56:150 [ERROR] /tmpfs/src/github/google-cloud-java/java-bigtable/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/gaxx/reframing/ReframingResponseObserverTest.java:[188,64] error: [NullArgumentForNonNullParameter] Null is not permitted for this parameter. 01:49:56:150 [ERROR] (see https://errorprone.info/bugpattern/NullArgumentForNonNullParameter) ```
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -59,7 +59,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [11, 17, 21, 25]
+        java: [11, 17, 21, 25, 26]
     steps:
     - name: Get current week within the year
       id: date
@@ -226,7 +226,7 @@ jobs:
       fail-fast: false
       matrix:
         package: ${{ fromJSON(needs.changes.outputs.packages) }}
-        java: [11, 17, 21, 25]
+        java: [11, 17, 21, 25, 26]
     steps:
     - name: Get current week within the year
       id: date
diff --git a/.github/workflows/google-auth-library-java-ci.yaml b/.github/workflows/google-auth-library-java-ci.yaml
@@ -42,7 +42,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [11, 17, 21, 25]
+        java: [11, 17, 21, 25, 26]
     steps:
     - uses: actions/checkout@v4
     - uses: actions/setup-java@v4
diff --git a/.github/workflows/java-bigquery-jdbc-ci.yaml b/.github/workflows/java-bigquery-jdbc-ci.yaml
@@ -49,7 +49,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [11, 17, 21, 25]
+        java: [11, 17, 21, 25, 26]
     steps:
     - uses: actions/checkout@v4
     - uses: actions/setup-java@v4
diff --git a/.github/workflows/java-bigtable-ci.yaml b/.github/workflows/java-bigtable-ci.yaml
@@ -41,7 +41,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [11, 17, 21, 25]
+        java: [11, 17, 21, 25, 26]
     steps:
     - uses: actions/checkout@v4
     - uses: actions/setup-java@v4
diff --git a/.github/workflows/java-firestore-ci.yaml b/.github/workflows/java-firestore-ci.yaml
@@ -41,7 +41,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [11, 17, 21, 25]
+        java: [11, 17, 21, 25, 26]
     steps:
     - uses: actions/checkout@v4
     - uses: actions/setup-java@v4
diff --git a/.github/workflows/java-pubsub-ci.yaml b/.github/workflows/java-pubsub-ci.yaml
@@ -41,7 +41,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [11, 17, 21, 25]
+        java: [11, 17, 21, 25, 26]
     steps:
     - uses: actions/checkout@v4
     - uses: actions/setup-java@v4
diff --git a/.github/workflows/java-spanner-jdbc-ci.yaml b/.github/workflows/java-spanner-jdbc-ci.yaml
@@ -47,7 +47,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [11, 17, 21, 25]
+        java: [11, 17, 21, 25, 26]
     steps:
     - uses: actions/checkout@v4
     - uses: actions/setup-java@v4
diff --git a/.github/workflows/java-storage-nio-ci.yaml b/.github/workflows/java-storage-nio-ci.yaml
@@ -47,7 +47,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [11, 17, 21, 25]
+        java: [11, 17, 21, 25, 26]
     steps:
     - uses: actions/checkout@v4
     - uses: actions/setup-java@v4
diff --git a/.github/workflows/sdk-platform-java-ci.yaml b/.github/workflows/sdk-platform-java-ci.yaml
@@ -26,7 +26,7 @@ jobs:
     name: sdk-platform-java units
     strategy:
       matrix:
-        java: [ 11, 17, 21, 25 ]
+        java: [ 11, 17, 21, 25, 26 ]
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4
@@ -164,16 +164,21 @@ jobs:
         run: |
           bazelisk --batch test //sdk-platform-java/test/integration/... --test_output=errors
 
-  bazel-25:  
+  # JDK 24+ permanently disables Security Manager. Bazel's default test runner tries to install it.
+  # We must explicitly disable this behavior using shouldInstallTestSecurityManager=false.
+  bazel-no-security-manager-jdk24-plus:  
     needs: filter
     if: ${{ needs.filter.outputs.library == 'true' }}
     runs-on: ubuntu-22.04
-    name: sdk-platform-java integration (25)
+    name: sdk-platform-java integration (JDK 24+)
+    strategy:
+      matrix:
+        java: [ 25, 26 ]
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4
         with:
-          java-version: 25
+          java-version: ${{ matrix.java }}
           distribution: temurin
           cache: maven
       - run: bazelisk version
diff --git a/.github/workflows/sdk-platform-java-nightly.yaml b/.github/workflows/sdk-platform-java-nightly.yaml
@@ -11,8 +11,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ macos-15-intel, ubuntu-22.04, windows-2022 ]
-        java: [ 11, 17 ]
+        os: [ macos-15, ubuntu-24.04, windows-2025 ]
+        java: [ 11, 17, 21, 25, 26 ]
     runs-on: ${{ matrix.os }}
     steps:
       - run: git config --global core.longpaths true
@@ -44,7 +44,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ macos-15-intel, ubuntu-22.04, windows-2022 ]
+        os: [ macos-15, ubuntu-24.04, windows-2025 ]
     runs-on: ${{ matrix.os }}
     steps:
       - run: git config --global core.longpaths true
diff --git a/.github/workflows/showcase.yaml b/.github/workflows/showcase.yaml
@@ -101,7 +101,7 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        java: [ 11, 17, 21, 25 ]
+        java: [ 11, 17, 21, 25, 26 ]
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4
diff --git a/java-bigtable/google-cloud-bigtable/pom.xml b/java-bigtable/google-cloud-bigtable/pom.xml
@@ -441,6 +441,7 @@
                   <arg>-XDcompilePolicy=simple</arg>
                   <arg>--should-stop=ifError=FLOW</arg>
                   <arg>-Xplugin:ErrorProne -XepDisableWarningsInGeneratedCode -Xep:MissingSummary:OFF -Xep:InlineMeSuggester:OFF -Xep:AutoValueImmutableFields:OFF -Xep:ObjectEqualsForPrimitives:OFF -Xep:JavaDurationGetSecondsToToSeconds:OFF</arg>
+                  <arg>${errorprone.javac.args}</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.file=ALL-UNNAMED</arg>
@@ -457,7 +458,7 @@
                   <path>
                     <groupId>com.google.errorprone</groupId>
                     <artifactId>error_prone_core</artifactId>
-                    <version>${error-prone.version}</version>
+                    <version>${errorprone.version}</version>
                   </path>
                 </annotationProcessorPaths>
               </configuration>
diff --git a/java-bigtable/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/models/ClusterTest.java b/java-bigtable/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/models/ClusterTest.java
@@ -47,7 +47,7 @@ public void testFromProto() {
     assertThat(result.getState()).isEqualTo(Cluster.State.READY);
     assertThat(result.getServeNodes()).isEqualTo(30);
     assertThat(result.getStorageType()).isEqualTo(StorageType.SSD);
-    assertThat(result.getKmsKeyName()).isEqualTo(null);
+    assertThat(result.getKmsKeyName()).isNull();
   }
 
   @Test
diff --git a/java-bigtable/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/internal/api/ClientTest.java b/java-bigtable/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/internal/api/ClientTest.java
@@ -45,9 +45,9 @@
 import io.grpc.Server;
 import io.grpc.stub.StreamObserver;
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
@@ -257,8 +257,8 @@ public void testMaterializedViewRequestSent() throws Exception {
   }
 
   class FakeBigtableService extends BigtableGrpc.BigtableImplBase {
-    private final List<SessionRequest> openSessionRequests = new ArrayList<>();
-    private final List<SessionRequest> vrpcRequests = new ArrayList<>();
+    private final List<SessionRequest> openSessionRequests = new CopyOnWriteArrayList<>();
+    private final List<SessionRequest> vrpcRequests = new CopyOnWriteArrayList<>();
 
     @Override
     public void getClientConfiguration(
diff --git a/java-bigtable/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/internal/csm/attributes/EnvInfoTest.java b/java-bigtable/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/internal/csm/attributes/EnvInfoTest.java
@@ -23,7 +23,6 @@
 import com.google.cloud.opentelemetry.detection.GCPPlatformDetector.SupportedPlatform;
 import com.google.common.base.Function;
 import com.google.common.base.Supplier;
-import com.google.common.base.Suppliers;
 import com.google.common.collect.ImmutableMap;
 import java.util.Map;
 import org.junit.jupiter.api.Test;
@@ -33,7 +32,7 @@
 
 @ExtendWith(MockitoExtension.class)
 class EnvInfoTest {
-  private static final Supplier<String> NULL_HOST = Suppliers.ofInstance(null);
+  private static final Supplier<String> NULL_HOST = () -> null;
 
   @SuppressWarnings("UnnecessaryLambda")
   private static final Function<String, String> NULL_ENV = (ignored) -> null;
diff --git a/java-bigtable/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/internal/csm/opencensus/MetricsTracerTest.java b/java-bigtable/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/internal/csm/opencensus/MetricsTracerTest.java
@@ -218,7 +218,7 @@ public void testReadRowsOpCount() throws InterruptedException {
   }
 
   @Test
-  @SuppressWarnings("FutureReturnValueIgnored")
+  @SuppressWarnings({"FutureReturnValueIgnored", "NullArgumentForNonNullParameter"})
   public void testReadRowsFirstRow() throws InterruptedException {
     final long beforeSleep = 50;
     final long afterSleep = 50;
diff --git a/java-bigtable/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/internal/test_helpers/VRpcResultSubject.java b/java-bigtable/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/internal/test_helpers/VRpcResultSubject.java
@@ -23,7 +23,6 @@
 import com.google.common.truth.Subject;
 import com.google.rpc.RetryInfo;
 import java.time.Duration;
-import java.util.Optional;
 import javax.annotation.Nullable;
 
 public final class VRpcResultSubject extends Subject {
@@ -47,12 +46,14 @@ public void hasRetryInfo() {
   }
 
   public ComparableSubject<Duration> retryInfoDelay() {
-    return check("retryInfo.delay")
-        .that(
-            Optional.ofNullable(actual.getRetryInfo())
-                .map(RetryInfo::getRetryDelay)
-                .map(d -> Duration.ofSeconds(d.getSeconds()).plus(Duration.ofNanos(d.getNanos())))
-                .orElse(null));
+    RetryInfo retryInfo = actual.getRetryInfo();
+    Duration delay = null;
+    if (retryInfo != null) {
+      delay =
+          Duration.ofSeconds(retryInfo.getRetryDelay().getSeconds())
+              .plus(Duration.ofNanos(retryInfo.getRetryDelay().getNanos()));
+    }
+    return check("retryInfo.delay").that(delay);
   }
 
   public ComparableSubject<Duration> backendLatency() {
diff --git a/java-bigtable/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStubCloseTest.java b/java-bigtable/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStubCloseTest.java
@@ -81,6 +81,7 @@ public void tearDown() throws Exception {
   }
 
   @Test
+  @SuppressWarnings("NullArgumentForNonNullParameter")
   public void outstandingRequestsFinishAfterClose() throws Exception {
     ApiFuture<List<Row>> resultFuture =
         stub.readRowsCallable().all().futureCall(Query.create(TableId.of("table1")));
@@ -99,6 +100,7 @@ public void outstandingRequestsFinishAfterClose() throws Exception {
 
   class FakeBigtable extends BigtableGrpc.BigtableImplBase {
     @Override
+    @SuppressWarnings("NullArgumentForNonNullParameter")
     public void readRows(
         ReadRowsRequest request, StreamObserver<ReadRowsResponse> responseObserver) {
 
diff --git a/java-bigtable/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStubTest.java b/java-bigtable/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStubTest.java
@@ -371,6 +371,7 @@ public void testRMWRequestResponseConversion() throws ExecutionException, Interr
   }
 
   @Test
+  @SuppressWarnings("NullArgumentForNonNullParameter")
   public void testMutateRowRequestResponseConversion()
       throws ExecutionException, InterruptedException {
     RowMutation req = RowMutation.create(TableId.of("my-table"), "my-key").deleteRow();
@@ -385,10 +386,11 @@ public void testMutateRowRequestResponseConversion()
     MutateRowRequest protoReq = fakeDataService.mutateRowRequests.poll(1, TimeUnit.SECONDS);
     assertThat(protoReq)
         .isEqualTo(req.toProto(RequestContext.create(PROJECT_ID, INSTANCE_ID, APP_PROFILE_ID)));
-    assertThat(f.get()).isEqualTo(null);
+    assertThat(f.get()).isNull();
   }
 
   @Test
+  @SuppressWarnings("NullArgumentForNonNullParameter")
   public void testMutateRowRequestParams() throws ExecutionException, InterruptedException {
     RowMutation req = RowMutation.create(TABLE_ID, "my-key").deleteRow();
 
@@ -407,7 +409,7 @@ public void testMutateRowRequestParams() throws ExecutionException, InterruptedE
     // StatsHeadersUnaryCallable
     assertThat(reqMetadata.keys()).contains("bigtable-client-attempt-epoch-usec");
 
-    assertThat(f.get()).isEqualTo(null);
+    assertThat(f.get()).isNull();
   }
 
   @Test
diff --git a/java-bigtable/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/gaxx/reframing/ReframingResponseObserverTest.java b/java-bigtable/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/gaxx/reframing/ReframingResponseObserverTest.java
@@ -185,7 +185,7 @@ public void testManyToOne() throws InterruptedException {
     // First downstream request makes the upstream over produce
     outerObserver.getController().request(1);
     Truth.assertThat(outerObserver.popNextResponse()).isEqualTo("a");
-    Truth.assertThat(outerObserver.popNextResponse()).isEqualTo(null);
+    Truth.assertThat(outerObserver.popNextResponse()).isNull();
     Truth.assertThat(outerObserver.isDone()).isFalse();
 
     // Next downstream request should fetch from buffer
diff --git a/java-bigtable/pom.xml b/java-bigtable/pom.xml
@@ -144,9 +144,8 @@
         <github.global.server>github</github.global.server>
         <site.installationModule>google-cloud-bigtable-parent</site.installationModule>
         <project.javadoc.protobufBaseURL>https://googleapis.dev/java/google-api-grpc/latest</project.javadoc.protobufBaseURL>
-
-        <!-- Utility -->
-        <error-prone.version>2.38.0</error-prone.version>
+        <errorprone.version>2.48.0</errorprone.version>
+        <errorprone.javac.args>-g</errorprone.javac.args>
     </properties>
 
     <dependencyManagement>
@@ -347,6 +346,33 @@
         <skipTests>true</skipTests>
       </properties>
     </profile>
+    <profile>
+      <id>errorprone-jdk8</id>
+      <activation>
+        <jdk>[1.8,17)</jdk>
+      </activation>
+      <properties>
+        <errorprone.version>2.38.0</errorprone.version>
+      </properties>
+    </profile>
+    <profile>
+      <id>errorprone-jdk17</id>
+      <activation>
+        <jdk>[17,21)</jdk>
+      </activation>
+      <properties>
+        <errorprone.version>2.42.0</errorprone.version>
+      </properties>
+    </profile>
+    <profile>
+      <id>errorprone-jdk21</id>
+      <activation>
+        <jdk>21</jdk>
+      </activation>
+      <properties>
+        <errorprone.javac.args>-XDaddTypeAnnotationsToSymbol=true</errorprone.javac.args>
+      </properties>
+    </profile>
     </profiles>
 
     <modules>
diff --git a/java-datastore/datastore-v1-proto-client/pom.xml b/java-datastore/datastore-v1-proto-client/pom.xml
@@ -151,6 +151,7 @@
                 <arg>-XDcompilePolicy=simple</arg>
                 <arg>--should-stop=ifError=FLOW</arg>
                 <arg>-Xplugin:ErrorProne -XepExcludedPaths:.*/generated-sources/.*</arg>
+                <arg>${errorprone.javac.args}</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.file=ALL-UNNAMED</arg>
@@ -168,7 +169,7 @@
                 <path>
                   <groupId>com.google.errorprone</groupId>
                   <artifactId>error_prone_core</artifactId>
-                  <version>${error-prone.version}</version>
+                  <version>${errorprone.version}</version>
                 </path>
               </annotationProcessorPaths>
             </configuration>
diff --git a/java-datastore/google-cloud-datastore-utils/pom.xml b/java-datastore/google-cloud-datastore-utils/pom.xml
@@ -128,6 +128,7 @@
                                 <arg>-XDcompilePolicy=simple</arg>
                                 <arg>--should-stop=ifError=FLOW</arg>
                                 <arg>-Xplugin:ErrorProne -XepExcludedPaths:.*/generated-sources/.*</arg>
+                                <arg>${errorprone.javac.args}</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.file=ALL-UNNAMED</arg>
@@ -145,7 +146,7 @@
                                 <path>
                                     <groupId>com.google.errorprone</groupId>
                                     <artifactId>error_prone_core</artifactId>
-                                    <version>${error-prone.version}</version>
+                                    <version>${errorprone.version}</version>
                                 </path>
                             </annotationProcessorPaths>
                         </configuration>
diff --git a/java-datastore/google-cloud-datastore/pom.xml b/java-datastore/google-cloud-datastore/pom.xml
@@ -291,6 +291,7 @@
                 <arg>-XDcompilePolicy=simple</arg>
                 <arg>--should-stop=ifError=FLOW</arg>
                 <arg>-Xplugin:ErrorProne -XepExcludedPaths:.*/generated-sources/.*</arg>
+                <arg>${errorprone.javac.args}</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.file=ALL-UNNAMED</arg>
@@ -308,7 +309,7 @@
                 <path>
                   <groupId>com.google.errorprone</groupId>
                   <artifactId>error_prone_core</artifactId>
-                  <version>${error-prone.version}</version>
+                  <version>${errorprone.version}</version>
                 </path>
               </annotationProcessorPaths>
             </configuration>
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreHelper.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreHelper.java
diff --git a/java-datastore/pom.xml b/java-datastore/pom.xml
