From f18eacb9edfb0f5bc0062d8eef3b1d56055bfc33 Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Wed, 14 Aug 2024 11:22:52 -0700
Subject: [PATCH] [JENKINS-73282] Run PCT with a Jetty 12 EE 8 test harness
 when core is Jetty 12 EE 8 (#3190)

---
 bom-2.462.x/pom.xml   | 31 +++++++++++++++++++++++++++++++
 bom-weekly/pom.xml    |  6 +++---
 sample-plugin/pom.xml |  4 +++-
 3 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/bom-2.462.x/pom.xml b/bom-2.462.x/pom.xml
index 4278e7e10..3da037b26 100644
--- a/bom-2.462.x/pom.xml
+++ b/bom-2.462.x/pom.xml
@@ -8,6 +8,10 @@
   </parent>
   <artifactId>bom-2.462.x</artifactId>
   <packaging>pom</packaging>
+  <properties>
+    <github-api-plugin.version>1.321-468.v6a_9f5f2d5a_7e</github-api-plugin.version>
+    <okhttp-api-plugin.version>4.11.0-172.vda_da_1feeb_c6e</okhttp-api-plugin.version>
+  </properties>
   <dependencyManagement>
     <dependencies>
       <dependency>
@@ -17,6 +21,33 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <dependency>
+        <groupId>io.jenkins.plugins</groupId>
+        <artifactId>okhttp-api</artifactId>
+        <version>${okhttp-api-plugin.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>io.jenkins.plugins</groupId>
+        <artifactId>okhttp-api</artifactId>
+        <version>${okhttp-api-plugin.version}</version>
+        <classifier>tests</classifier>
+      </dependency>
+      <dependency>
+        <groupId>org.jenkins-ci.plugins</groupId>
+        <artifactId>github-api</artifactId>
+        <version>${github-api-plugin.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.jenkins-ci.plugins</groupId>
+        <artifactId>github-api</artifactId>
+        <version>${github-api-plugin.version}</version>
+        <classifier>tests</classifier>
+      </dependency>
+      <dependency>
+        <groupId>org.jenkins-ci.plugins</groupId>
+        <artifactId>gitlab-plugin</artifactId>
+        <version>1.8.1</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 </project>
diff --git a/bom-weekly/pom.xml b/bom-weekly/pom.xml
index 1759cb0a6..25ee35d4e 100644
--- a/bom-weekly/pom.xml
+++ b/bom-weekly/pom.xml
@@ -18,11 +18,11 @@
     <data-tables-api.version>2.0.8-1</data-tables-api.version>
     <declarative-pipeline-migration-assistant-plugin.version>1.6.4</declarative-pipeline-migration-assistant-plugin.version>
     <forensics-api.version>2.4.0</forensics-api.version>
-    <github-api-plugin.version>1.321-468.v6a_9f5f2d5a_7e</github-api-plugin.version>
+    <github-api-plugin.version>1.321-475.vf7ef62885c83</github-api-plugin.version>
     <git-plugin.version>5.3.0</git-plugin.version>
     <junit-plugin.version>1284.vf75d778f98c5</junit-plugin.version>
     <mina-sshd-api.version>2.13.2-125.v200281b_61d59</mina-sshd-api.version>
-    <okhttp-api-plugin.version>4.11.0-172.vda_da_1feeb_c6e</okhttp-api-plugin.version>
+    <okhttp-api-plugin.version>4.11.0-179.vdc1e64343d52</okhttp-api-plugin.version>
     <pipeline-maven-plugin.version>1421.v610fa_b_e2d60e</pipeline-maven-plugin.version>
     <pipeline-model-definition-plugin.version>2.2205.vc9522a_9d5711</pipeline-model-definition-plugin.version>
     <pipeline-stage-view-plugin.version>2.34</pipeline-stage-view-plugin.version>
@@ -722,7 +722,7 @@
       <dependency>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>gitlab-plugin</artifactId>
-        <version>1.8.1</version>
+        <version>1.9.0</version>
       </dependency>
       <dependency>
         <groupId>org.jenkins-ci.plugins</groupId>
diff --git a/sample-plugin/pom.xml b/sample-plugin/pom.xml
index 1c38f3cd4..9d5285f0c 100644
--- a/sample-plugin/pom.xml
+++ b/sample-plugin/pom.xml
@@ -14,8 +14,10 @@
   <properties>
     <changelist>999999-SNAPSHOT</changelist>
     <bom>weekly</bom>
-    <jenkins.version>2.471</jenkins.version>
+    <jenkins.version>2.472</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>
   </properties>
   <dependencyManagement>
     <dependencies>