X Tutup
Skip to content

[10.15.0] chore(deps): bump phpseclib/phpseclib from 3.0.38 to 3.0.39#41276

Merged
jnweiger merged 2 commits intorelease-10.15.0from
backport-phpseclib-3.0.39
Jul 9, 2024
Merged

[10.15.0] chore(deps): bump phpseclib/phpseclib from 3.0.38 to 3.0.39#41276
jnweiger merged 2 commits intorelease-10.15.0from
backport-phpseclib-3.0.39

Conversation

@phil-davis
Copy link
Contributor

@phil-davis phil-davis commented Jun 25, 2024

Description

Apply dependabot PR #41274 to release-10.15.0

phpseclib/phpseclib#2009 has a fix for an issue introduced in 3.0.38 and 3.0.38 is already in release-10.15.0

IMO we should not release with 3.0.38 - we should move forward to 3.0.39

How Has This Been Tested?

CI

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Database schema changes (next release will require increase of minor version instead of patch)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Technical debt
  • Tests only (no source changes)

Checklist:

  • Code changes
  • Unit tests added
  • Acceptance tests added
  • Documentation ticket raised:
  • Changelog item, see TEMPLATE

dependabot bot and others added 2 commits June 25, 2024 08:52
@dependabot @phil-davis
chore(deps): bump phpseclib/phpseclib from 3.0.38 to 3.0.39
398ae98 
Bumps [phpseclib/phpseclib](https://github.com/phpseclib/phpseclib) from 3.0.38 to 3.0.39.
- [Release notes](https://github.com/phpseclib/phpseclib/releases)
- [Changelog](https://github.com/phpseclib/phpseclib/blob/master/CHANGELOG.md)
- [Commits](phpseclib/phpseclib@3.0.38...3.0.39)

---
updated-dependencies:
- dependency-name: phpseclib/phpseclib
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
@phil-davis
chore(deps): changelog for phpseclib 3.0.39
796f43f
@owncloud owncloud deleted a comment from update-docs bot Jun 25, 2024
@phil-davis
Copy link
Contributor Author

phil-davis commented Jun 25, 2024

Note: because of the move of changelog items in a release branch, it will reduce merge-back problems if we apply this change here, and it will end up in master when this branch is merged back to master.

For this reason, I have put #41274 into draft mode - we don't want to merge that direct to master and make merge-conflict problems.

@sonarqubecloud
Copy link

sonarqubecloud bot commented Jun 25, 2024

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarCloud

@phil-davis
Copy link
Contributor Author

phil-davis commented Jun 25, 2024

@jnweiger please have a look. I think that we should do something, not release with 3.0.38

@phil-davis
Copy link
Contributor Author

phil-davis commented Jul 2, 2024

@jnweiger there are also other dependency bump PRs by dependabot that were created last night:

#41280 symfony/console - nothing important in that
#41281 nikic/php-parser - just a dev tool dependency, so not needed in 10.15.0

I will leave those unmerged to reduce the chance of any silly conflict when merging-back release-10.15.0

Where are we up to with the 10.15.0 release process?
Merge this PR and build another 10.15.0 RC?

@phil-davis
Copy link
Contributor Author

phil-davis commented Jul 5, 2024

@jnweiger ping

See comments above.

@phil-davis phil-davis self-assigned this Jul 9, 2024
jnweiger
jnweiger approved these changes Jul 9, 2024
View reviewed changes
Copy link
Contributor

@jnweiger jnweiger left a comment

Choose a reason for hiding this comment

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

thanks, Phil!

@jnweiger jnweiger merged commit 43dbd94 into release-10.15.0 Jul 9, 2024
@phil-davis phil-davis deleted the backport-phpseclib-3.0.39 branch July 9, 2024 15:11
@jnweiger jnweiger restored the backport-phpseclib-3.0.39 branch July 10, 2024 11:21
phil-davis added a commit that referenced this pull request Jul 30, 2024
@phil-davis @dependabot
chore(deps): bump phpseclib/phpseclib from 3.0.38 to 3.0.39 (#41276)
abddfc5 
* chore(deps): bump phpseclib/phpseclib from 3.0.38 to 3.0.39

Bumps [phpseclib/phpseclib](https://github.com/phpseclib/phpseclib) from 3.0.38 to 3.0.39.
- [Release notes](https://github.com/phpseclib/phpseclib/releases)
- [Changelog](https://github.com/phpseclib/phpseclib/blob/master/CHANGELOG.md)
- [Commits](phpseclib/phpseclib@3.0.38...3.0.39)

---
updated-dependencies:
- dependency-name: phpseclib/phpseclib
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* chore(deps): changelog for phpseclib 3.0.39

---------

Signed-off-by: dependabot[bot] <support@github.com>
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

Reviewers

@DeepDiver1975 DeepDiver1975 Awaiting requested review from DeepDiver1975

1 more reviewer

@jnweiger jnweiger jnweiger approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@phil-davis phil-davis

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@phil-davis @jnweiger
X Tutup