diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 10badcdbe..829c8c590 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -11,7 +11,7 @@ updates: interval: "daily" - package-ecosystem: "maven" open-pull-requests-limit: 10 - directory: "/bom-latest" + directory: "/bom-weekly" reviewers: - "jglick" schedule: diff --git a/README.md b/README.md index 79e9c02de..c553ccfe3 100644 --- a/README.md +++ b/README.md @@ -128,15 +128,11 @@ It is unusual but possible for cross-component incompatibilities to only be visi ## LTS lines -A separate BOM artifact is available for the current LTS line and a few historical lines. -When a new LTS line is released (`jenkins-2.nnn.1`), -the main definition should be moved into its BOM (added to the aggregator POM), -and the the previous BOM made to inherit from it. -Older BOMs should only specify plugin version overrides compared to the next-newer BOM. -`sample-plugin` should be updated to use the latest line by default, -and get a new POM profile for the penultimate. +A separate BOM artifact is available for the latest weekly, current LTS line and a few historical lines. +BOMs should only specify plugin version overrides compared to the next-newer BOM. +`sample-plugin` will use the weekly line by default, +and get a new POM profile for the others. To get ahead of problems, prepare the draft PR for a line as soon as its baseline is announced. -Remember to file a patch to update: https://github.com/jenkins-infra/repository-permissions-updater/blob/master/permissions/pom-bom.yml The CI build (or just `mvn test -P2.nnn.x`) will fail if some managed plugins are too new for the LTS line. [This script](https://gist.github.com/jglick/0a85759ea65f60e107ac5a85a5032cae) diff --git a/bom-2.249.x/pom.xml b/bom-2.249.x/pom.xml deleted file mode 100644 index 9018832f0..000000000 --- a/bom-2.249.x/pom.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - 4.0.0 - - io.jenkins.tools.bom - parent - ${changelist} - - bom-2.249.x - pom - - - - ${project.groupId} - bom-2.263.x - ${project.version} - import - pom - - - org.jenkins-ci.plugins - git-client - 3.6.0 - - - org.jenkins-ci.plugins.workflow - workflow-basic-steps - 2.22 - - - io.jenkins.plugins - font-awesome-api - 5.15.3-3 - - - org.jenkins-ci.plugins - git - 4.6.0 - - - org.jenkins-ci.plugins - git - tests - 4.6.0 - - - io.jenkins.plugins - plugin-util-api - 2.3.0 - - - io.jenkins.plugins - checks-api - 1.7.0 - - - io.jenkins.plugins - jquery3-api - 3.6.0-1 - - - org.jenkins-ci.plugins - junit - 1.51 - - - - diff --git a/bom-2.263.x/pom.xml b/bom-2.263.x/pom.xml deleted file mode 100644 index 91da73053..000000000 --- a/bom-2.263.x/pom.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - 4.0.0 - - io.jenkins.tools.bom - parent - ${changelist} - - bom-2.263.x - pom - - - - ${project.groupId} - bom-2.277.x - ${project.version} - import - pom - - - org.jenkins-ci.plugins.workflow - workflow-multibranch - 2.24 - - - org.jenkins-ci.plugins.workflow - workflow-multibranch - tests - 2.24 - - - org.jenkins-ci.plugins - branch-api - 2.6.2 - - - org.jenkins-ci.plugins - token-macro - 2.13 - - - org.jenkins-ci.plugins - dashboard-view - 2.16 - - - org.jenkins-ci.plugins.workflow - workflow-cps-global-lib - 2.19 - - - org.jenkins-ci.plugins - durable-task - 1.37 - - - - diff --git a/bom-2.277.x/pom.xml b/bom-2.277.x/pom.xml deleted file mode 100644 index 66df31fc2..000000000 --- a/bom-2.277.x/pom.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - 4.0.0 - - io.jenkins.tools.bom - parent - ${changelist} - - bom-2.277.x - pom - - - - ${project.groupId} - bom-2.289.x - ${project.version} - import - pom - - - org.jenkins-ci.plugins - htmlpublisher - 1.25 - - - org.jenkins-ci.plugins - matrix-project - 1.18 - - - org.jenkins-ci.plugins - ssh-credentials - 1.18.1 - - - org.jenkins-ci.plugins - ssh-slaves - 1.31.5 - - - org.jenkins-ci.plugins - git-client - 3.9.0 - - - - diff --git a/bom-2.303.x/pom.xml b/bom-2.303.x/pom.xml new file mode 100644 index 000000000..7cf8e84ec --- /dev/null +++ b/bom-2.303.x/pom.xml @@ -0,0 +1,22 @@ + + + 4.0.0 + + io.jenkins.tools.bom + parent + ${changelist} + + bom-2.303.x + pom + + + + ${project.groupId} + bom-weekly + ${project.version} + import + pom + + + + diff --git a/bom-latest/pom.xml b/bom-weekly/pom.xml similarity index 98% rename from bom-latest/pom.xml rename to bom-weekly/pom.xml index 4d3f6fff1..128f50127 100644 --- a/bom-latest/pom.xml +++ b/bom-weekly/pom.xml @@ -6,12 +6,12 @@ parent ${changelist} - bom-2.303.x + bom-weekly pom 1.7.2 1.54 - 4.8.3 + 4.9.0 1.9.2 2.6.5 1.23 @@ -92,6 +92,11 @@ test-harness ${configuration-as-code-plugin.version} + + org.jenkins-ci.modules + sshd + 3.1.0 + org.jenkins-ci.plugins.workflow workflow-api @@ -252,7 +257,7 @@ org.jenkins-ci.plugins git-server - 1.9 + 1.10 org.jenkins-ci.plugins diff --git a/excludes.txt b/excludes.txt index e24718077..6ef9b286a 100644 --- a/excludes.txt +++ b/excludes.txt @@ -22,6 +22,7 @@ org.jenkinsci.plugins.pipeline.modeldefinition.MatrixTest org.jenkinsci.plugins.pipeline.modeldefinition.WhenStageTest org.jenkinsci.plugins.pipeline.modeldefinition.WhenStageMultibranchTest org.jenkinsci.plugins.pipeline.modeldefinition.PostStageTest +org.jenkinsci.plugins.pipeline.modeldefinition.ToolsTest # TODO seemingly legitimate but undiagnosed PCT failures in interruptedWhileStartingMaxSurvivability and interruptedWhileStartingPerformanceOptimized org.jenkinsci.plugins.workflow.job.WorkflowRunRestartTest diff --git a/local-test.sh b/local-test.sh index 14e5c910c..81bfe8409 100755 --- a/local-test.sh +++ b/local-test.sh @@ -1,10 +1,10 @@ #!/bin/bash set -euxo pipefail -cd $(dirname $0) +cd "$(dirname $0)" # expects: $PLUGINS, optionally $TEST, $LINE -LATEST_LINE=$(fgrep '' sample-plugin/pom.xml | sed -E 's, *(.+),\1,g' | sort -rn | head -1) +LATEST_LINE=weekly : "${LINE:=$LATEST_LINE}" export SAMPLE_PLUGIN_OPTS=-Dtest=InjectedTest @@ -33,10 +33,10 @@ then -v ~/.m2:/var/maven/.m2 \ --rm \ --name bom-pct \ - -v $(pwd)/target/local-test:/pct \ + -v "$(pwd)"/target/local-test:/pct \ -e MAVEN_OPTS=-Duser.home=/var/maven \ -e MAVEN_CONFIG=/var/maven/.m2 \ - -e PLUGINS=$PLUGINS \ + -e PLUGINS="$PLUGINS" \ -e LINE=$LINE \ -e EXTRA_MAVEN_PROPERTIES=$EXTRA_MAVEN_PROPERTIES \ --entrypoint bash \ diff --git a/pom.xml b/pom.xml index 66ba6aac2..c3c97ad85 100644 --- a/pom.xml +++ b/pom.xml @@ -30,11 +30,9 @@ ${scmTag} - bom-latest + bom-weekly + bom-2.303.x bom-2.289.x - bom-2.277.x - bom-2.263.x - bom-2.249.x sample-plugin diff --git a/sample-plugin/pom.xml b/sample-plugin/pom.xml index 129b98869..24013f5c9 100644 --- a/sample-plugin/pom.xml +++ b/sample-plugin/pom.xml @@ -13,8 +13,8 @@ hpi 999999-SNAPSHOT - 2.303.x - 2.303.2 + weekly + 2.317 8 @@ -345,31 +345,17 @@ - 2.289.x - - 2.289.x - 2.289.3 - - - - 2.277.x + 2.303.x - 2.277.x - 2.277.4 + 2.303.x + 2.303.2 - 2.263.x - - 2.263.x - 2.263.4 - - - - 2.249.x + 2.289.x - 2.249.x - 2.249.3 + 2.289.x + 2.289.3