Skip to content

chore(deps): update dependency gradle to v8.4#950

Merged
dbwiddis merged 1 commit intomainfrom
whitesource-remediate/gradle-8.x
Nov 10, 2023
Merged

chore(deps): update dependency gradle to v8.4#950
dbwiddis merged 1 commit intomainfrom
whitesource-remediate/gradle-8.x

Conversation

@mend-for-gitlite.zycloud.tk
Copy link
Copy Markdown
Contributor

This PR contains the following updates:

Package Update Change
gradle (source) minor 8.3 -> 8.4

Configuration

📅 Schedule: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 Automerge: Disabled by config. Please merge this manually once you are satisfied.

Rebasing: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 Ignore: Close this PR and you won't be reminded about this update again.


  • If you want to rebase/retry this PR, check this box

@dblock
Copy link
Copy Markdown
Member

dblock commented Oct 5, 2023

@mend-for-gitlite.zycloud.tk mend-for-gitlite.zycloud.tk bot force-pushed the whitesource-remediate/gradle-8.x branch from 7a12b40 to 3895e8c Compare October 6, 2023 03:14
@dbwiddis
Copy link
Copy Markdown
Member

dbwiddis commented Oct 9, 2023

Looks like legit failures in javadoc, https://github.com/opensearch-project/opensearch-sdk-java/actions/runs/6414275491/job/17414414663?pr=950

Seems related to #951 (and fixed after rebase after that was merged)

@mend-for-gitlite.zycloud.tk mend-for-gitlite.zycloud.tk bot force-pushed the whitesource-remediate/gradle-8.x branch from 3895e8c to 78e9e50 Compare October 19, 2023 00:06
@mend-for-gitlite.zycloud.tk mend-for-gitlite.zycloud.tk bot force-pushed the whitesource-remediate/gradle-8.x branch 2 times, most recently from 3430d0f to f9959fa Compare October 31, 2023 18:05
@owaiskazi19 owaiskazi19 mentioned this pull request Nov 2, 2023
Signed-off-by: mend-for-gitlite.zycloud.tk[bot] <mend-for-gitlite.zycloud.tk[bot]@users.noreply.github.com>
@mend-for-gitlite.zycloud.tk mend-for-gitlite.zycloud.tk bot force-pushed the whitesource-remediate/gradle-8.x branch from f9959fa to ec4f619 Compare November 2, 2023 18:49
@dbwiddis dbwiddis merged commit b81fc13 into main Nov 10, 2023
@dbwiddis dbwiddis deleted the whitesource-remediate/gradle-8.x branch November 10, 2023 04:46
@opensearch-trigger-bot
Copy link
Copy Markdown

The backport to 1.x failed:

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

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/opensearch-sdk-java/backport-1.x 1.x
# Navigate to the new working tree
pushd ../.worktrees/opensearch-sdk-java/backport-1.x
# Create a new branch
git switch --create backport/backport-950-to-1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 b81fc13a5fe99f28525b9a506185fa6679733e9c
# Push it to GitHub
git push --set-upstream origin backport/backport-950-to-1.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/opensearch-sdk-java/backport-1.x

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

@dbwiddis
Copy link
Copy Markdown
Member

@owaiskazi19 I seem to recall there was a reason we are keeping older gradle on 1.x. Is this the case or do I need to backport this?

@owaiskazi19
Copy link
Copy Markdown
Member

@owaiskazi19 I seem to recall there was a reason we are keeping older gradle on 1.x. Is this the case or do I need to backport this?

We downgraded gradle to 8.1.1 to match OS 2.9 version here on 1.x.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants