Skip to content

Commit

Permalink
Revert checks-api from 2.0.1 to 2.0.0 (#2512)
Browse files Browse the repository at this point in the history
* Pin previous credentials-binding release for LTS profiles

The most recent release of the credentials-binding plugin adds masking
for base64 credentials.  That's a nice improvement.  Unfortunately,
it causes one of the config-file-provider tests to fail.

Adapt older bom profiles to "Bump credentials-binding (#2509)" by
retaining the current version of the credentials binding plugin on
the weekly release and pinning the previous credentials binding plugin
release on the LTS releases.

Could exclude the test failure on all releases, but it seemed better
to be able to detect test failures from the weekly release even if we
can't yet test the new version with the LTS releases.

This partially reverts commit bab8257.

* Revert "Bump checks-api.version from 2.0.0 to 2.0.1 in /bom-weekly (#2471)"

#2484 describes the unexpected
addition of commons-text-api as a new dependency for many consumers of
the plugin bill of materials.

Rather than having more and more plugins adding dependencies on the
commons-text-api or the commons-lang3-api plugin, let's keep the
checks-api dependency at 2.0.0 instead of 2.0.1.

jenkinsci/checks-api-plugin#233 is the issue
reported to the checks-api plugin.  Once that issue is resolved, we
should be able to use more recent checks-api plugin versions.

Dependency updates that had to add commons-text-api included:

* jenkinsci/bitbucket-kubernetes-credentials-plugin#133
* jenkinsci/elastic-axis-plugin#309
* jenkinsci/nodelabelparameter-plugin#265
* jenkinsci/testng-plugin-plugin#244

This reverts commit 729dfb2.
  • Loading branch information
MarkEWaite committed Sep 17, 2023
1 parent c111cf5 commit bb334bc
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
5 changes: 4 additions & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,10 @@ if (BRANCH_NAME == 'master' || fullTestMarkerFile || env.CHANGE_ID && pullReques
branches["pct-$repository-$line"] = {
def jdk = line == 'weekly' ? 21 : 11
if (jdk == 21) {
if (repository == 'jacoco-plugin') {
if (repository == 'checks-api-plugin') {
// TODO JENKINS-71804
jdk = 17
} else if (repository == 'jacoco-plugin') {
// TODO JENKINS-71806
jdk = 17
}
Expand Down
2 changes: 1 addition & 1 deletion bom-weekly/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<aws-java-sdk-plugin.version>1.12.529-406.vdeff15e5817d</aws-java-sdk-plugin.version>
<blueocean-plugin.version>1.27.7</blueocean-plugin.version>
<branch-api-plugin.version>2.1128.v717130d4f816</branch-api-plugin.version>
<checks-api.version>2.0.1</checks-api.version>
<checks-api.version>2.0.0</checks-api.version>
<cloudbees-folder-plugin.version>6.848.ve3b_fd7839a_81</cloudbees-folder-plugin.version>
<configuration-as-code-plugin.version>1700.v6f448841296e</configuration-as-code-plugin.version>
<data-tables-api.version>1.13.5-1</data-tables-api.version>
Expand Down

0 comments on commit bb334bc

Please sign in to comment.