From 03b3301c982995efa9429182135f57a65ed01d3d Mon Sep 17 00:00:00 2001 From: Joseph Petersen Date: Wed, 20 Jul 2022 01:12:01 +0200 Subject: [PATCH 1/4] drop 2.289.x and 2.303.x this is currently blocking due to cycle dependency between plugins --- README.md | 4 +- bom-2.289.x/pom.xml | 62 ------------ bom-2.303.x/pom.xml | 109 ---------------------- pom.xml | 2 - sample-plugin/pom.xml | 14 --- updatecli/updatecli.d/update-plugins.yaml | 58 ------------ 6 files changed, 2 insertions(+), 247 deletions(-) delete mode 100644 bom-2.289.x/pom.xml delete mode 100644 bom-2.303.x/pom.xml diff --git a/README.md b/README.md index d6a4bf439..6a4808c82 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ If you are interested in a Bill of Materials for Jenkins core components, see [t After selecting your plugin’s LTS baseline: ```xml -2.289.3 +2.319.3 ``` just import the [latest BOM](https://github.com/jenkinsci/bom/releases) from that line: @@ -22,7 +22,7 @@ just import the [latest BOM](https://github.com/jenkinsci/bom/releases) from tha io.jenkins.tools.bom - bom-2.289.x + bom-2.319.x … import pom diff --git a/bom-2.289.x/pom.xml b/bom-2.289.x/pom.xml deleted file mode 100644 index 4775337b0..000000000 --- a/bom-2.289.x/pom.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - 4.0.0 - - io.jenkins.tools.bom - parent - ${changelist} - - bom-2.289.x - pom - - - - ${project.groupId} - bom-2.303.x - ${project.version} - pom - import - - - io.jenkins.plugins - dark-theme - 0.0.12 - - - org.jenkins-ci.plugins - config-file-provider - 3.8.1 - - - org.jenkins-ci.plugins - email-ext - 2.87 - - - org.jenkins-ci.plugins - junit - 1.53.0.1 - - - org.jenkins-ci.plugins - pipeline-graph-analysis - 1.11 - - - org.jenkins-ci.plugins - saml - 2.0.9 - - - org.jenkins-ci.plugins.workflow - workflow-cps-global-lib - 2.21.3 - - - org.jenkins-ci.plugins.workflow - workflow-durable-task-step - 2.40 - - - - diff --git a/bom-2.303.x/pom.xml b/bom-2.303.x/pom.xml deleted file mode 100644 index 9a7a37bc9..000000000 --- a/bom-2.303.x/pom.xml +++ /dev/null @@ -1,109 +0,0 @@ - - - 4.0.0 - - io.jenkins.tools.bom - parent - ${changelist} - - bom-2.303.x - pom - - - - ${project.groupId} - bom-2.319.x - ${project.version} - pom - import - - - io.jenkins.plugins - bootstrap5-api - 5.1.3-6 - - - io.jenkins.plugins - echarts-api - 5.3.2-1 - - - io.jenkins.plugins - font-awesome-api - 6.0.0-1 - - - io.jenkins.plugins - jquery3-api - 3.6.0-3 - - - io.jenkins.plugins - plugin-util-api - 2.16.0 - - - io.jenkins.plugins - plugin-util-api - 2.16.0 - tests - - - io.jenkins.plugins - popper2-api - 2.11.5-1 - - - org.jenkins-ci.plugins - bouncycastle-api - 2.25 - - - org.jenkins-ci.plugins - cloudbees-folder - 6.722.v8165b_a_cf25e9 - - - org.jenkins-ci.plugins - credentials - 2.6.1.1 - - - org.jenkins-ci.plugins - credentials-binding - 1.27.1 - - - io.jenkins.plugins - data-tables-api - 1.11.4-4 - - - io.jenkins.plugins - forensics-api - 1.13.0 - - - io.jenkins.plugins - forensics-api - 1.13.0 - tests - - - org.jenkins-ci.plugins - metrics - 4.0.2.8.1 - - - org.jenkins-ci.plugins - ssh-slaves - 1.806.v2253cedd3295 - - - org.jenkins-ci.plugins - trilead-api - 1.0.13 - - - - diff --git a/pom.xml b/pom.xml index 094e578dc..d28c09ff2 100644 --- a/pom.xml +++ b/pom.xml @@ -23,8 +23,6 @@ bom-2.346.x bom-2.332.x bom-2.319.x - bom-2.303.x - bom-2.289.x sample-plugin diff --git a/sample-plugin/pom.xml b/sample-plugin/pom.xml index 7cc4c1225..ee916e5a1 100644 --- a/sample-plugin/pom.xml +++ b/sample-plugin/pom.xml @@ -562,19 +562,5 @@ 2.319.3 - - 2.303.x - - 2.303.x - 2.303.3 - - - - 2.289.x - - 2.289.x - 2.289.3 - - diff --git a/updatecli/updatecli.d/update-plugins.yaml b/updatecli/updatecli.d/update-plugins.yaml index 8f08dd753..78bd493ee 100644 --- a/updatecli/updatecli.d/update-plugins.yaml +++ b/updatecli/updatecli.d/update-plugins.yaml @@ -12,30 +12,6 @@ scms: branch: "{{ .github.branch }}" sources: - jenkins2.289.x: - name: Get Last Jenkins Stable Version - kind: githubrelease - spec: - owner: "jenkinsci" - repository: "jenkins" - token: "{{ requiredEnv .github.token }}" - versionfilter: - kind: regex - pattern: 'jenkins-2.289.\d+$' - transformers: - - trimprefix: "jenkins-" - jenkins2.303.x: - name: Get Last Jenkins Stable Version - kind: githubrelease - spec: - owner: "jenkinsci" - repository: "jenkins" - token: "{{ requiredEnv .github.token }}" - versionfilter: - kind: regex - pattern: 'jenkins-2.303.\d+$' - transformers: - - trimprefix: "jenkins-" jenkins2.319.x: name: Get Last Jenkins Stable Version kind: githubrelease @@ -73,24 +49,6 @@ sources: transformers: - trimprefix: "jenkins-" conditions: - jenkins2.289.x: - name: Test if Jenkins stable published - kind: maven - sourceid: jenkins2.289.x - spec: - url: "repo.jenkins-ci.org" - repository: "releases" - groupid: "org.jenkins-ci.main" - artifactid: "jenkins-war" - jenkins2.303.x: - name: Test if Jenkins stable published - kind: maven - sourceid: jenkins2.303.x - spec: - url: "repo.jenkins-ci.org" - repository: "releases" - groupid: "org.jenkins-ci.main" - artifactid: "jenkins-war" jenkins2.319.x: name: Test if Jenkins stable published kind: maven @@ -119,20 +77,6 @@ conditions: groupid: "org.jenkins-ci.main" artifactid: "jenkins-war" targets: - jenkins2.289.x: - name: 'Update 2.289.x plugins' - sourceid: jenkins2.289.x - kind: shell - spec: - command: pwsh -NoProfile -File ./updatecli/updatecli.d/update-plugins.ps1 - scmid: github - jenkins2.303.x: - name: 'Update 2.303.x plugins' - sourceid: jenkins2.303.x - kind: shell - spec: - command: pwsh -NoProfile -File ./updatecli/updatecli.d/update-plugins.ps1 - scmid: github jenkins2.319.x: name: 'Update 2.319.x plugins' sourceid: jenkins2.319.x @@ -160,8 +104,6 @@ pullrequests: kind: github scmid: github targets: - - jenkins2.289.x - - jenkins2.303.x - jenkins2.319.x - jenkins2.332.x - jenkins2.346.x From 31b96bc744e2c38744002e18d55e67c3b9282daf Mon Sep 17 00:00:00 2001 From: Joseph Petersen Date: Wed, 20 Jul 2022 08:44:01 +0200 Subject: [PATCH 2/4] do not fail fast --- failFast | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/failFast b/failFast index 27ba77dda..c508d5366 100644 --- a/failFast +++ b/failFast @@ -1 +1 @@ -true +false From 4887aabe2923413ce20018215c95fd8b3a157ee6 Mon Sep 17 00:00:00 2001 From: Tim Jacomb <21194782+timja@users.noreply.github.com> Date: Wed, 20 Jul 2022 20:42:11 +0100 Subject: [PATCH 3/4] Update pom.xml --- bom-2.319.x/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom-2.319.x/pom.xml b/bom-2.319.x/pom.xml index 37ef7d9e3..a29b89fca 100644 --- a/bom-2.319.x/pom.xml +++ b/bom-2.319.x/pom.xml @@ -55,7 +55,7 @@ org.jenkins-ci.plugins junit - 1.54 + 1.54.1 org.jenkins-ci.plugins From 2a00cafc13a077d2853b68e60692bee8c93f3eb1 Mon Sep 17 00:00:00 2001 From: Joseph Petersen Date: Thu, 21 Jul 2022 04:05:08 +0200 Subject: [PATCH 4/4] Apply suggestions from code review Co-authored-by: Jesse Glick --- README.md | 4 ++-- failFast | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 6a4808c82..f36f77366 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ If you are interested in a Bill of Materials for Jenkins core components, see [t After selecting your plugin’s LTS baseline: ```xml -2.319.3 +2.332.4 ``` just import the [latest BOM](https://github.com/jenkinsci/bom/releases) from that line: @@ -22,7 +22,7 @@ just import the [latest BOM](https://github.com/jenkinsci/bom/releases) from tha io.jenkins.tools.bom - bom-2.319.x + bom-2.332.x … import pom diff --git a/failFast b/failFast index c508d5366..27ba77dda 100644 --- a/failFast +++ b/failFast @@ -1 +1 @@ -false +true