[JENKINS-73283] Run PCT with a Jetty 12 EE 9 test harness when core i…

…s Jetty 12 EE 9
jenkinsci · Sep 3, 2024 · e87bf1b · e87bf1b
1 parent ee763f3
commit e87bf1b
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 8 deletions.
diff --git a/bom-2.462.x/pom.xml b/bom-2.462.x/pom.xml
@@ -21,6 +21,11 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <dependency>
+        <groupId>com.sonyericsson.jenkins.plugins.bfa</groupId>
+        <artifactId>build-failure-analyzer</artifactId>
+        <version>2.5.2</version>
+      </dependency>
       <dependency>
         <groupId>io.jenkins.plugins</groupId>
         <artifactId>okhttp-api</artifactId>
@@ -32,6 +37,11 @@
         <version>${okhttp-api-plugin.version}</version>
         <classifier>tests</classifier>
       </dependency>
+      <dependency>
+        <groupId>org.jenkins-ci.plugins</groupId>
+        <artifactId>build-user-vars-plugin</artifactId>
+        <version>166.v52976843b_435</version>
+      </dependency>
       <dependency>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>github-api</artifactId>
@@ -48,6 +58,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
@@ -18,11 +18,13 @@
     <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>
+    <!-- TODO JENKINS-73312 https://github.com/jenkinsci/github-api-plugin/pull/243 -->
+    <github-api-plugin.version>1.321-476.v6f23ce7668d5</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>
+    <!-- TODO JENKINS-73315 https://github.com/jenkinsci/okhttp-api-plugin/pull/205 -->
+    <okhttp-api-plugin.version>4.11.0-180.vee94e004241a_</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>
@@ -52,7 +54,8 @@
       <dependency>
         <groupId>com.sonyericsson.jenkins.plugins.bfa</groupId>
         <artifactId>build-failure-analyzer</artifactId>
-        <version>2.5.2</version>
+        <!-- TODO https://github.com/jenkinsci/build-failure-analyzer-plugin/pull/182 -->
+        <version>2.5.3-rc852.4b3081361c5b</version>
       </dependency>
       <dependency>
         <groupId>io.jenkins</groupId>
@@ -564,7 +567,8 @@
       <dependency>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>build-user-vars-plugin</artifactId>
-        <version>176.vb_9c7907fd524</version>
+        <!-- TODO https://github.com/jenkinsci/build-user-vars-plugin/pull/137 -->
+        <version>175.v28159a_8c8885</version>
       </dependency>
       <dependency>
         <groupId>org.jenkins-ci.plugins</groupId>
@@ -742,7 +746,8 @@
       <dependency>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>gitlab-plugin</artifactId>
-        <version>1.9.1</version>
+        <!-- TODO JENKINS-73344 https://github.com/jenkinsci/gitlab-plugin/pull/1665 -->
+        <version>1.9.1-rc1854.3d54b_ea_9cf42</version>
       </dependency>
       <dependency>
         <groupId>org.jenkins-ci.plugins</groupId>
@@ -843,7 +848,8 @@
       <dependency>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>ldap</artifactId>
-        <version>725.v3cb_b_711b_1a_ef</version>
+        <!-- TODO JENKINS-73279 https://github.com/jenkinsci/ldap-plugin/pull/285 -->
+        <version>732.v4666799253da_</version>
       </dependency>
       <dependency>
         <groupId>org.jenkins-ci.plugins</groupId>
@@ -978,7 +984,8 @@
       <dependency>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>saml</artifactId>
-        <version>4.464.vea_cb_75d7f5e0</version>
+        <!-- TODO JENKINS-73316 https://github.com/jenkinsci/saml-plugin/pull/421 -->
+        <version>4.484.v2ece45a_5814d</version>
       </dependency>
       <dependency>
         <groupId>org.jenkins-ci.plugins</groupId>

diff --git a/sample-plugin/pom.xml b/sample-plugin/pom.xml
@@ -14,7 +14,8 @@
   <properties>
     <changelist>999999-SNAPSHOT</changelist>
     <bom>weekly</bom>
-    <jenkins.version>2.474</jenkins.version>
+    <!-- TODO JENKINS-73278 https://ci.jenkins.io/job/Core/job/jenkins/job/jakarta/ -->
+    <jenkins.version>2.475-rc35339.4f67784ce924</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 +29,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>