From bb334bcfba08b97a0dc6d062f3bb8a74420b673d Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Sun, 17 Sep 2023 02:03:21 -0600 Subject: [PATCH] Revert checks-api from 2.0.1 to 2.0.0 (#2512) * 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 bab8257f69b4411d683a420b106d8361fae5d0cf. * Revert "Bump checks-api.version from 2.0.0 to 2.0.1 in /bom-weekly (#2471)" https://github.com/jenkinsci/bom/issues/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. https://github.com/jenkinsci/checks-api-plugin/issues/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: * https://github.com/jenkinsci/bitbucket-kubernetes-credentials-plugin/pull/133 * https://github.com/jenkinsci/elastic-axis-plugin/pull/309 * https://github.com/jenkinsci/nodelabelparameter-plugin/pull/265 * https://github.com/jenkinsci/testng-plugin-plugin/pull/244 This reverts commit 729dfb26e76a7babd2cf503ce5bfb233b572d32f. --- Jenkinsfile | 5 ++++- bom-weekly/pom.xml | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 69f54b2df..6bd4cafa6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -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 } diff --git a/bom-weekly/pom.xml b/bom-weekly/pom.xml index e06e6f927..501b76b10 100644 --- a/bom-weekly/pom.xml +++ b/bom-weekly/pom.xml @@ -12,7 +12,7 @@ 1.12.529-406.vdeff15e5817d 1.27.7 2.1128.v717130d4f816 - 2.0.1 + 2.0.0 6.848.ve3b_fd7839a_81 1700.v6f448841296e 1.13.5-1