Skip to content

Skip spotless in release:prepare#11285

Merged
MarkEWaite merged 1 commit intojenkinsci:masterfrom
MarkEWaite:skip-spotless-check-in-release-prepare
Nov 11, 2025
Merged

Skip spotless in release:prepare#11285
MarkEWaite merged 1 commit intojenkinsci:masterfrom
MarkEWaite:skip-spotless-check-in-release-prepare

Conversation

@MarkEWaite
Copy link
Contributor

Skip spotless in release:prepare

The weekly release of Jenkins 2.536 failed its initial build because Maven release plugin 3.2.0 behaves differently than Maven release plugin 3.1.1. For 2.535, we were using Maven release plugin 3.1.1 and it did not require that we skip spotless verification during the release:prepare phase. Maven release plugin 3.2.0 requires it.

Will allow the temporary change to be reverted from pull request:

Special thanks to @jglick for noting the better way to resolve the issue.

Testing done

  • Confirmed that builds fail without this change when running

    mvn -B -V -ntp release:prepare

  • Confirmed that builds pass with this change when running

    mvn -B -V -ntp release:prepare

Proposed changelog entries

  • N/A

Proposed changelog category

/label skip-changelog

Proposed upgrade guidelines

N/A

Submitter checklist

  • The Jira issue, if it exists, is well-described.
  • The changelog entries and upgrade guidelines are appropriate for the audience affected by the change (users or developers, depending on the change) and are in the imperative mood (see examples). Fill in the Proposed upgrade guidelines section only if there are breaking changes or changes that may require extra steps from users during upgrade.
  • There is automated testing or an explanation as to why this change has no tests.
  • New public classes, fields, and methods are annotated with @Restricted or have @since TODO Javadocs, as appropriate.
  • New deprecations are annotated with @Deprecated(since = "TODO") or @Deprecated(forRemoval = true, since = "TODO"), if applicable.
  • UI changes do not introduce regressions when enforcing the current default rules of Content Security Policy Plugin. In particular, new or substantially changed JavaScript is not defined inline and does not call eval to ease future introduction of Content Security Policy (CSP) directives (see documentation).
  • For dependency updates, there are links to external changelogs and, if possible, full differentials.
  • For new APIs and extension points, there is a link to at least one consumer.

Desired reviewers

N/A

Before the changes are marked as ready-for-merge:

Maintainer checklist

  • There are at least two (2) approvals for the pull request and no outstanding requests for change.
  • Conversations in the pull request are over, or it is explicit that a reviewer is not blocking the change.
  • Changelog entries in the pull request title and/or Proposed changelog entries are accurate, human-readable, and in the imperative mood.
  • Proper changelog labels are set so that the changelog can be generated automatically.
  • If the change needs additional upgrade steps from users, the upgrade-guide-needed label is set and there is a Proposed upgrade guidelines section in the pull request title (see example).
  • If it would make sense to backport the change to LTS, a Jira issue must exist, be a Bug or Improvement, and be labeled as lts-candidate to be considered (see query).

The weekly release of Jenkins 2.536 failed its initial build because Maven
release plugin 3.2.0 behaves differently than Maven release plugin 3.1.1.
For 2.535, we were using Maven release plugin 3.1.1 and it did not require
that we skip spotless verification during the `release:prepare` phase.
Maven release plugin 3.2.0 requires it.

Will allow the temporary change to be reverted from pull request:

* jenkins-infra/release#782

Special thanks to @jglick for noting the better way to resolve the issue.

Testing done:

* Confirmed that builds fail without this change when running

  `mvn -B -V -ntp release:prepare`

* Confirmed that builds pass with this change when running

  `mvn -B -V -ntp release:prepare`
@MarkEWaite MarkEWaite added the skip-changelog Should not be shown in the changelog label Nov 11, 2025
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.

Looks like it should work.

@MarkEWaite
Copy link
Contributor Author

This PR is now ready for merge. We will merge it after approximately 24 hours if there is no negative feedback.

/label ready-for-merge

@comment-ops-bot comment-ops-bot bot added the ready-for-merge The PR is ready to go, and it will be merged soon if there is no negative feedback label Nov 11, 2025
@MarkEWaite MarkEWaite merged commit 205849e into jenkinsci:master Nov 11, 2025
19 checks passed
@MarkEWaite MarkEWaite deleted the skip-spotless-check-in-release-prepare branch November 11, 2025 23:48
MarkEWaite added a commit to MarkEWaite/release that referenced this pull request Nov 12, 2025
Use Maven release plugin 3.2.0 as declared in the pom.xml file of
Jenkins core.  Don't override the version. Issue fixed by merged core
pull request:

* jenkinsci/jenkins#11285

Testing done:

* Confirmed working as part of testing the merged core pull request

This partially reverts commit ca439b6.
MarkEWaite added a commit to jenkins-infra/release that referenced this pull request Nov 12, 2025
Use Maven release plugin 3.2.0 as declared in the pom.xml file of
Jenkins core.  Don't override the version. Issue fixed by merged core
pull request:

* jenkinsci/jenkins#11285

Testing done:

* Confirmed working as part of testing the merged core pull request

This partially reverts commit ca439b6.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ready-for-merge The PR is ready to go, and it will be merged soon if there is no negative feedback skip-changelog Should not be shown in the changelog

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants