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

including S3 Access Grants Plugin as part of Java SDK Bundle #4881

Merged
merged 8 commits into from
Feb 6, 2024
Merged

including S3 Access Grants Plugin as part of Java SDK Bundle #4881

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
2507722
including S3 Access Grants Plugin as part of Java SDK Bundle
Feb 2, 2024
005a914
removing changes in bundle-sdk to include access grants plugin depend…
Feb 2, 2024
c78976e
adding access grants plugin to the include set of bundle-sdk
Feb 2, 2024
18cce4c
refactoring the access grants plugin inclusion + adding caffeine to t…
Feb 2, 2024
d2134b0
removing unwanted dependency plugin added in bundle-sdk
Feb 2, 2024
a5591ec
bumping up S3 access grants plugin version
Feb 5, 2024
5119619
fixing indentation
Feb 5, 2024
e78cb3e
Merge branch 'master' into pull-access-grants-plugin
millems Feb 6, 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
8 changes: 8 additions & 0 deletions bundle-sdk/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,11 @@
<version>${awsjavasdk.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>software.amazon.s3.accessgrants</groupId>
<artifactId>aws-s3-accessgrants-java-plugin</artifactId>
<version>${s3accessgrants.version}</version>
</dependency>
</dependencies>

<build>
Expand All @@ -76,6 +81,8 @@
<include>commons-codec:commons-codec</include>
<include>software.amazon.awssdk:*</include>
<include>software.amazon:*</include>
<include>software.amazon.s3.accessgrants:*</include>
<inlcude>com.github.ben-manes.caffeine:*</inlcude>
<include>commons-logging:*</include>
</includes>
</artifactSet>
Expand Down Expand Up @@ -113,6 +120,7 @@
</plugin>
</plugins>
</pluginManagement>

</build>

<profiles>
Expand Down
6 changes: 6 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,9 @@
<!-- Reactive Streams version -->
<reactive-streams.version>1.0.4</reactive-streams.version>

<!-- S3 Access Grants plugin version -->
<s3accessgrants.version>2.0.0</s3accessgrants.version>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will wait until the patch release to remove the test dependency before merging.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @millems, bumped up the version.


<skip.unit.tests>${skipTests}</skip.unit.tests>
<integTestSourceDirectory>${project.basedir}/src/it/java</integTestSourceDirectory>
<javadoc.resourcesDir>${session.executionRootDirectory}</javadoc.resourcesDir>
Expand Down Expand Up @@ -534,6 +537,9 @@
old interfaces, but that should become a test scoped dependency in modules where needed.
And the line below removed. -->
<ignoredUnusedDeclaredDependency>software.amazon.awssdk:auth</ignoredUnusedDeclaredDependency>

<!-- Ignoring any unsued delcared dependency warnings across the bundle -->
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: indentation, s/delcared/declared/

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank You @millems , Fixed it.

<ignoredUnusedDeclaredDependency>software.amazon.s3.accessgrants:*</ignoredUnusedDeclaredDependency>
</ignoredUnusedDeclaredDependencies>
</configuration>
</plugin>
Expand Down
Loading