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

Upgrading gradle plugin dependency-license-report to 2.2 #483

Merged
merged 2 commits into from
May 16, 2023

Conversation

VachaShah
Copy link
Collaborator

Description

2.2 version of Gradle plugin dependency-license-report is now available. The upgrade previously to the 2.x line of the plugin was not successful given the issues in 2.0 and 2.1 versions of the plugin.

Issues Resolved

Closes #219

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.

Signed-off-by: Vacha Shah <vachshah@amazon.com>
Signed-off-by: Vacha Shah <vachshah@amazon.com>
@reta reta merged commit 6baa4eb into opensearch-project:main May 16, 2023
@reta reta added the backport 2.x Backport to 2.x branch label May 16, 2023
@opensearch-trigger-bot
Copy link

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-483-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 6baa4ebf51ed08d31c7d57bec78d9d663bc3d730
# Push it to GitHub
git push --set-upstream origin backport/backport-483-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-483-to-2.x.

@VachaShah VachaShah deleted the issue-219 branch May 16, 2023 18:16
VachaShah added a commit to VachaShah/opensearch-java that referenced this pull request May 16, 2023
…project#483)

* Upgrading gradle plugin dependency-license-report to 2.x line

Signed-off-by: Vacha Shah <vachshah@amazon.com>

* Add Changelog

Signed-off-by: Vacha Shah <vachshah@amazon.com>

---------

Signed-off-by: Vacha Shah <vachshah@amazon.com>
VachaShah added a commit that referenced this pull request May 16, 2023
* Upgrading gradle plugin dependency-license-report to 2.x line



* Add Changelog



---------

Signed-off-by: Vacha Shah <vachshah@amazon.com>
@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.

Gradle plugin dependency-license-report has issues in the 2.x line
3 participants