Skip to content

Commit 3d372b9

Browse files
committed
Fix JDK 11 build compatibility for dependency bumps
Revert JDK-incompatible major version bumps that break the JDK 11 compile-and-check CI job: - error_prone_core: keep 2.31.0 default, use 2.48.0 in JDK 21+ profile - nullaway: keep 0.12.6 default, use 0.13.1 in JDK 21+ profile - junit-bom: revert 6.0.3 to 5.13.0 (JUnit 6 requires JDK 17+) - tomcat-embed-core: revert 11.0.18 to 10.1.50 (Tomcat 11 requires JDK 17+) Restructure Maven profiles so errorprone-jdk21 activates on [21,) for newer Error Prone/NullAway and errorprone-jdk25 only adds the --should-stop=ifError=FLOW flag. Configure dependabot to ignore major version bumps on these four dependencies to prevent future incompatible upgrades.
1 parent 201889a commit 3d372b9

File tree

3 files changed

+34
-9
lines changed

3 files changed

+34
-9
lines changed

.github/dependabot.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,15 @@ updates:
88
dependencies:
99
patterns:
1010
- "*"
11+
ignore:
12+
- dependency-name: "com.google.errorprone:error_prone_core"
13+
update-types: ["version-update:semver-major"]
14+
- dependency-name: "com.uber.nullaway:nullaway"
15+
update-types: ["version-update:semver-major"]
16+
- dependency-name: "org.junit:junit-bom"
17+
update-types: ["version-update:semver-major"]
18+
- dependency-name: "org.apache.tomcat.embed:tomcat-embed-core"
19+
update-types: ["version-update:semver-major"]
1120

1221
- package-ecosystem: "github-actions"
1322
directory: "/"

client/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<javaModuleName>org.asynchttpclient.client</javaModuleName>
3232

3333
<jetty.version>11.0.26</jetty.version>
34-
<tomcat.version>11.0.18</tomcat.version>
34+
<tomcat.version>10.1.50</tomcat.version>
3535
<commons-io.version>2.21.0</commons-io.version>
3636
<mockito.version>5.23.0</mockito.version>
3737
<hamcrest.version>3.0</hamcrest.version>

pom.xml

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
<dependency>
103103
<groupId>org.junit</groupId>
104104
<artifactId>junit-bom</artifactId>
105-
<version>6.0.3</version>
105+
<version>5.13.0</version>
106106
<type>pom</type>
107107
<scope>import</scope>
108108
</dependency>
@@ -325,12 +325,12 @@
325325
<path>
326326
<groupId>com.google.errorprone</groupId>
327327
<artifactId>error_prone_core</artifactId>
328-
<version>2.48.0</version>
328+
<version>2.31.0</version>
329329
</path>
330330
<path>
331331
<groupId>com.uber.nullaway</groupId>
332332
<artifactId>nullaway</artifactId>
333-
<version>0.13.1</version>
333+
<version>0.12.6</version>
334334
</path>
335335
<!-- Other annotation processors go here -->
336336
</annotationProcessorPaths>
@@ -483,19 +483,16 @@
483483

484484
<profiles>
485485
<profile>
486-
<id>errorprone-jdk25</id>
486+
<id>errorprone-jdk21</id>
487487
<activation>
488-
<jdk>[25,)</jdk>
488+
<jdk>[21,)</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>
499496
<annotationProcessorPaths combine.self="override">
500497
<path>
501498
<groupId>com.google.errorprone</groupId>
@@ -513,5 +510,24 @@
513510
</plugins>
514511
</build>
515512
</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>
516532
</profiles>
517533
</project>

0 commit comments

Comments
 (0)