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 jenkins from 1.93 to 1.94 #126

Merged
merged 2 commits into from
Feb 16, 2023

Conversation

dependabot[bot]
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github Jan 30, 2023

Bumps jenkins from 1.93 to 1.94.

Release notes

Sourced from jenkins's releases.

1.94

🚨 Removed

🚀 New features and improvements

  • Inline Maven property incrementals.url for Maven 4 support (#372) @​basil

🐛 Bug fixes

👻 Maintenance

  • Ban javax.servlet:servlet-api version 0 (#385) @​basil
  • Define releaseProfiles in <plugins> section rather than <pluginManagement> section (#380) @​basil
  • Use a name for the Stapler plugin property that is consistent with plugin-pom (#374) @​basil
  • Consolidate maven-surefire-plugin.version and maven-surefire-report-plugin.version (#373) @​basil
  • Remove forceJavacCompilerUse workaround (#362) @​basil
  • Remove japanese mailing list from pom (#361) @​NotMyFault

📦 Dependency updates

Commits
  • 3bccfa6 [maven-release-plugin] prepare release jenkins-1.94
  • 1cef204 Remove unnecessary enforceBytecodeVersion excludes (#384)
  • dae5027 Ban javax.servlet:servlet-api version 0 (#385)
  • 423ecc8 Fix requireJavaVersion range (#383)
  • 7c247a6 Define releaseProfiles in \<plugins> section rather than `<pluginManagemen...
  • 6183532 Remove unused property (#382)
  • 2998767 Eliminate some pointless inconsistency (#381)
  • 76c6477 Remove defaultGoal (#379)
  • c4a43ce Remove unnecessary customization of remote repository update frequency (#378)
  • 4e6922e Remove unnecessary default group ID (#377)
  • Additional commits viewable in compare view

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 will merge this PR once CI passes on it, as requested by @NotMyFault.


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)

@dependabot dependabot bot added dependencies Pull requests that update a dependency file java Pull requests that update Java code labels Jan 30, 2023
Copy link
Member

@NotMyFault NotMyFault left a comment

Choose a reason for hiding this comment

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

@dependabot squash and merge

@dependabot @github
Copy link
Contributor Author

dependabot bot commented on behalf of github Jan 30, 2023

One of your CI runs failed on this pull request, so Dependabot won't merge it.

Dependabot will still automatically merge this pull request if you amend it and your tests pass.

@timja
Copy link
Member

timja commented Feb 7, 2023

Could swap back to mockito-subclass if the inline mock maker is causing the issue here:
https://github.com/mockito/mockito/releases/tag/v5.0.0

May be worth also trying the newer versions of mockito

@basil
Copy link
Member

basil commented Feb 7, 2023

Who is going to do that?

@basil
Copy link
Member

basil commented Feb 9, 2023

@timja was unresponsive.

@timja
Copy link
Member

timja commented Feb 10, 2023

@timja was unresponsive.

@basil hello I am here.

@basil
Copy link
Member

basil commented Feb 10, 2023

Thank you Tim, who is going to adapt this component to parent POM 1.94?

@timja
Copy link
Member

timja commented Feb 10, 2023

Thank you Tim, who is going to adapt this component to parent POM 1.94?

I do not know, I do not have time this week, possibly next week.

@timja
Copy link
Member

timja commented Feb 11, 2023

I've tried:

  1. Newer versions of mockito
  2. Switching to mockito-subclass

Neither worked.

I was able to fix the issue in the CI build by fixing what looks like a bug in the test.

diff --git a/src/test/java/org/kohsuke/file_leak_detector/AgentMainTest.java b/src/test/java/org/kohsuke/file_leak_detector/AgentMainTest.java
index cdfff93..e2057b6 100644
--- a/src/test/java/org/kohsuke/file_leak_detector/AgentMainTest.java
+++ b/src/test/java/org/kohsuke/file_leak_detector/AgentMainTest.java
@@ -56,7 +56,7 @@ public class AgentMainTest {
         AgentMain.premain(null, instrumentation);

         verify(instrumentation, times(1)).addTransformer(any(), anyBoolean());
-        verify(instrumentation, times(1)).retransformClasses((Class<?>) any());
+        verify(instrumentation, times(1)).retransformClasses(any(Class[].class));

It's a varargs method that is taking about 8 parameters not a single one, behaviour changed in mockito/mockito#1593 (comment).

the test fails later on with:

Failures:
[ERROR]   AgentMainTest.testPreMain:67 Had classes in the spec which were not instrumented: [java/nio/channels/spi/AbstractSelector, java/io/FileOutputStream, java/io/FileInputStream, java/util/zip/ZipFile, java/net/PlainSocketImpl, java/nio/file/Files, java/nio/channels/spi/AbstractSelectableChannel, java/io/RandomAccessFile, java/nio/channels/FileChannel, java/nio/channels/spi/AbstractInterruptibleChannel]

I'm unsure of how to fix that.

@timja
Copy link
Member

timja commented Feb 12, 2023

@dependabot rebase

Bumps [jenkins](https://github.com/jenkinsci/pom) from 1.93 to 1.94.
- [Release notes](https://github.com/jenkinsci/pom/releases)
- [Changelog](https://github.com/jenkinsci/pom/blob/master/CHANGELOG-old.md)
- [Commits](jenkinsci/pom@jenkins-1.93...jenkins-1.94)

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

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot dependabot bot force-pushed the dependabot/maven/org.jenkins-ci-jenkins-1.94 branch from 767081f to 4252779 Compare February 12, 2023 08:09
@aneveux
Copy link
Member

aneveux commented Feb 15, 2023

Hello 👋

I filled #129 against this PR which should fix the test issue.

Let me know if I missed something or didn't follow the right process 😄

@basil
Copy link
Member

basil commented Feb 15, 2023

@dependabot rebase

@dependabot @github
Copy link
Contributor Author

dependabot bot commented on behalf of github Feb 15, 2023

Looks like this PR has been edited by someone other than Dependabot. That means Dependabot can't rebase it - sorry!

If you're happy for Dependabot to recreate it from scratch, overwriting any edits, you can request @dependabot recreate.

@basil basil merged commit 09ff1b5 into master Feb 16, 2023
@basil basil deleted the dependabot/maven/org.jenkins-ci-jenkins-1.94 branch February 16, 2023 00:18
mandragorn pushed a commit to mandragorn/file-leak-detector that referenced this pull request May 30, 2023
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Antoine Neveux <aneveux@cloudbees.com>
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 java Pull requests that update Java code
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants