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

Bump xz from 1.8 to 1.9 in /plugins/ingest-attachment #3248

Merged

Conversation

dependabot[bot]
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github May 9, 2022

Bumps xz from 1.8 to 1.9.

Dependabot compatibility score

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot merge will merge this PR after your CI passes on it
  • @dependabot squash and merge will squash and merge this PR after your CI passes on it
  • @dependabot cancel merge will cancel a previously requested merge and block automerging
  • @dependabot reopen will reopen this PR if it is closed
  • @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

Bumps xz from 1.8 to 1.9.

---
updated-dependencies:
- dependency-name: org.tukaani:xz
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
@dependabot dependabot bot requested review from a team and reta as code owners May 9, 2022 13:19
@dependabot dependabot bot added the dependencies Pull requests that update a dependency file label May 9, 2022
Signed-off-by: dependabot[bot] <[email protected]>
@opensearch-ci-bot
Copy link
Collaborator

❌   Gradle Check failure a13ecc4
Log 5152

Reports 5152

@opensearch-ci-bot
Copy link
Collaborator

❌   Gradle Check failure 8f83dee
Log 5157

Reports 5157

@andrross
Copy link
Member

start gradle check

@opensearch-ci-bot
Copy link
Collaborator

✅   Gradle Check success 8f83dee
Log 5191

Reports 5191

@andrross andrross merged commit 132eabd into main May 10, 2022
@dependabot dependabot bot deleted the dependabot/gradle/plugins/ingest-attachment/org.tukaani-xz-1.9 branch May 10, 2022 16:02
@andrross andrross added the backport 2.x Backport to 2.x branch label May 10, 2022
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

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

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
cd .worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-3248-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 132eabd675d7e56c247eae43680de5cd237780d3
# Push it to GitHub
git push --set-upstream origin backport/backport-3248-to-2.x
# Go back to the original working tree
cd ../..
# 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-3248-to-2.x.

@andrross
Copy link
Member

Backport failed because #3111 has not been backported and it modified the same gradle file

@kartg
Copy link
Member

kartg commented May 10, 2022

Backport failed because #3111 has not been backported and it modified the same gradle file

My bad, backporting now - #3279

@owaiskazi19 owaiskazi19 added backport 2.x Backport to 2.x branch and removed backport 2.x Backport to 2.x branch labels May 10, 2022
opensearch-trigger-bot bot pushed a commit that referenced this pull request May 10, 2022
* Bump xz from 1.8 to 1.9 in /plugins/ingest-attachment

Bumps xz from 1.8 to 1.9.

---
updated-dependencies:
- dependency-name: org.tukaani:xz
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* Updating SHAs

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>
(cherry picked from commit 132eabd)
kartg pushed a commit that referenced this pull request May 10, 2022
* Bump xz from 1.8 to 1.9 in /plugins/ingest-attachment

Bumps xz from 1.8 to 1.9.

---
updated-dependencies:
- dependency-name: org.tukaani:xz
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* Updating SHAs

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>
(cherry picked from commit 132eabd)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@kartg kartg mentioned this pull request Jun 27, 2022
1 task
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jul 7, 2022
* Bump xz from 1.8 to 1.9 in /plugins/ingest-attachment

Bumps xz from 1.8 to 1.9.

---
updated-dependencies:
- dependency-name: org.tukaani:xz
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* Updating SHAs

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>
(cherry picked from commit 132eabd)
mch2 pushed a commit that referenced this pull request Jul 7, 2022
* Bump xz from 1.8 to 1.9 in /plugins/ingest-attachment

Bumps xz from 1.8 to 1.9.

---
updated-dependencies:
- dependency-name: org.tukaani:xz
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* Updating SHAs

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>
(cherry picked from commit 132eabd)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@mch2 mch2 added the backport 1.3 Backport to 1.3 branch label Jul 7, 2022
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jul 7, 2022
* Bump xz from 1.8 to 1.9 in /plugins/ingest-attachment

Bumps xz from 1.8 to 1.9.

---
updated-dependencies:
- dependency-name: org.tukaani:xz
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* Updating SHAs

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>
(cherry picked from commit 132eabd)
mch2 pushed a commit that referenced this pull request Jul 7, 2022
* Bump xz from 1.8 to 1.9 in /plugins/ingest-attachment

Bumps xz from 1.8 to 1.9.

---
updated-dependencies:
- dependency-name: org.tukaani:xz
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* Updating SHAs

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>
(cherry picked from commit 132eabd)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 1.x backport 1.3 Backport to 1.3 branch backport 2.x Backport to 2.x branch dependencies Pull requests that update a dependency file
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants