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.

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

Moving "software.amazon.awssdk" dependencies to the compileOnly scope. #628

Merged
merged 3 commits into from
Sep 22, 2023

Conversation

dkaukov
Copy link
Contributor

@dkaukov dkaukov commented Sep 20, 2023

Description

Current build configuration leaking "software.amazon.awssdk" dependencies to the final POM:

    <dependency>
      <groupId>software.amazon.awssdk</groupId>
      <artifactId>sdk-core</artifactId>
      <version>[2.15,3.0)</version>
      <scope>compile</scope>
      <optional>true</optional>
    </dependency>
    <dependency>
      <groupId>software.amazon.awssdk</groupId>
      <artifactId>auth</artifactId>
      <version>[2.15,3.0)</version>
      <scope>compile</scope>
      <optional>true</optional>
    </dependency>

Which breaks some maven plugins (notable https://github.com/basepom/dependency-versions-check-maven-plugin) which tries to download all possible versions of the SDK in range.

Issues Resolved

By changing scope to the compileOnly, we completely removing this dependencies from final POM

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

@dblock
Copy link
Member

dblock commented Sep 20, 2023

Thanks! could you please check DCO (git commit -s --amend) and update the PR?

java-client/build.gradle.kts Outdated Show resolved Hide resolved
Signed-off-by: Dmitry Kaukov <[email protected]>
@dkaukov dkaukov requested a review from reta September 20, 2023 22:38
reta
reta previously approved these changes Sep 20, 2023
@reta
Copy link
Collaborator

reta commented Sep 20, 2023

@dkaukov could you please add a changelog entry, thank you

Signed-off-by: Dmitry Kaukov <[email protected]>
Copy link
Collaborator

@VachaShah VachaShah left a comment

Choose a reason for hiding this comment

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

Thank you @dkaukov!

@VachaShah VachaShah merged commit 66608d3 into opensearch-project:main Sep 22, 2023
30 checks passed
@VachaShah VachaShah added the backport 2.x Backport to 2.x branch label Sep 22, 2023
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-628-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 66608d3450865f6ee0d6b4e924ed7aaac74ba88d
# Push it to GitHub
git push --set-upstream origin backport/backport-628-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-628-to-2.x.

VachaShah pushed a commit to VachaShah/opensearch-java that referenced this pull request Sep 22, 2023
opensearch-project#628)

* move "software.amazon.awssdk" dependencies to the compileOnly scope.

Signed-off-by: Dmitry Kaukov <[email protected]>

* PR feedback

Signed-off-by: Dmitry Kaukov <[email protected]>

* PR feedback

Signed-off-by: Dmitry Kaukov <[email protected]>

---------

Signed-off-by: Dmitry Kaukov <[email protected]>
Signed-off-by: Vacha Shah <[email protected]>
@VachaShah
Copy link
Collaborator

Backport in #634

reta pushed a commit that referenced this pull request Sep 22, 2023
#628) (#634)

* move "software.amazon.awssdk" dependencies to the compileOnly scope.



* PR feedback



* PR feedback



---------

Signed-off-by: Dmitry Kaukov <[email protected]>
Signed-off-by: Vacha Shah <[email protected]>
Co-authored-by: Dmitry Kaukov <[email protected]>
@BrendonFaleiro BrendonFaleiro mentioned this pull request Jun 21, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x Backport to 2.x branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants