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 baseline, POM, BOM, etc. #353

Merged
merged 3 commits into from
Apr 14, 2023
Merged

Bump baseline, POM, BOM, etc. #353

merged 3 commits into from
Apr 14, 2023

Conversation

jglick
Copy link
Member

@jglick jglick commented Dec 15, 2022

Supersedes #352, #351, & #314.

@jglick jglick added the dependencies Pull requests that update a dependency file label Dec 15, 2022
@jglick jglick requested a review from a team December 15, 2022 21:12
@@ -1 +0,0 @@
**/target/*.hpi
Copy link
Member Author

@jglick jglick Dec 15, 2022

Choose a reason for hiding this comment

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

who knows f466945

@jglick jglick enabled auto-merge December 15, 2022 21:52
@MarkEWaite
Copy link
Contributor

With a minor update to use parent pom 4.59 and bom version 1981.v17df70e84a_a_1 this would also supersede #356 and #360.

I see one test failure

[ERROR] jenkins.branch.BranchCategoryFilterTest.filter_uncategorizedCategory  Time elapsed: 0.039 s  <<< FAILURE!
java.lang.AssertionError:

Expected: iterable with items [<Mock for TopLevelJob, hashCode: 1652280702>, <Mock for TopLevelJob, hashCode: 889546737>] in any order
     but: no match for: <Mock for TopLevelJob, hashCode: 442200980>
        at org.hamcrest.MatcherAssert.assertThat(MatcherAssert.java:20)
        at org.hamcrest.MatcherAssert.assertThat(MatcherAssert.java:6)
        at jenkins.branch.BranchCategoryFilterTest.filter_uncategorizedCategory(BranchCategoryFilterTest.java:94)
        at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
        at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)

That failure is visible on Debian testing and on Ubuntu 22.04.

@jglick
Copy link
Member Author

jglick commented Apr 14, 2023

this would also supersede

One step at a time. I wanted to file a PR which covered the transition to Java 11. Individual updates can be applied on their own merits. (Some, like @jtnord, object to applying bom updates indiscriminately.)

@jglick
Copy link
Member Author

jglick commented Apr 14, 2023

I see one test failure

Sorry, where is this test failure? I cannot see it in this PR. If you mean after applying further BOM updates, then let us address that there.

@MarkEWaite
Copy link
Contributor

If you mean after applying further BOM updates, then let us address that there.

After further investigation, it looks like the test failure requires a newer parent pom (4.59) but does not require any change to the BOM version. This passes with parent pom 4.53 as proposed:

mvn clean -Dtest=BranchCategoryFilterTest#filter_uncategorizedCategory clean verify

This fails with parent pom 4.59 as the only change from this pull request

mvn clean -Dtest=BranchCategoryFilterTest#filter_uncategorizedCategory clean verify

Handling that test failure can certainly wait until after this pull request is merged. Updating from parent pom 4.50 to 4.53 is already a step in the right direction.

@jglick jglick merged commit 792bbdf into jenkinsci:master Apr 14, 2023
@jglick jglick deleted the bumps branch April 14, 2023 16:58
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.

3 participants