Skip to content

Commit 145c15a

Browse files
Ubuntuclaude
andcommitted
Restore original errorprone-jdk25 profile structure
The previous fix incorrectly split the errorprone-jdk25 profile into errorprone-jdk21 ([21,)) and errorprone-jdk25 ([25,)). Error Prone 2.48.0 requires JDK 25+ (not just 21+), causing compilation failures on JDK 21. Restore the single errorprone-jdk25 profile with [25,) activation that includes Error Prone 2.48.0, NullAway 0.13.1, and --should-stop=ifError=FLOW, matching the original main branch structure. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent e46f020 commit 145c15a

1 file changed

Lines changed: 5 additions & 21 deletions

File tree

pom.xml

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -483,16 +483,19 @@
483483

484484
<profiles>
485485
<profile>
486-
<id>errorprone-jdk21</id>
486+
<id>errorprone-jdk25</id>
487487
<activation>
488-
<jdk>[21,)</jdk>
488+
<jdk>[25,)</jdk>
489489
</activation>
490490
<build>
491491
<plugins>
492492
<plugin>
493493
<groupId>org.apache.maven.plugins</groupId>
494494
<artifactId>maven-compiler-plugin</artifactId>
495495
<configuration>
496+
<compilerArgs combine.children="append">
497+
<arg>--should-stop=ifError=FLOW</arg>
498+
</compilerArgs>
496499
<annotationProcessorPaths combine.self="override">
497500
<path>
498501
<groupId>com.google.errorprone</groupId>
@@ -510,24 +513,5 @@
510513
</plugins>
511514
</build>
512515
</profile>
513-
<profile>
514-
<id>errorprone-jdk25</id>
515-
<activation>
516-
<jdk>[25,)</jdk>
517-
</activation>
518-
<build>
519-
<plugins>
520-
<plugin>
521-
<groupId>org.apache.maven.plugins</groupId>
522-
<artifactId>maven-compiler-plugin</artifactId>
523-
<configuration>
524-
<compilerArgs combine.children="append">
525-
<arg>--should-stop=ifError=FLOW</arg>
526-
</compilerArgs>
527-
</configuration>
528-
</plugin>
529-
</plugins>
530-
</build>
531-
</profile>
532516
</profiles>
533517
</project>

0 commit comments

Comments
 (0)