From fd980b8b2d0ea7453cec114b32dc9578dff4305c Mon Sep 17 00:00:00 2001
From: Abhishek Kumar <abhi@apache.org>
Date: Mon, 5 Jan 2026 19:46:39 -0800
Subject: [PATCH 1/2] RANGER-5248: Add log4j audit destination for Ozone in
 docker

---
 distro/src/main/assembly/plugin-ozone.xml | 1 +
 plugin-ozone/pom.xml                      | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/distro/src/main/assembly/plugin-ozone.xml b/distro/src/main/assembly/plugin-ozone.xml
index 4c9456afb6..7b2541447d 100644
--- a/distro/src/main/assembly/plugin-ozone.xml
+++ b/distro/src/main/assembly/plugin-ozone.xml
@@ -78,6 +78,7 @@
             <includes>
                 <include>org.apache.ranger:ranger-audit-core</include>
                 <include>org.apache.ranger:ranger-audit-dest-hdfs</include>
+                <include>org.apache.ranger:ranger-audit-dest-log4j</include>
                 <include>org.apache.ranger:ranger-audit-dest-solr</include>
                 <include>org.apache.ranger:ranger-authz-api</include>
                 <include>org.apache.ranger:ranger-plugins-cred</include>
diff --git a/plugin-ozone/pom.xml b/plugin-ozone/pom.xml
index d119745218..5dca7d0329 100644
--- a/plugin-ozone/pom.xml
+++ b/plugin-ozone/pom.xml
@@ -118,6 +118,12 @@ limitations under the License.
             <artifactId>ranger-audit-dest-hdfs</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <!-- Add Log4J destination for Ozone in docker deployment -->
+        <dependency>
+            <groupId>org.apache.ranger</groupId>
+            <artifactId>ranger-audit-dest-log4j</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.ranger</groupId>
             <artifactId>ranger-audit-dest-solr</artifactId>

From 9570b2c74a02c2e52ae3e7d88554f2604d43b10f Mon Sep 17 00:00:00 2001
From: Abhishek Kumar <abhi@apache.org>
Date: Wed, 7 Jan 2026 15:25:18 -0800
Subject: [PATCH 2/2] Cherry-pick RANGER-5261

---
 .github/workflows/ci.yml                                    | 1 +
 .../scripts/ozone/ranger-ozone-plugin-install.properties    | 4 ++--
 distro/src/main/assembly/plugin-ozone.xml                   | 1 -
 plugin-ozone/pom.xml                                        | 6 ------
 4 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c222d56c2f..c2777f49b9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -207,6 +207,7 @@ jobs:
       - name: Run download-archives.sh
         run: |
           cd dev-support/ranger-docker
+          rm -rf downloads/ozone-*
           ./download-archives.sh hadoop hive hbase kafka knox ozone
 
       - name: Build all ranger-plugin images
diff --git a/dev-support/ranger-docker/scripts/ozone/ranger-ozone-plugin-install.properties b/dev-support/ranger-docker/scripts/ozone/ranger-ozone-plugin-install.properties
index 4fc7b9991c..99c31d2a36 100644
--- a/dev-support/ranger-docker/scripts/ozone/ranger-ozone-plugin-install.properties
+++ b/dev-support/ranger-docker/scripts/ozone/ranger-ozone-plugin-install.properties
@@ -74,11 +74,11 @@ XAAUDIT.HDFS.AZURE_ACCOUNTKEY=__REPLACE_AZURE_ACCOUNT_KEY
 XAAUDIT.HDFS.AZURE_SHELL_KEY_PROVIDER=__REPLACE_AZURE_SHELL_KEY_PROVIDER
 XAAUDIT.HDFS.AZURE_ACCOUNTKEY_PROVIDER=__REPLACE_AZURE_ACCOUNT_KEY_PROVIDER
 
-XAAUDIT.LOG4J.ENABLE=true
+XAAUDIT.LOG4J.ENABLE=false
 XAAUDIT.LOG4J.IS_ASYNC=false
 XAAUDIT.LOG4J.ASYNC.MAX.QUEUE.SIZE=10240
 XAAUDIT.LOG4J.ASYNC.MAX.FLUSH.INTERVAL.MS=30000
-XAAUDIT.LOG4J.DESTINATION.LOG4J=true
+XAAUDIT.LOG4J.DESTINATION.LOG4J=false
 XAAUDIT.LOG4J.DESTINATION.LOG4J.LOGGER=xaaudit
 
 XAAUDIT.AMAZON_CLOUDWATCH.ENABLE=false
diff --git a/distro/src/main/assembly/plugin-ozone.xml b/distro/src/main/assembly/plugin-ozone.xml
index 7b2541447d..4c9456afb6 100644
--- a/distro/src/main/assembly/plugin-ozone.xml
+++ b/distro/src/main/assembly/plugin-ozone.xml
@@ -78,7 +78,6 @@
             <includes>
                 <include>org.apache.ranger:ranger-audit-core</include>
                 <include>org.apache.ranger:ranger-audit-dest-hdfs</include>
-                <include>org.apache.ranger:ranger-audit-dest-log4j</include>
                 <include>org.apache.ranger:ranger-audit-dest-solr</include>
                 <include>org.apache.ranger:ranger-authz-api</include>
                 <include>org.apache.ranger:ranger-plugins-cred</include>
diff --git a/plugin-ozone/pom.xml b/plugin-ozone/pom.xml
index 5dca7d0329..d119745218 100644
--- a/plugin-ozone/pom.xml
+++ b/plugin-ozone/pom.xml
@@ -118,12 +118,6 @@ limitations under the License.
             <artifactId>ranger-audit-dest-hdfs</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <!-- Add Log4J destination for Ozone in docker deployment -->
-        <dependency>
-            <groupId>org.apache.ranger</groupId>
-            <artifactId>ranger-audit-dest-log4j</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.ranger</groupId>
             <artifactId>ranger-audit-dest-solr</artifactId>