From c365272ef8173e670a667bddfc112e3bdb7015f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Volkan=20Yaz=C4=B1c=C4=B1?= <volkan@yazi.ci>
Date: Mon, 1 Sep 2025 09:52:14 +0200
Subject: [PATCH 1/2] Fix the missing Error Prone version

---
 log4j-parent/pom.xml                              |  2 +-
 src/changelog/.2.x.x/3758_fix_error_prone_dep.xml | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 src/changelog/.2.x.x/3758_fix_error_prone_dep.xml

diff --git a/log4j-parent/pom.xml b/log4j-parent/pom.xml
index 6343e8e79b3..22802a52068 100644
--- a/log4j-parent/pom.xml
+++ b/log4j-parent/pom.xml
@@ -859,7 +859,7 @@
     <dependency>
       <groupId>com.google.errorprone</groupId>
       <artifactId>error_prone_annotations</artifactId>
-      <version>${error-prone.version}</version>
+      <version>${error-prone-annotations.version}</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/src/changelog/.2.x.x/3758_fix_error_prone_dep.xml b/src/changelog/.2.x.x/3758_fix_error_prone_dep.xml
new file mode 100644
index 00000000000..917f131abde
--- /dev/null
+++ b/src/changelog/.2.x.x/3758_fix_error_prone_dep.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entry xmlns="https://logging.apache.org/xml/ns"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="
+           https://logging.apache.org/xml/ns
+           https://logging.apache.org/xml/ns/log4j-changelog-0.xsd"
+       type="fixed">
+  <issue id="3758" link="https://github.com/apache/logging-log4j2/issues/3758"/>
+  <issue id="3779" link="https://github.com/apache/logging-log4j2/issues/3779"/>
+  <description format="asciidoc">
+    Fix the `com.google.errorprone:error_prone_annotations` dependency whose version property gets orphan due to flattening.
+  </description>
+</entry>

From 3ec55167e267cc900d19c5c2fc8f263d8804e75b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Volkan=20Yaz=C4=B1c=C4=B1?= <volkan@yazi.ci>
Date: Mon, 1 Sep 2025 10:05:53 +0200
Subject: [PATCH 2/2] Fix changelog entry

---
 ..._fix_error_prone_dep.xml => 3905_fix_error_prone_dep.xml} | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
 rename src/changelog/.2.x.x/{3758_fix_error_prone_dep.xml => 3905_fix_error_prone_dep.xml} (70%)

diff --git a/src/changelog/.2.x.x/3758_fix_error_prone_dep.xml b/src/changelog/.2.x.x/3905_fix_error_prone_dep.xml
similarity index 70%
rename from src/changelog/.2.x.x/3758_fix_error_prone_dep.xml
rename to src/changelog/.2.x.x/3905_fix_error_prone_dep.xml
index 917f131abde..2667e0f4245 100644
--- a/src/changelog/.2.x.x/3758_fix_error_prone_dep.xml
+++ b/src/changelog/.2.x.x/3905_fix_error_prone_dep.xml
@@ -5,9 +5,10 @@
            https://logging.apache.org/xml/ns
            https://logging.apache.org/xml/ns/log4j-changelog-0.xsd"
        type="fixed">
-  <issue id="3758" link="https://github.com/apache/logging-log4j2/issues/3758"/>
   <issue id="3779" link="https://github.com/apache/logging-log4j2/issues/3779"/>
+  <issue id="3785" link="https://github.com/apache/logging-log4j2/pull/3785"/>
+  <issue id="3905" link="https://github.com/apache/logging-log4j2/pull/3905"/>
   <description format="asciidoc">
-    Fix the `com.google.errorprone:error_prone_annotations` dependency whose version property gets orphan due to flattening.
+    Fix the `com.google.errorprone:error_prone_annotations` dependency whose version property gets erased due to flattening
   </description>
 </entry>