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

[JENKINS-69229] Use newer trilead-api on Java 11+ lines #1484

Merged
merged 3 commits into from
Oct 24, 2022

Conversation

jglick
Copy link
Member

@jglick jglick commented Oct 24, 2022

@jglick jglick added the dependencies Pull requests that update a dependency file label Oct 24, 2022
@@ -10,17 +10,12 @@ updates:
schedule:
interval: "daily"
- package-ecosystem: "maven"
open-pull-requests-limit: 10
open-pull-requests-limit: 25
Copy link
Member Author

Choose a reason for hiding this comment

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

@jglick
Copy link
Member Author

jglick commented Oct 24, 2022

Checking to see if https://github.com/jenkinsci/bom/pull/1484/checks?check_run_id=9074926262 is actually caused by this PR’s changes.

@jglick
Copy link
Member Author

jglick commented Oct 24, 2022

No, can reproduce also in trunk. Possibly caused by a Git (CLI) update on agents. Will look into this. CC @MarkEWaite

@jglick
Copy link
Member Author

jglick commented Oct 24, 2022

@jglick jglick enabled auto-merge (squash) October 24, 2022 19:02
…ile parameter`

https://maven.apache.org/surefire/maven-surefire-plugin/test-mojo.html#excludesFile
> Since 3.0.0-M6, method filtering support is provided in the exclusions file as well
but `git-client` is still using 3.0.0-M4.
@jglick jglick merged commit a071adc into jenkinsci:master Oct 24, 2022
@jglick jglick deleted the trilead-api-JENKINS-69229-III branch October 24, 2022 22:11
MarkEWaite added a commit to MarkEWaite/bom that referenced this pull request Oct 31, 2022
Command line git 2.38.1 and backports to earlier versions now exclude
submodule clones from a file:// URL. The tests in the git client
plugin rely on submodule clones from a file:// URL for some of the
tests.  Git client plugin 2.13.0 includes test changes to allow the
tests to run on git 2.38.1 successfully.  These exclusions should not
be needed any longer.

See jenkinsci#1484 for the original addition
of the exclusions.

jenkinsci/git-client-plugin#920 (comment)
reminds us to remove the exclusion.

jenkinsci/git-client-plugin#923 implements the
fix in the tests to allow file:// protocol clones during the submodule
operations in the tests.
jglick added a commit that referenced this pull request Nov 3, 2022
* Bump git-plugin.version from 4.11.5 to 4.13.0 in /bom-weekly

Bumps `git-plugin.version` from 4.11.5 to 4.13.0.

Updates `git` from 4.11.5 to 4.13.0
- [Release notes](https://github.com/jenkinsci/git-plugin/releases)
- [Changelog](https://github.com/jenkinsci/git-plugin/blob/master/CHANGELOG.adoc)
- [Commits](jenkinsci/git-plugin@git-4.11.5...git-4.13.0)

Updates `git` from 4.11.5 to 4.13.0
- [Release notes](https://github.com/jenkinsci/git-plugin/releases)
- [Changelog](https://github.com/jenkinsci/git-plugin/blob/master/CHANGELOG.adoc)
- [Commits](jenkinsci/git-plugin@git-4.11.5...git-4.13.0)

---
updated-dependencies:
- dependency-name: org.jenkins-ci.plugins:git
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.jenkins-ci.plugins:git:tests
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

* Bump git-client from 3.11.0 to 3.13.0 in /bom-weekly

Bumps [git-client](https://github.com/jenkinsci/git-client-plugin) from 3.11.0 to 3.13.0.
- [Release notes](https://github.com/jenkinsci/git-client-plugin/releases)
- [Commits](jenkinsci/git-client-plugin@git-client-3.11.0...git-client-3.13.0)

---
updated-dependencies:
- dependency-name: org.jenkins-ci.plugins:git-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

* Remove git client plugin test exclusions

Command line git 2.38.1 and backports to earlier versions now exclude
submodule clones from a file:// URL. The tests in the git client
plugin rely on submodule clones from a file:// URL for some of the
tests.  Git client plugin 2.13.0 includes test changes to allow the
tests to run on git 2.38.1 successfully.  These exclusions should not
be needed any longer.

See #1484 for the original addition
of the exclusions.

jenkinsci/git-client-plugin#920 (comment)
reminds us to remove the exclusion.

jenkinsci/git-client-plugin#923 implements the
fix in the tests to allow file:// protocol clones during the submodule
operations in the tests.

* Lock git client and git plugin to older versions in 2.332.x

* Drop 2.319.x

* Revert "Bump script-security from 1183.v774b_0b_0a_a_451 to 1189.vb_a_b_7c8fd5fde in /bom-2.332.x (#1512)"

This reverts commit 41c4799.

* Pin git client 3.12.2 for Jenkins 2.332.x

Fixes the submodule test failures with CLI git 2.38.1

See https://github.com/jenkinsci/git-client-plugin/releases/tag/git-client-3.12.2

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Tim Jacomb <[email protected]>
Co-authored-by: Jesse Glick <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dependencies Pull requests that update a dependency file
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants