diff --git a/docs/security/authorization/spark/build.md b/docs/security/authorization/spark/build.md index 9d6a18a5ef6..2fb043ed721 100644 --- a/docs/security/authorization/spark/build.md +++ b/docs/security/authorization/spark/build.md @@ -78,27 +78,16 @@ By default, it is always built with the latest `ranger.version` defined in kyuub Sometimes, it may be incompatible with other Ranger Admins, then you may need to build the plugin on your own targeting the Ranger Admin version you connect with. ```shell -build/mvn clean package -pl :kyuubi-spark-authz_2.12 -am -DskipTests -Dranger.version=2.4.0 +build/mvn clean package -pl :kyuubi-spark-authz_2.12 -am -DskipTests -Dranger.version=2.8.0 ``` The available `ranger.version`s are shown in the following table. -| Ranger Version | Supported | Remark | -|:--------------:|:---------:|:-----------------------------------------------------------------------------------------:| -| 2.6.x | √ | - | -| 2.5.x | √ | - | -| 2.4.x | √ | - | -| 2.3.x | √ | - | -| 2.2.x | √ | - | -| 2.1.x | √ | - | -| 2.0.x | √ | - | -| 1.2.x | √ | - | -| 1.1.x | √ | - | -| 1.0.x | √ | - | -| 0.7.x | √ | - | -| 0.6.x | X | [KYUUBI-4672](https://github.com/apache/kyuubi/issues/4672) reported unresolved failures. | - -Currently, all ranger releases are supported. +| Ranger Version | Supported | Remark | +|:--------------:|:---------:|:------:| +| 2.8.x | √ | - | + +Please use branch-1.11 or prior to build against Ranger version prior to 2.8.0. ## Test with ScalaTest Maven plugin diff --git a/extensions/spark/kyuubi-spark-authz-shaded/pom.xml b/extensions/spark/kyuubi-spark-authz-shaded/pom.xml index c32d7265fb8..05ae521b067 100644 --- a/extensions/spark/kyuubi-spark-authz-shaded/pom.xml +++ b/extensions/spark/kyuubi-spark-authz-shaded/pom.xml @@ -49,8 +49,6 @@ org.apache.kyuubi:* org.apache.ranger:* - - org.codehaus.jackson:* com.fasterxml.jackson.core:* com.fasterxml.jackson.module:* com.fasterxml.jackson.jaxrs:* @@ -81,10 +79,6 @@ - - org.codehaus.jackson - ${kyuubi.shade.packageName}.org.codehaus.jackson - com.fasterxml.jackson ${kyuubi.shade.packageName}.com.fasterxml.jackson diff --git a/extensions/spark/kyuubi-spark-authz-shaded/src/main/resources/META-INF/LICENSE b/extensions/spark/kyuubi-spark-authz-shaded/src/main/resources/META-INF/LICENSE index 1e6d25e885e..bdbebc2bd69 100644 --- a/extensions/spark/kyuubi-spark-authz-shaded/src/main/resources/META-INF/LICENSE +++ b/extensions/spark/kyuubi-spark-authz-shaded/src/main/resources/META-INF/LICENSE @@ -207,18 +207,25 @@ This project bundles some components that are licensed under the Apache License Version 2.0 -------------------------- +com.fasterxml.jackson.core:jackson-annotations +com.fasterxml.jackson.core:jackson-core +com.fasterxml.jackson.core:jackson-databind +com.fasterxml.jackson.jaxrs:jackson-jaxrs-base +com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider +com.fasterxml.jackson.module:jackson-module-jaxb-annotations +com.fasterxml.jackson.module:jackson-module-scala_* +org.apache.ranger:ranger-audit-core +org.apache.ranger:ranger-authz-api +org.apache.ranger:ranger-plugin-classloader org.apache.ranger:ranger-plugins-common -org.apache.ranger:ranger-plugins-audit -org.codehaus.jackson:jackson-jaxrs -org.codehaus.jackson:jackson-core-asl -org.codehaus.jackson:jackson-mapper-asl -net.java.dev.jna:jna -net.java.dev.jna:jna-platform +org.apache.ranger:ranger-plugins-cred +org.apache.ranger:ugsync-util Common Development and Distribution License (CDDL) 1.1 ------------------------------------------------------ com.sun.jersey:jersey-client com.sun.jersey:jersey-core +javax.ws.rs:jsr311-api MIT license ----------- diff --git a/extensions/spark/kyuubi-spark-authz/README.md b/extensions/spark/kyuubi-spark-authz/README.md index 3f34f6f181b..2ca5a4f632f 100644 --- a/extensions/spark/kyuubi-spark-authz/README.md +++ b/extensions/spark/kyuubi-spark-authz/README.md @@ -26,7 +26,7 @@ ## Build ```shell -build/mvn clean package -DskipTests -pl :kyuubi-spark-authz_2.12 -am -Dspark.version=3.5.6 -Dranger.version=2.6.0 +build/mvn clean package -DskipTests -pl :kyuubi-spark-authz_2.12 -am -Dspark.version=3.5.6 -Dranger.version=2.8.0 ``` ### Supported Apache Spark Versions @@ -47,17 +47,18 @@ build/mvn clean package -DskipTests -pl :kyuubi-spark-authz_2.12 -am -Dspark.ver `-Dranger.version=` +- [x] 2.8.x (default) - [ ] 2.7.x -- [x] 2.6.x (default) -- [x] 2.5.x -- [x] 2.4.x -- [x] 2.3.x -- [x] 2.2.x -- [x] 2.1.x -- [x] 2.0.x -- [x] 1.2.x -- [x] 1.1.x -- [x] 1.0.x -- [x] 0.7.x +- [ ] 2.6.x +- [ ] 2.5.x +- [ ] 2.4.x +- [ ] 2.3.x +- [ ] 2.2.x +- [ ] 2.1.x +- [ ] 2.0.x +- [ ] 1.2.x +- [ ] 1.1.x +- [ ] 1.0.x +- [ ] 0.7.x - [ ] 0.6.x diff --git a/extensions/spark/kyuubi-spark-authz/pom.xml b/extensions/spark/kyuubi-spark-authz/pom.xml index 5fd27d97140..9a29b7dc1f3 100644 --- a/extensions/spark/kyuubi-spark-authz/pom.xml +++ b/extensions/spark/kyuubi-spark-authz/pom.xml @@ -32,7 +32,7 @@ https://kyuubi.apache.org/ - 2.6.0 + 2.8.0 1.19.4 @@ -72,37 +72,17 @@ org.apache.ranger - ranger-plugins-audit + ranger-audit-core com.sun.jersey jersey-bundle - - log4j - log4j - - - ch.qos.logback - logback-classic - org.apache.commons commons-configuration2 - - commons-logging - commons-logging - - - org.apache.hadoop - hadoop-common - - - javax.ws.rs - jsr311-api - com.kstruct gethostname4j @@ -115,6 +95,10 @@ net.java.dev.jna jna-platform + + org.mockito + mockito-core + @@ -132,7 +116,7 @@ org.apache.ranger - ranger-plugins-audit + ranger-audit-core ${ranger.version} @@ -140,84 +124,17 @@ ranger-plugins-cred - org.apache.kafka - * - - - org.apache.solr - solr-solrj - - - org.elasticsearch - * - - - org.elasticsearch.client - * - - - org.elasticsearch.plugin - * - - - org.apache.lucene - * - - - log4j - log4j - - - commons-lang - commons-lang - - - commons-logging - commons-logging + org.apache.commons + commons-configuration2 com.carrotsearch hppc - - org.apache.httpcomponents - * - - - org.apache.hive - hive-storage-api - - - org.apache.orc - orc-core - - - org.apache.hadoop - hadoop-common - - - com.google.guava - guava - joda-time joda-time - - org.apache.logging.log4j - * - - - - com.amazonaws - aws-java-sdk-bundle - - - com.amazonaws - aws-java-sdk-logs - @@ -232,20 +149,15 @@ org.apache.hadoop - hadoop-common - - - log4j - log4j + hadoop-auth - - org.eclipse.persistence - javax.persistence + org.apache.hadoop + hadoop-client-api - org.eclipse.persistence - eclipselink + org.apache.hadoop + hadoop-client-runtime