Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

remove aws-sdk from ranger-extension #16011

Merged
merged 8 commits into from
Mar 8, 2024
Merged

remove aws-sdk from ranger-extension #16011

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a13c769
remove azure-sdk
janjwerner-confluent Feb 29, 2024
6460841
add aws-logs-sdk to ensure that all the transitive dependencies are s…
janjwerner-confluent Feb 29, 2024
5efe88e
replace aws-bundle-sdk with aws-logs-sdk
janjwerner-confluent Feb 29, 2024
fb6d9b6
fix version numbers
janjwerner-confluent Feb 29, 2024
e6d8e75
add additional guidance on ranger update, add dependency ignore to sa…
janjwerner-confluent Mar 1, 2024
3a2b2ac
add aws-sdk-logs to list of ignored dependencies to satisfy the maven…
janjwerner-confluent Mar 8, 2024
6a09da8
Merge branch 'apache:master' into remove-azure-sdk-from-ranger
janjwerner-confluent Mar 8, 2024
cc3597a
unify the aws-sdk versions
janjwerner-confluent Mar 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 17 additions & 6 deletions extensions-core/druid-ranger-security/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,6 @@
<artifactId>woodstox-core</artifactId>
<version>6.4.0</version>
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-bundle</artifactId>
<version>${aws.sdk.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down Expand Up @@ -178,6 +173,11 @@
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
</exclusion>
<!-- removing the complete bundle sdk to be replaced with only logs-sdk -->
<exclusion>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-bundle</artifactId>
</exclusion>
xvrl marked this conversation as resolved.
Show resolved Hide resolved
<exclusion>
<groupId>org.elasticsearch</groupId>
<artifactId>*</artifactId>
Expand All @@ -193,7 +193,14 @@
</exclusions>
<scope>compile</scope>
</dependency>

<!-- This is a transitive dependency of ranger-plugins-audit
added here to replace bloated bundle sdk, remove this if /when
apache ranger replaces bundle-skd with logs-sdk -->
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-logs</artifactId>
<version>1.12.669</version>
xvrl marked this conversation as resolved.
Show resolved Hide resolved
xvrl marked this conversation as resolved.
Show resolved Hide resolved
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
Expand Down Expand Up @@ -254,6 +261,10 @@
<!-- These are needed for scope: compile -->
<dependency>org.apache.ranger:ranger-plugins-audit</dependency>
</usedDependencies>
<!-- this is due to replacement of aws-bundle-sdk with aws-logs-sdk -->
<ignoredDependencies>
<ignoredDependency>com.amazonaws:aws-java-sdk-bundle</ignoredDependency>
</ignoredDependencies>
</configuration>
</plugin>
</plugins>
Expand Down
16 changes: 13 additions & 3 deletions licenses.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4650,13 +4650,23 @@ libraries:

---

name: com.amazonaws aws-java-sdk-bundle
name: com.amazonaws aws-java-sdk-logs
license_category: binary
version: 1.12.638
version: 1.12.669
module: druid-ranger-security
license_name: Apache License version 2.0
libraries:
- com.amazonaws: aws-java-sdk-bundle
- com.amazonaws: aws-java-sdk-logs

---

name: com.amazonaws jmespath-java
license_category: binary
version: 1.12.669
module: druid-ranger-security
license_name: Apache License version 2.0
libraries:
- com.amazonaws: jmespath-java

---

Expand Down
2 changes: 2 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,8 @@
<aether.version>0.9.0.M2</aether.version>
<apache.curator.version>5.5.0</apache.curator.version>
<apache.kafka.version>3.6.1</apache.kafka.version>
<!-- when updating apache ranger, verify the usage of aws-bundle-sdk vs aws-logs-sdk
and update as needed in extensions-core/druid-ranger-security/pm.xml -->
<apache.ranger.version>2.4.0</apache.ranger.version>
<gson.version>2.10.1</gson.version>
<scala.library.version>2.13.11</scala.library.version>
Expand Down
Loading