You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by ra...@apache.org on 2026/09/11 08:56:11 UTC
(ranger) 21/34: Backport to ranger-2.10: restore 2.10 docker .env after Wave 2 conflicts

This is an automated email from the ASF dual-hosted git repository.

ramackri pushed a commit to branch backport-audit-spiffe-2.10
in repository https://gitbox.apache.org/repos/asf/ranger.git

commit eba414ae6ebddf035941731262cbc3badcf79dfe
Author: ramk <ra...@cloudera.com>
AuthorDate: Fri Sep 11 13:29:17 2026 +0530

    Backport to ranger-2.10: restore 2.10 docker .env after Wave 2 conflicts
    
    Wave 2 cherry-picks used --theirs on .env and polluted master/JDK17
    settings. Restore ranger-2.10 branch, JDK8 base images, and 2.10.0-SNAPSHOT
    versions; keep OPENSEARCH_VERSION for audit stack. Fix plugin-ozone parent pom.
---
 dev-support/ranger-docker/.env | 109 ++++++++++++++++-------------------------
 plugin-ozone/pom.xml           |   2 +-
 2 files changed, 43 insertions(+), 68 deletions(-)

diff --git a/dev-support/ranger-docker/.env b/dev-support/ranger-docker/.env
index be842585a..c151e7021 100644
--- a/dev-support/ranger-docker/.env
+++ b/dev-support/ranger-docker/.env
@@ -1,64 +1,34 @@
 BUILD_HOST_SRC=true
 SKIPTESTS=true
 GIT_URL=https://github.com/apache/ranger.git
-BRANCH=master
+BRANCH=ranger-2.10
 PROFILE=
 BUILD_OPTS=
 
-# Java Opts Configuration in JDK17
-JAVA_OPTS=--add-opens=java.base/java.nio=ALL-UNNAMED --add-exports=java.base/sun.net.dns=ALL-UNNAMED --add-exports=java.base/sun.net.util=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-exports=java.base/java.util.logging=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED
-
 # DockerHub Ranger Base Image
 RANGER_BASE_IMAGE=apache/ranger-base
 # Java version used to run Ranger and dependent services is present as suffix: -8, valid values for suffix: -8, -11, -17
-RANGER_BASE_VERSION=20260123-2-17
+RANGER_BASE_VERSION=20260123-2-8
 # Java version used to build Apache Ranger is present as suffix: -8, valid values for suffix: -8, -11, -17
-RANGER_BASE_BUILD_VERSION=20260123-2-17
-RANGER_VERSION=3.0.0-SNAPSHOT
-
-# Hadoop Configuration
-HADOOP_VERSION=3.4.2
-HDFS_PLUGIN_VERSION=3.0.0-SNAPSHOT
-YARN_PLUGIN_VERSION=3.0.0-SNAPSHOT
-
-# Hive Configuration
-HIVE_HADOOP_VERSION=3.4.2
-HIVE_VERSION=4.0.1
-HIVE_PLUGIN_VERSION=3.0.0-SNAPSHOT
+RANGER_BASE_BUILD_VERSION=20260123-2-8
 
-# Tez Configuration
-TEZ_VERSION=0.10.4
+# third party image versions
+MARIADB_VERSION=10.7.3
+POSTGRES_VERSION=13.16
+ORACLE_VERSION=23.6
+SQLSERVER_VERSION=2022-latest
+ENABLE_DB_MOUNT=true
+ZK_VERSION=3.9.2
+SOLR_VERSION=8.11.3
 
-# HBase Configuration
+# service versions
+HADOOP_VERSION=3.4.2
 HBASE_VERSION=2.6.0
-HBASE_PLUGIN_VERSION=3.0.0-SNAPSHOT
-
-# Kafka Configuration
+HIVE_VERSION=3.1.3
+HIVE_HADOOP_VERSION=3.4.2
 KAFKA_VERSION=3.9.1
