HDDS-14381. Bump Ranger to 2.7.0

hadoop-ozone/dist/src/main/compose/ozonesecure-ha/.env

@@ -24,7 +24,7 @@ OZONE_VOLUME=./data
 OZONE_OPTS=
 RANGER_DB_IMAGE=postgres
 RANGER_DB_IMAGE_VERSION=12
-RANGER_IMAGE=ghcr.io/adoroszlai/ranger-admin
-RANGER_IMAGE_VERSION=0ae34250d3af672776fca6a53047699adf3afce5-${ranger.version}-8
+RANGER_IMAGE=apache/ranger
+RANGER_IMAGE_VERSION=${ranger.version}
 RANGER_VERSION=${ranger.version}
 WAITFOR_TIMEOUT=3000

hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test-ranger.sh

@@ -20,7 +20,10 @@
 COMPOSE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 export COMPOSE_DIR
 
-: "${RANGER_VERSION:=2.6.0}"
+if [[ -z "${RANGER_VERSION:-}" ]]; then
+  source "${COMPOSE_DIR}/.env"
+fi
+
 : "${DOWNLOAD_DIR:=${TEMP_DIR:-/tmp}}"
 
 # shellcheck source=/dev/null
@@ -53,6 +56,8 @@ perl -wpl -i \
   -e 's@^POLICY_MGR_URL=.*@POLICY_MGR_URL=http://ranger:6080@;' \
   -e 's@^REPOSITORY_NAME=.*@REPOSITORY_NAME=dev_ozone@;' \
   -e 's@^CUSTOM_USER=ozone@CUSTOM_USER=hadoop@;' \
+  -e 's@^[email protected]=false@;' \
+  -e 's@^XAAUDIT.LOG4J.DESTINATION.LOG4J=true@XAAUDIT.LOG4J.DESTINATION.LOG4J=false@;' \
   "${RANGER_OZONE_PLUGIN_DIR}/install.properties"
 
 echo 'machine ranger login admin password rangerR0cks!' > ../../.netrc

hadoop-ozone/dist/src/main/license/bin/LICENSE.txt

@@ -265,7 +265,6 @@ Apache License 2.0
    ch.qos.reload4j:reload4j
    com.amazonaws:aws-java-sdk-core
    com.amazonaws:aws-java-sdk-kms
-   com.amazonaws:aws-java-sdk-logs
    com.amazonaws:aws-java-sdk-s3
    com.amazonaws:jmespath-java
    com.carrotsearch:hppc
@@ -383,10 +382,7 @@ Apache License 2.0
    org.apache.hadoop:hadoop-hdfs-client
    org.apache.hadoop:hadoop-shaded-guava
    org.apache.hadoop:hadoop-shaded-protobuf_3_25
-   org.apache.httpcomponents:httpasyncclient
    org.apache.httpcomponents:httpcore
-   org.apache.httpcomponents:httpcore-nio
-   org.apache.httpcomponents:httpmime
    org.apache.kerby:kerb-admin
    org.apache.kerby:kerb-client
    org.apache.kerby:kerb-common
@@ -404,11 +400,9 @@ Apache License 2.0
    org.apache.kerby:token-provider
    org.apache.logging.log4j:log4j-api
    org.apache.logging.log4j:log4j-core
-   org.apache.orc:orc-core
-   org.apache.orc:orc-shims
+   org.apache.ranger:ranger-audit-core
    org.apache.ranger:ranger-intg
    org.apache.ranger:ranger-plugin-classloader
-   org.apache.ranger:ranger-plugin-audit
    org.apache.ranger:ranger-plugin-common
    org.apache.ranger:ranger-plugin-cred
    org.apache.ratis:ratis-client
@@ -424,7 +418,6 @@ Apache License 2.0
    org.apache.ratis:ratis-tools
    org.apache.zookeeper:zookeeper
    org.apache.zookeeper:zookeeper-jute
-   org.eclipse.jetty:jetty-client
    org.eclipse.jetty:jetty-http
    org.eclipse.jetty:jetty-io
    org.eclipse.jetty:jetty-security

hadoop-ozone/dist/src/main/license/jar-report.txt

@@ -13,7 +13,6 @@ share/ozone/lib/asm-util.jar
 share/ozone/lib/aspectjrt.jar
 share/ozone/lib/aws-java-sdk-core.jar
 share/ozone/lib/aws-java-sdk-kms.jar
-share/ozone/lib/aws-java-sdk-logs.jar
 share/ozone/lib/aws-java-sdk-s3.jar
 share/ozone/lib/bcpkix-jdk18on.jar
 share/ozone/lib/bcprov-jdk18on.jar
@@ -83,11 +82,8 @@ share/ozone/lib/hk2-api.jar
 share/ozone/lib/hk2-locator.jar
 share/ozone/lib/hk2-utils.jar
 share/ozone/lib/hppc.jar
-share/ozone/lib/httpasyncclient.jar
 share/ozone/lib/httpclient.jar
 share/ozone/lib/httpcore.jar
-share/ozone/lib/httpcore-nio.jar
-share/ozone/lib/httpmime.jar
 share/ozone/lib/istack-commons-runtime.jar
 share/ozone/lib/j2objc-annotations.jar
 share/ozone/lib/jackson-annotations.jar
@@ -128,7 +124,6 @@ share/ozone/lib/jersey-media-jaxb.jar
 share/ozone/lib/jersey-media-json-jackson.jar
 share/ozone/lib/jersey-server.jar
 share/ozone/lib/jettison.jar
-share/ozone/lib/jetty-client.jar
 share/ozone/lib/jetty-http.jar
 share/ozone/lib/jetty-io.jar
 share/ozone/lib/jetty-security.jar
@@ -211,8 +206,6 @@ share/ozone/lib/opentelemetry-sdk-logs.jar
 share/ozone/lib/opentelemetry-sdk-metrics.jar
 share/ozone/lib/opentelemetry-sdk-trace.jar
 share/ozone/lib/opentelemetry-sdk.jar
-share/ozone/lib/orc-core.jar
-share/ozone/lib/orc-shims.jar
 share/ozone/lib/osgi-resource-locator.jar
 share/ozone/lib/ozone-client.jar
 share/ozone/lib/ozone-cli-admin.jar
@@ -242,9 +235,9 @@ share/ozone/lib/picocli-shell-jline3.jar
 share/ozone/lib/protobuf-java.jar
 share/ozone/lib/protobuf-java.jar
 share/ozone/lib/proto-google-common-protos.jar
+share/ozone/lib/ranger-audit-core.jar
 share/ozone/lib/ranger-intg.jar
 share/ozone/lib/ranger-plugin-classloader.jar
-share/ozone/lib/ranger-plugins-audit.jar
 share/ozone/lib/ranger-plugins-common.jar
 share/ozone/lib/ranger-plugins-cred.jar
 share/ozone/lib/ratis-client.jar

pom.xml

@@ -194,7 +194,7 @@
     <proto-backwards-compatibility.version>1.0.7</proto-backwards-compatibility.version>
     <protobuf-maven-plugin.version>0.6.1</protobuf-maven-plugin.version>
     <protobuf.version>3.25.8</protobuf.version>
-    <ranger.version>2.6.0</ranger.version>
+    <ranger.version>2.7.0</ranger.version>
     <!-- versions included in ratis-thirdparty, update in sync -->
     <ratis-thirdparty.grpc.version>1.75.0</ratis-thirdparty.grpc.version>
     <ratis-thirdparty.netty.version>4.1.127.Final</ratis-thirdparty.netty.version>