From 7d82ed16a8b9cfa0a6ecea6bb2ec065363488519 Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Wed, 4 Sep 2024 12:25:12 -0700
Subject: [PATCH] [JENKINS-73283] Run PCT with a Jetty 12 EE 9 test harness
 when core is Jetty 12 EE 9

---
 bom-2.462.x/pom.xml   | 10 ++++++++++
 bom-weekly/pom.xml    | 10 +++++-----
 excludes.txt          | 19 +++++++++++++++++++
 sample-plugin/pom.xml |  8 +++++++-
 4 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/bom-2.462.x/pom.xml b/bom-2.462.x/pom.xml
index 3da037b26..5769b4a45 100644
--- a/bom-2.462.x/pom.xml
+++ b/bom-2.462.x/pom.xml
@@ -48,6 +48,16 @@
         <artifactId>gitlab-plugin</artifactId>
         <version>1.8.1</version>
       </dependency>
+      <dependency>
+        <groupId>org.jenkins-ci.plugins</groupId>
+        <artifactId>ldap</artifactId>
+        <version>725.v3cb_b_711b_1a_ef</version>
+      </dependency>
+      <dependency>
+        <groupId>org.jenkins-ci.plugins</groupId>
+        <artifactId>saml</artifactId>
+        <version>4.464.vea_cb_75d7f5e0</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 </project>
diff --git a/bom-weekly/pom.xml b/bom-weekly/pom.xml
index 67917b8fa..028b397f7 100644
--- a/bom-weekly/pom.xml
+++ b/bom-weekly/pom.xml
@@ -18,11 +18,11 @@
     <data-tables-api.version>2.1.4-1</data-tables-api.version>
     <declarative-pipeline-migration-assistant-plugin.version>1.6.4</declarative-pipeline-migration-assistant-plugin.version>
     <forensics-api.version>2.5.0</forensics-api.version>
-    <github-api-plugin.version>1.321-475.vf7ef62885c83</github-api-plugin.version>
+    <github-api-plugin.version>1.321-478.vc9ce627ce001</github-api-plugin.version>
     <git-plugin.version>5.4.1</git-plugin.version>
     <junit-plugin.version>1296.vb_f538b_c88630</junit-plugin.version>
     <mina-sshd-api.version>2.13.2-125.v200281b_61d59</mina-sshd-api.version>
-    <okhttp-api-plugin.version>4.11.0-179.vdc1e64343d52</okhttp-api-plugin.version>
+    <okhttp-api-plugin.version>4.11.0-181.v1de5b_83857df</okhttp-api-plugin.version>
     <pipeline-maven-plugin.version>1421.v610fa_b_e2d60e</pipeline-maven-plugin.version>
     <pipeline-model-definition-plugin.version>2.2214.vb_b_34b_2ea_9b_83</pipeline-model-definition-plugin.version>
     <pipeline-stage-view-plugin.version>2.34</pipeline-stage-view-plugin.version>
@@ -747,7 +747,7 @@
       <dependency>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>gitlab-plugin</artifactId>
-        <version>1.9.1</version>
+        <version>1.9.2</version>
       </dependency>
       <dependency>
         <groupId>org.jenkins-ci.plugins</groupId>
@@ -848,7 +848,7 @@
       <dependency>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>ldap</artifactId>
-        <version>725.v3cb_b_711b_1a_ef</version>
+        <version>733.vd3700c27b_043</version>
       </dependency>
       <dependency>
         <groupId>org.jenkins-ci.plugins</groupId>
@@ -983,7 +983,7 @@
       <dependency>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>saml</artifactId>
-        <version>4.464.vea_cb_75d7f5e0</version>
+        <version>4.485.v99810fb_34d77</version>
       </dependency>
       <dependency>
         <groupId>org.jenkins-ci.plugins</groupId>
diff --git a/excludes.txt b/excludes.txt
index 1e4986fdb..15fc354ca 100644
--- a/excludes.txt
+++ b/excludes.txt
@@ -2,6 +2,22 @@
 com.sonyericsson.jenkins.plugins.bfa.model.FailureCauseHudsonTest#testDoCheckDescriptionViaWebForm
 com.sonyericsson.jenkins.plugins.bfa.model.FailureCauseHudsonTest#testDoCheckNameViaWebForm
 