-KAFKA_PLUGIN_VERSION=3.0.0-SNAPSHOT
-
-# Knox Configuration
-KNOX_VERSION=2.1.0
-KNOX_PLUGIN_VERSION=3.0.0-SNAPSHOT
-
-# KMS Configuration
-KMS_VERSION=3.0.0-SNAPSHOT
-
-# Usersync Configuration
-USERSYNC_VERSION=3.0.0-SNAPSHOT
-
-# Tagsync Configuration
-TAGSYNC_VERSION=3.0.0-SNAPSHOT
-
-# PDP Configuration
-PDP_VERSION=3.0.0-SNAPSHOT
-
-# Solr Configuration
-SOLR_VERSION=9.4.1
-SOLR_PLUGIN_VERSION=3.0.0-SNAPSHOT
-
-# Zookeeper Configuration
-ZK_VERSION=3.9.2
+KNOX_VERSION=2.0.0
+TRINO_VERSION=latest
 
 # Kerberos
 KERBEROS_ENABLED=true
@@ -68,28 +38,33 @@ KERBEROS_MASTER_PASSWORD=rangerR0cks!
 KERBEROS_ADMIN_PRINCIPAL=admin/admin
 KERBEROS_ADMIN_PASSWORD=rangerR0cks!
 
-# Database Versions
-POSTGRES_VERSION=13.16
-MARIADB_VERSION=10.7.3
-ORACLE_VERSION=23.6
-SQLSERVER_VERSION=2022-latest
-
-# Ozone Configuration
-OZONE_VERSION=1.4.0
-OZONE_PLUGIN_VERSION=3.0.0-SNAPSHOT
+# Ozone 2.0+ requires jdk21 runner (jdk11/jdk17 tags are for Ozone 1.x). Multi-arch arm64+amd64.
+OZONE_VERSION=2.1.1
 OZONE_RUNNER_IMAGE=apache/ozone-runner
-# JDK 17 runner for Ranger 3.0 / Ozone 1.4; 20241108-jdk17-1 has arm64+amd64 (20241022-jdk17-1 is amd64-only).
-OZONE_RUNNER_VERSION=20241108-jdk17-1
-
-# Trino Configuration
-TRINO_VERSION=latest
-
-# Open Search
-OPENSEARCH_VERSION=1.3.19
-
-# Debug Configuration
+OZONE_RUNNER_VERSION=20260106-1-jdk21
+
+# versions of ranger services
+RANGER_VERSION=2.10.0-SNAPSHOT
+KMS_VERSION=2.10.0-SNAPSHOT
+USERSYNC_VERSION=2.10.0-SNAPSHOT
+TAGSYNC_VERSION=2.10.0-SNAPSHOT
+PDP_VERSION=2.10.0-SNAPSHOT
+
+# plugin versions
+HDFS_PLUGIN_VERSION=2.10.0-SNAPSHOT
+YARN_PLUGIN_VERSION=2.10.0-SNAPSHOT
+HIVE_PLUGIN_VERSION=2.10.0-SNAPSHOT
+HBASE_PLUGIN_VERSION=2.10.0-SNAPSHOT
+KAFKA_PLUGIN_VERSION=2.10.0-SNAPSHOT
+KNOX_PLUGIN_VERSION=2.10.0-SNAPSHOT
+OZONE_PLUGIN_VERSION=2.10.0-SNAPSHOT
+SOLR_PLUGIN_VERSION=2.10.0-SNAPSHOT
+
+# To enable debug logs
 DEBUG_ADMIN=false
 DEBUG_USERSYNC=false
 DEBUG_TAGSYNC=false
 DEBUG_PDP=false
-ENABLE_FILE_SYNC_SOURCE=false
+
+# Open Search
+OPENSEARCH_VERSION=1.3.19
diff --git a/plugin-ozone/pom.xml b/plugin-ozone/pom.xml
index dba7e4e5c..02488cf8a 100644
--- a/plugin-ozone/pom.xml
+++ b/plugin-ozone/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
     <parent>
         <groupId>org.apache.ranger</groupId>
         <artifactId>ranger</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>2.10.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
     <artifactId>ranger-ozone-plugin</artifactId>