diff --git a/bom-2.319.x/pom.xml b/bom-2.319.x/pom.xml
deleted file mode 100644
index 30f58c225..000000000
--- a/bom-2.319.x/pom.xml
+++ /dev/null
@@ -1,187 +0,0 @@
-
-
- 4.0.0
-
- io.jenkins.tools.bom
- parent
- ${changelist}
-
- bom-2.319.x
- pom
-
-
-
- ${project.groupId}
- bom-2.332.x
- ${project.version}
- pom
- import
-
-
- io.jenkins.plugins
- jakarta-activation-api
- 2.0.0-2
-
-
- io.jenkins.plugins
- jakarta-mail-api
- 2.0.0-5
-
-
- io.jenkins.plugins
- javax-activation-api
- 1.2.0-3
-
-
- io.jenkins.plugins
- javax-mail-api
- 1.6.2-6
-
-
- io.jenkins.plugins
- jersey2-api
- 2.36-2
-
-
- org.jenkins-ci.plugins
- command-launcher
- 81.v9c2cb_cb_db_392
-
-
- org.jenkins-ci.plugins
- display-url-api
- 2.3.5
-
-
- org.jenkins-ci.plugins
- email-ext
- 2.89.1
-
-
- org.jenkins-ci.plugins
- junit
- 1.54.3
-
-
- org.jenkins-ci.plugins
- junit-attachments
- 95.v69691d523620
-
-
- org.jenkins-ci.plugins
- ldap
- 2.9
-
-
- org.jenkins-ci.plugins
- mailer
- 414.vcc4c33714601
-
-
- org.jenkins-ci.plugins
- 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
- 2.298.vc7a_2b_3958628
-
-
- org.jenkins-ci.plugins
- script-security
- 1138.v8e727069a_025
-
-
- org.jenkins-ci.plugins
- support-core
- 2.80.2
-
-
- org.jenkins-ci.plugins.workflow
- workflow-api
- 1153.vb_912c0e47fb_a_
-
-
- org.jenkins-ci.plugins.workflow
- workflow-api
- 1153.vb_912c0e47fb_a_
- tests
-
-
- org.jenkins-ci.plugins.workflow
- workflow-basic-steps
- 2.24
-
-
- org.jenkins-ci.plugins.workflow
- workflow-cps
- 2660.2664.v4c114e93f4c1
-
-
- org.jenkins-ci.plugins.workflow
- workflow-cps
- 2660.2664.v4c114e93f4c1
- tests
-
-
- org.jenkins-ci.plugins.workflow
- workflow-durable-task-step
- 1139.v252a_e12e8463
-
-
- org.jenkins-ci.plugins.workflow
- workflow-job
- 1145.v7f2433caa07f
-
-
- org.jenkins-ci.plugins.workflow
- workflow-job
- 1145.v7f2433caa07f
- tests
-
-
- org.jenkins-ci.plugins.workflow
- workflow-support
- 813.vb_d7c3d2984a_0
-
-
- org.jenkins-ci.plugins.workflow
- workflow-support
- 813.vb_d7c3d2984a_0
- tests
-
-
- org.jenkinsci.plugins
- pipeline-model-api
- 1.9.3
-
-
- org.jenkinsci.plugins
- pipeline-model-definition
- 1.9.3
-
-
- org.jenkinsci.plugins
- pipeline-model-definition
- 1.9.3
- tests
-
-
- org.jenkinsci.plugins
- pipeline-model-extensions
- 1.9.3
-
-
- org.jenkinsci.plugins
- pipeline-stage-tags-metadata
- 1.9.3
-
-
-
-
diff --git a/bom-2.332.x/pom.xml b/bom-2.332.x/pom.xml
index e323b1151..1e034849b 100644
--- a/bom-2.332.x/pom.xml
+++ b/bom-2.332.x/pom.xml
@@ -123,7 +123,7 @@
org.jenkins-ci.plugins
script-security
- 1189.vb_a_b_7c8fd5fde
+ 1183.v774b_0b_0a_a_451
org.jenkins-ci.plugins
diff --git a/bom-2.346.x/pom.xml b/bom-2.346.x/pom.xml
index 6133a6b26..66bd22fff 100644
--- a/bom-2.346.x/pom.xml
+++ b/bom-2.346.x/pom.xml
@@ -40,7 +40,7 @@
org.jenkins-ci.plugins
mailer
- 435.v79ef3972b_5c7
+ 435.438.v5b_81173f5b_a_1
org.jenkins-ci.plugins
diff --git a/pct.sh b/pct.sh
index 2ab686f2f..f8425e0da 100755
--- a/pct.sh
+++ b/pct.sh
@@ -47,24 +47,15 @@ MAVEN_PROPERTIES+=:hpi-plugin.version=3.33
# pass it in via -mavenPropertiesFile rather than using -mavenProperties because -mavenProperties
# uses a colon as the separator and these values contain colons.
#
-if [[ $LINE == '2.319.x' ]]; then
- #
- # com.sun.mail needs to be excluded because it is still provided by core on this line (using
- # pre-Jakarta imports) and we do not want it to be upgraded to a version that uses Jakarta
- # imports (which is not a realistic test scenario) just because the Jakarta Mail API plugin
- # happens to be on the class path and triggers an upper bounds violation.
- #
- echo upperBoundsExcludes=com.sun.mail:jakarta.mail,javax.servlet:servlet-api >maven.properties
-else
- #
- # javax.servlet:servlet-api comes from core at version 0, which is an intentional trick to
- # prevent this library from being used, and we do not want it to be upgraded to a nonzero
- # version (which is not a realistic test scenario) just because it happens to be on the
- # class path of some plugin and triggers an upper bounds violation. JENKINS-68696 tracks the
- # removal of this trick.
- #
- echo upperBoundsExcludes=javax.servlet:servlet-api >maven.properties
-fi
+
+#
+# javax.servlet:servlet-api comes from core at version 0, which is an intentional trick to
+# prevent this library from being used, and we do not want it to be upgraded to a nonzero
+# version (which is not a realistic test scenario) just because it happens to be on the
+# class path of some plugin and triggers an upper bounds violation. JENKINS-68696 tracks the
+# removal of this trick.
+#
+echo upperBoundsExcludes=javax.servlet:servlet-api >maven.properties
#
# Testing plugins against a version of Jenkins that requires Java 11 exposes
diff --git a/pom.xml b/pom.xml
index 13f7f8fe4..2929c61ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,6 @@
bom-2.361.x
bom-2.346.x
bom-2.332.x
- bom-2.319.x
sample-plugin
diff --git a/sample-plugin/check.groovy b/sample-plugin/check.groovy
index 81747bac4..a871a0087 100644
--- a/sample-plugin/check.groovy
+++ b/sample-plugin/check.groovy
@@ -8,7 +8,7 @@ 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
- && !(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)
+ && !(ga == 'io.jenkins.plugins:ionicons-api' && settings.activeProfiles.any {it ==~ /^2[.](332)[.]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"
diff --git a/sample-plugin/pom.xml b/sample-plugin/pom.xml
index 8b2b1c4c5..73e1fcbb5 100644
--- a/sample-plugin/pom.xml
+++ b/sample-plugin/pom.xml
@@ -581,12 +581,5 @@
2.332.4
-
- 2.319.x
-
- 2.319.x
- 2.319.3
-
-