+# TODO https://github.com/jenkinsci/build-failure-analyzer-plugin/pull/182
+com.sonyericsson.jenkins.plugins.bfa.CauseManagementHudsonTest#testMakeModificationUpdatesDate
+com.sonyericsson.jenkins.plugins.bfa.CauseManagementHudsonTest#testMakeModificationUpdatesModificationList
+com.sonyericsson.jenkins.plugins.bfa.CauseManagementHudsonTest#testNewNavigation
+com.sonyericsson.jenkins.plugins.bfa.CauseManagementHudsonTest#testNoMongoDB
+com.sonyericsson.jenkins.plugins.bfa.CauseManagementHudsonTest#testTableViewNavigation
+com.sonyericsson.jenkins.plugins.bfa.CauseManagementPermissionTest#allowedToUpdateCausesWhenGrantedBothUpdateAndView
+com.sonyericsson.jenkins.plugins.bfa.CauseManagementPermissionTest#allowedToUpdateCausesWhenGrantedOnlyUpdate
+com.sonyericsson.jenkins.plugins.bfa.CauseManagementPermissionTest#allowedToViewCausesWhenGrantedOnlyView
+com.sonyericsson.jenkins.plugins.bfa.CauseManagementPermissionTest#testDoRemoveConfirmRequiresPost
+com.sonyericsson.jenkins.plugins.bfa.model.FailureCauseHudsonTest#testDoConfigSubmit
+com.sonyericsson.jenkins.plugins.bfa.model.FailureCauseHudsonTest#testDoConfigSubmitOne
+com.sonyericsson.jenkins.plugins.bfa.PluginImplHudsonTest#testBooleanConfigPersistence
+com.sonyericsson.jenkins.plugins.bfa.TransientCauseManagementHudsonTest#testOnABuild
+com.sonyericsson.jenkins.plugins.bfa.TransientCauseManagementHudsonTest#testOnAProject
+
 # TODO cryptic PCT-only errors: https://github.com/jenkinsci/bom/pull/251#issuecomment-645012427
 hudson.matrix.AxisTest#emptyAxisValueListResultInNoConfigurations
 hudson.matrix.AxisTest#submitEmptyAxisName
@@ -13,6 +29,9 @@ io.jenkins.blueocean.service.embedded.PipelineApiTest#testOrganizationFolder
 # TODO tends to time out
 jenkins.plugins.http_request.HttpRequestStepRoundTripTest
 
+# TODO https://github.com/jenkinsci/build-user-vars-plugin/pull/137
+org.jenkinsci.plugins.builduser.varsetter.impl.UserIdCauseDeterminantSamlTest
+
 # TODO flakes on CI for inscrutable reasons
 org.jenkinsci.plugins.durabletask.BourneShellScriptTest
 
diff --git a/sample-plugin/pom.xml b/sample-plugin/pom.xml
index 442cfb801..26d7087f3 100644
--- a/sample-plugin/pom.xml
+++ b/sample-plugin/pom.xml
@@ -14,7 +14,7 @@
   <properties>
     <changelist>999999-SNAPSHOT</changelist>
     <bom>weekly</bom>
-    <jenkins.version>2.474</jenkins.version>
+    <jenkins.version>2.475</jenkins.version>
     <spotless.check.skip>false</spotless.check.skip>
     <!-- TODO JENKINS-73339 until in parent POM -->
     <jenkins-test-harness.version>2254.vcff7a_d4969e5</jenkins-test-harness.version>
@@ -28,6 +28,12 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <!-- TODO JENKINS-73339 until in parent POM, work around https://github.com/jenkinsci/plugin-pom/issues/936 -->
+      <dependency>
+        <groupId>jakarta.servlet</groupId>
+        <artifactId>jakarta.servlet-api</artifactId>
+        <version>5.0.0</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
   <dependencies>