jlengrand/error-prone-support
1
0
Fork 0
mirror of https://github.com/jlengrand/error-prone-support.git synced 2026-03-10 08:11:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make integration tests Error Prone 2.36.0-compatible (#1455)

Browse Source
This commit is contained in:
Stephan Schroevers
2024-12-12 09:12:23 +01:00
committed by GitHub
parent 23cb29b6fc
commit 2b3e11bd24
2 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
integration-tests/checkstyle-init.patch
View File

@@ -13,7 +13,12 @@
<dependency> <dependency>
<groupId>nl.jqno.equalsverifier</groupId> <groupId>nl.jqno.equalsverifier</groupId>
<artifactId>equalsverifier</artifactId> <artifactId>equalsverifier</artifactId>
@@ -2420,6 +2426,8 @@ @@ -2417,9 +2423,13 @@
<compilerArgs>
<arg>-Xpkginfo:always</arg>
<arg>-XDcompilePolicy=simple</arg>
+ <!-- XXX: Drop this flag once the project uses Error Prone 2.36.0+ by default. -->
+ <arg>--should-stop=ifError=FLOW</arg>
<arg> <arg>
-Xplugin:ErrorProne ${error-prone.configuration-args} -Xplugin:ErrorProne ${error-prone.configuration-args}
</arg> </arg>
@@ -22,7 +27,7 @@
</compilerArgs> </compilerArgs>
<annotationProcessorPaths> <annotationProcessorPaths>
<path> <path>
@@ -2432,6 +2440,11 @@ @@ -2432,6 +2442,11 @@
<artifactId>error-prone-contrib</artifactId> <artifactId>error-prone-contrib</artifactId>
<version>${error-prone-support.version}</version> <version>${error-prone-support.version}</version>
</path> </path>
@@ -34,8 +39,12 @@
</annotationProcessorPaths> </annotationProcessorPaths>
</configuration> </configuration>
</execution> </execution>
@@ -2474,9 +2487,10 @@ @@ -2472,11 +2487,14 @@
<compilerArgs>
<arg>-Xpkginfo:always</arg>
<arg>-XDcompilePolicy=simple</arg> <arg>-XDcompilePolicy=simple</arg>
+ <!-- XXX: Drop this flag once the project uses Error Prone 2.36.0+ by default. -->
+ <arg>--should-stop=ifError=FLOW</arg>
<arg> <arg>
-Xplugin:ErrorProne \ -Xplugin:ErrorProne \
- -XepExcludedPaths:.*[\\/]resources[\\/].* \ - -XepExcludedPaths:.*[\\/]resources[\\/].* \
@@ -46,7 +55,7 @@
</compilerArgs> </compilerArgs>
<annotationProcessorPaths> <annotationProcessorPaths>
<path> <path>
@@ -2489,6 +2503,11 @@ @@ -2489,6 +2507,11 @@
<artifactId>error-prone-contrib</artifactId> <artifactId>error-prone-contrib</artifactId>
<version>${error-prone-support.version}</version> <version>${error-prone-support.version}</version>
</path> </path>

8
integration-tests/metrics-init.patch
View File

@@ -52,16 +52,18 @@
<profiles> <profiles>
<profile> <profile>
<id>jdk8</id> <id>jdk8</id>
@@ -218,7 +239,7 @@ @@ -218,7 +239,9 @@
<compilerArgs> <compilerArgs>
<arg>-Xlint:all</arg> <arg>-Xlint:all</arg>
<arg>-XDcompilePolicy=simple</arg> <arg>-XDcompilePolicy=simple</arg>
- <arg>-Xplugin:ErrorProne -XepExcludedPaths:.*/target/generated-sources/.*</arg> - <arg>-Xplugin:ErrorProne -XepExcludedPaths:.*/target/generated-sources/.*</arg>
+ <!-- XXX: Drop this flag once the project uses Error Prone 2.36.0+ by default. -->
+ <arg>--should-stop=ifError=FLOW</arg>
+ <arg>-Xplugin:ErrorProne ${error-prone.configuration-args}</arg> + <arg>-Xplugin:ErrorProne ${error-prone.configuration-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.api=ALL-UNNAMED</arg>
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED</arg> <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED</arg>
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED</arg> <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED</arg>
@@ -229,12 +250,24 @@ @@ -229,12 +252,24 @@
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED</arg> <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED</arg>
<arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED</arg> <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED</arg>
<arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED</arg> <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED</arg>
@@ -87,7 +89,7 @@
</path> </path>
</annotationProcessorPaths> </annotationProcessorPaths>
</configuration> </configuration>
@@ -364,7 +397,7 @@ @@ -364,7 +399,7 @@
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<configuration> <configuration>