diff --git a/bom-2.319.x/pom.xml b/bom-2.319.x/pom.xml index 61d2d9583..30f58c225 100644 --- a/bom-2.319.x/pom.xml +++ b/bom-2.319.x/pom.xml @@ -82,6 +82,11 @@ metrics 4.1.6.1-358.vf46b_95ea_d2b_3 + + org.jenkins-ci.plugins + pipeline-input-step + 451.vf1a_a_4f405289 + org.jenkins-ci.plugins saml diff --git a/bom-2.332.x/pom.xml b/bom-2.332.x/pom.xml index 88f602fc1..1e034849b 100644 --- a/bom-2.332.x/pom.xml +++ b/bom-2.332.x/pom.xml @@ -69,6 +69,11 @@ jnr-posix-api 3.1.7-3 + + io.jenkins.plugins + pipeline-groovy-lib + 612.v84da_9c54906d + io.jenkins.plugins plugin-util-api @@ -115,6 +120,11 @@ pipeline-stage-step 293.v200037eefcd5 + + org.jenkins-ci.plugins + script-security + 1183.v774b_0b_0a_a_451 + org.jenkins-ci.plugins ssh-credentials diff --git a/bom-weekly/pom.xml b/bom-weekly/pom.xml index 9d9abe007..422255249 100644 --- a/bom-weekly/pom.xml +++ b/bom-weekly/pom.xml @@ -21,11 +21,11 @@ 621.vda_a_b_055e58f7 2.16.0 1200.v8005c684b_a_c6 - 2759.v87459c4eea_ca_ + 2803.v1a_f77ffcc773 1236.vc3a_d1602f439 716.vc692a_e52371b_ 639.v6eca_cd8c04a_a_ - 838.va_3a_087b_4055b + 839.v35e2736cfd5c @@ -138,6 +138,11 @@ gitlab-branch-source 640.v7101b_1c0def9 + + io.jenkins.plugins + ionicons-api + 31.v4757b_6987003 + io.jenkins.plugins jakarta-activation-api @@ -191,7 +196,7 @@ io.jenkins.plugins pipeline-groovy-lib - 612.v84da_9c54906d + 613.v9c41a_160233f io.jenkins.plugins @@ -453,7 +458,7 @@ org.jenkins-ci.plugins pipeline-input-step - 451.vf1a_a_4f405289 + 456.vd8a_957db_5b_e9 org.jenkins-ci.plugins @@ -499,7 +504,7 @@ org.jenkins-ci.plugins script-security - 1183.v774b_0b_0a_a_451 + 1189.vb_a_b_7c8fd5fde org.jenkins-ci.plugins diff --git a/sample-plugin/check.groovy b/sample-plugin/check.groovy index 004514799..81747bac4 100644 --- a/sample-plugin/check.groovy +++ b/sample-plugin/check.groovy @@ -7,7 +7,8 @@ assert artifactMap['junit:junit'] == project.artifactMap['junit:junit'] def managedPluginDeps = managedDeps.collect {stripAllButGA(it)}.grep { ga -> def art = artifactMap[ga] if (art == null) { - if (ga.contains('.plugins')) { // TODO without an Artifact, we have no reliable way of checking whether it is actually a plugin + if (ga.contains('.plugins') // TODO without an Artifact, we have no reliable way of checking whether it is actually a plugin + && !(ga == 'io.jenkins.plugins:ionicons-api' && settings.activeProfiles.any {it ==~ /^2[.](332|319)[.]x$/})) { // TODO: Remove once 2.332.x is no longer part of the BOM (or if MNG-5600 is fixed and we can exclude this dependency in the BOM for old LTS lines) throw new org.apache.maven.plugin.MojoFailureException("Managed plugin dependency $ga not listed in test classpath of sample plugin") } else { println "Do not see managed dependency $ga"