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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump jenkins from 1.76 to 1.77 #444

Merged
merged 8 commits into from Jun 24, 2022

Conversation

dependabot[bot]
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github Jun 22, 2022

Bumps jenkins from 1.76 to 1.77.

Release notes

Sourced from jenkins's releases.

1.77

馃挜 Breaking changes

馃摝 Dependency updates

Commits

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 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 Jun 22, 2022
Copy link
Member

@jglick jglick left a comment

Choose a reason for hiding this comment

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

No because this would make it impossible to run tests on Java 8, right @basil @timja?

@timja
Copy link
Member

timja commented Jun 22, 2022

No because this would make it impossible to run tests on Java 8, right @basil @timja?

I guess there's a question do we move developer tools over immediately or have some transition period.
(next LTS?)

We could backport changes as required if people want to go that approach too

@jglick
Copy link
Member

jglick commented Jun 22, 2022

have some transition period

jenkinsci/plugin-pom#478 (comment) last 露

@basil basil self-assigned this Jun 24, 2022
@basil
Copy link
Member

basil commented Jun 24, 2022

@dependabot rebase

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

---
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.77 branch from 00b4ff3 to f7c3e10 Compare June 24, 2022 17:39
@basil
Copy link
Member

basil commented Jun 24, 2022

From JENKINS-68570:

Core components that are not part of the delivered .war (e.g., maven-hpi-plugin, jenkins-test-harness, etc.) still need to support older versions of Jenkins core, so we should continue building and testing these with both Java 8 and Java 11. These use the regular core parent POM, which we are planning on removing Java 8 support from. I suppose we could inline the relevant Java 8 specific profiles that we are deleting from the core parent POM into these two repositories in order to be able to upgrade them to the latest core parent POM while still supporting Java 8.

Jenkinsfile Show resolved Hide resolved
pom.xml Outdated Show resolved Hide resolved
Comment on lines +457 to +468
check naturally fails. To work around this, we relax the bytecode version check
when we are executing the Java 17 branch in the CI environment.

TODO When the minimum Jenkins baseline is bumped past 2.357, this can be deleted.
-->
<profile>
<id>test-recent-cores-on-ci</id>
<activation>
<jdk>17</jdk>
<property>
<name>env.CI</name>
</property>
Copy link
Member

Choose a reason for hiding this comment

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

Or just

Suggested change
check naturally fails. To work around this, we relax the bytecode version check
when we are executing the Java 17 branch in the CI environment.
TODO When the minimum Jenkins baseline is bumped past 2.357, this can be deleted.
-->
<profile>
<id>test-recent-cores-on-ci</id>
<activation>
<jdk>17</jdk>
<property>
<name>env.CI</name>
</property>
check naturally fails. To work around this, we relax the bytecode version check
when we are executing the Java 17 branch.
TODO When the minimum Jenkins baseline is bumped past 2.357, this can be deleted.
-->
<profile>
<id>test-recent-cores-on-ci</id>
<activation>
<jdk>17</jdk>

to simplify?

Copy link
Member

Choose a reason for hiding this comment

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

But then someone who happens to be running locally with Java 17 but has not customized the Jenkins version would get the looser Enforcer semantics of 11 and may accidentally depend on a Java 11 API. The CI build would catch this before it is merged and released, but I think local and CI builds should be as close as possible. I like restricting this to CI builds since that is the only place where we are programmatically using a recent weekly version.

Copy link
Member

Choose a reason for hiding this comment

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

local and CI builds should be as close as possible

Well of course that was my point as well, from another perspective. 馃榿 Anyway, this is fine.

Copy link
Member

Choose a reason for hiding this comment

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

Right, someone who is running locally with jenkins.version would need to set CI=true to get this logic. I dunno if there is a good solution here. Really what I need is a way to activate the profile if the version number is greater than or equal to some value, but I can't think of a way to do that with Maven profile activation.

Copy link
Member

Choose a reason for hiding this comment

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

activate the profile if the version number is greater than or equal to some value

Yeah that is moving into Gradle territory I think.

@basil basil requested a review from jglick June 24, 2022 19:16
@basil basil merged commit b99cd5e into master Jun 24, 2022
@basil basil deleted the dependabot/maven/org.jenkins-ci-jenkins-1.77 branch June 24, 2022 19:41
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.

None yet

3 participants