Merge branch 'master' into add-docker-workflow-plugin

jenkinsci · Sep 5, 2023 · ef59e02 · ef59e02
2 parents c056d81 + ccce372
commit ef59e02
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/bom-weekly/pom.xml b/bom-weekly/pom.xml
@@ -566,7 +566,7 @@
       <dependency>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>github-branch-source</artifactId>
-        <version>1732.v3f1889a_c475b_</version>
+        <version>1734.v8a_ed3a_653490</version>
       </dependency>
       <dependency>
         <groupId>org.jenkins-ci.plugins</groupId>

diff --git a/excludes.txt b/excludes.txt
@@ -16,9 +16,6 @@ jenkins.plugins.http_request.HttpRequestStepRoundTripTest
 # TODO flakes on CI for inscrutable reasons
 org.jenkinsci.plugins.durabletask.BourneShellScriptTest
 
-# TODO https://github.com/jenkinsci/github-branch-source-plugin/pull/724
-org.jenkinsci.plugins.github_branch_source.GitHubSCMSourceTraitsTest#given__configuredInstance__when__uninstantiating__then__deprecatedFieldsIgnored
-
 # TODO tends to run out of memory
 org.jenkinsci.plugins.pipeline.modeldefinition.TriggersTest
 

diff --git 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.421</jenkins.version>
+    <jenkins.version>2.422</jenkins.version>
     <spotless.check.skip>false</spotless.check.skip>
   </properties>
   <dependencyManagement>