Skip to content

Commit e08c7ba

Browse files
authored
fix: Define version of error_prone_annotations in parent POM (#3785)
This change explicitly defines the version of the `error_prone_annotations` dependency in the `log4j` parent POM. Previously, the version was inherited via the `error-prone.version` property from `logging-parent`. However, because the `log4j-bom` POM is flattened during publication, this property no longer resolves in consumer projects. Fixes #3779
1 parent 52ca6a3 commit e08c7ba

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

log4j-parent/pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@
8080
<conversant.disruptor.version>1.2.15</conversant.disruptor.version>
8181
<disruptor.version>3.4.4</disruptor.version>
8282
<embedded-ldap.version>0.9.0</embedded-ldap.version>
83+
<error-prone-annotations.version>2.38.0</error-prone-annotations.version>
8384
<felix.version>7.0.5</felix.version>
8485
<groovy.version>4.0.27</groovy.version>
8586
<guava.version>33.4.8-jre</guava.version>
@@ -1109,7 +1110,7 @@
11091110
<dependency>
11101111
<groupId>com.google.errorprone</groupId>
11111112
<artifactId>error_prone_annotations</artifactId>
1112-
<version>${error-prone.version}</version>
1113+
<version>${error-prone-annotations.version}</version>
11131114
</dependency>
11141115
<dependency>
11151116
<groupId>org.osgi</groupId>

src/changelog/.2.x.x/3758_fix_jspecify_dep.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
https://logging.apache.org/xml/ns/log4j-changelog-0.xsd"
77
type="fixed">
88
<issue id="3758" link="https://github.com/apache/logging-log4j2/issues/3758"/>
9+
<issue id="3779" link="https://github.com/apache/logging-log4j2/issues/3779"/>
910
<description format="asciidoc">
10-
Move `jspecify.version` Maven property and `java8-tests` profile from `log4j-bom` to `log4j-parent`, since the former gets trimmed before deployment.
11+
Fix version resolution of `jspecify` and `error_prone_annotations` dependencies in published POM files.
1112
</description>
1213
</entry>

0 commit comments

Comments
 (0)