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

Backports to 1.54.x #412

Merged
merged 5 commits into from
Jul 24, 2022
Merged

Backports to 1.54.x #412

merged 5 commits into from
Jul 24, 2022

Conversation

basil
Copy link
Member

@basil basil commented Jul 24, 2022

Clean cherry-pick of #272 and #359 onto the 1.54.x line. See the test failures in https://ci.jenkins.io/job/Tools/job/bom/job/PR-1059/50/ - I have no idea why current PCT doesn't fail in this way, but my improved framework from JENKINS-45047 catches this (legitimate, I think) compatibility problem on the 1.54.x line. Cherry-picking the mentioned PRs resolves the issue for me locally when running PCT with JENKINS-45047.

CC @jetersen @timja

uhafner and others added 5 commits July 24, 2022 12:17
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…ntime:2.3.1 [provided] paths to dependency are:

+-org.jenkins-ci.plugins:junit:1.54.2-SNAPSHOT
  +-org.jenkins-ci.plugins:database:128.vaa83e142f7f2 [test]
    +-org.hibernate:hibernate-entitymanager:5.6.0.Final [test]
      +-org.hibernate:hibernate-core:5.6.0.Final [test]
        +-org.glassfish.jaxb:jaxb-runtime:2.3.1 [provided]
and
+-org.jenkins-ci.plugins:junit:1.54.2-SNAPSHOT
  +-org.jenkins-ci.plugins:jackson2-api:2.13.3-285.vc03c0256d517
    +-io.jenkins.plugins:jaxb:2.3.6-1 (managed) <-- io.jenkins.plugins:jaxb:2.3.6-1
      +-com.sun.xml.bind:jaxb-impl:2.3.6
        +-org.glassfish.jaxb:jaxb-runtime:2.3.6 [provided]
….activation:1.2.1 [provided] paths to dependency are:

+-org.jenkins-ci.plugins:junit:1.54.2-SNAPSHOT
  +-org.jenkins-ci.main:jenkins-core:2.303.3 [provided]
    +-com.sun.mail:jakarta.mail:1.6.5 [provided] (managed) <-- com.sun.mail:jakarta.mail:1.6.5 [provided]
      +-com.sun.activation:jakarta.activation:1.2.1 [provided]
and
+-org.jenkins-ci.plugins:junit:1.54.2-SNAPSHOT
  +-org.jenkins-ci.plugins:database:128.vaa83e142f7f2 [test]
    +-org.hibernate:hibernate-entitymanager:5.6.0.Final [test]
      +-org.hibernate:hibernate-core:5.6.0.Final [test]
        +-org.glassfish.jaxb:jaxb-runtime:2.3.6 [provided] (managed) <-- org.glassfish.jaxb:jaxb-runtime:2.3.1 [provided]
          +-com.sun.activation:jakarta.activation:1.2.2 [provided]
@timja timja merged commit 39b2461 into jenkinsci:1.54.x Jul 24, 2022
@timja
Copy link
Member

timja commented Jul 24, 2022

@basil basil deleted the 1.54.x branch July 24, 2022 22:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants