Merge branch 'master' into master

.github/CODEOWNERS

@@ -0,0 +1 @@
+* @jenkinsci/conditional-buildstep-plugin-developers

.github/dependabot.yml

@@ -1,9 +1,16 @@
-# See the documentation for all configuration options:
-# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
-
+# https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuring-dependabot-version-updates
+---
 version: 2
 updates:
-- package-ecosystem: "maven"
-  directory: "/" # Location of package manifests
-  schedule:
-    interval: "weekly"
+  - package-ecosystem: "maven"
+    directory: "/"
+    labels:
+      - "dependencies"
+    schedule:
+      interval: "monthly"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    labels:
+      - "skip-changelog"
+    schedule:
+      interval: "monthly"

.github/workflows/changelog.yml

@@ -15,6 +15,6 @@ jobs:
       # Drafts your next Release notes as Pull Requests are merged into "master"
       - name: Generate GitHub Release Draft
         id: release-drafter
-        uses: release-drafter/release-drafter@v5.12.1
+        uses: release-drafter/release-drafter@v5.25.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.mvn/extensions.xml

@@ -2,6 +2,6 @@
   <extension>
     <groupId>io.jenkins.tools.incrementals</groupId>
     <artifactId>git-changelist-maven-extension</artifactId>
-    <version>1.6</version>
+    <version>1.7</version>
   </extension>
 </extensions>

Jenkinsfile

@@ -1,7 +1,10 @@
-#!/usr/bin/env groovy
-
-/* `buildPlugin` step provided by: https://github.com/jenkins-infra/pipeline-library */
-buildPlugin(useContainerAgent: true, configurations: [
-  [platform: 'linux', jdk: 17],
-  [platform: 'windows', jdk: 11],
+/*
+ See the documentation for more options:
+ https://github.com/jenkins-infra/pipeline-library/
+*/
+buildPlugin(
+  useContainerAgent: true, // Set to `false` if you need to use Docker for containerized tests
+  configurations: [
+    [platform: 'linux', jdk: 21],
+    [platform: 'windows', jdk: 17],
 ])

pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.jenkins-ci.plugins</groupId>
 		<artifactId>plugin</artifactId>
-		<version>4.63</version>
+		<version>4.75</version>
 	</parent>
 
 	<artifactId>conditional-buildstep</artifactId>
@@ -19,18 +19,18 @@
 	<url>https://plugins.jenkins.io/conditional-buildstep/</url>
 	<scm>
 		<connection>scm:git:https://github.com/${gitHubRepo}.git</connection>
-		<developerConnection>scm:git:ssh://[email protected]/${gitHubRepo}.git</developerConnection>
+		<developerConnection>scm:git:[email protected]:${gitHubRepo}.git</developerConnection>
 		<url>https://github.com/${gitHubRepo}</url>
 	  <tag>${scmTag}</tag>
   </scm>
 	<properties>
-		<revision>1.4.3</revision>
+		<revision>1.4.4</revision>
 		<changelist>-SNAPSHOT</changelist>
 		<gitHubRepo>jenkinsci/conditional-buildstep-plugin</gitHubRepo>
 		<spotbugs.effort>Max</spotbugs.effort>
 		<spotbugs.threshold>Low</spotbugs.threshold>
 		<spotbugs.excludeFilterFile>${project.basedir}/src/spotbugs/spotbugs-excludes.xml</spotbugs.excludeFilterFile>
-		<jenkins.version>2.361.4</jenkins.version>
+		<jenkins.version>2.387.3</jenkins.version>
 	</properties>
 	<licenses>
 		<license>
@@ -62,12 +62,10 @@
 		<dependency>
 			<groupId>org.jenkins-ci.plugins</groupId>
 			<artifactId>run-condition</artifactId>
-			<version>1.5</version>
 		</dependency>
 		<dependency>
 			<groupId>org.jenkins-ci.main</groupId>
 			<artifactId>maven-plugin</artifactId>
-			<version>3.16</version>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
@@ -95,8 +93,8 @@
 		<dependencies>
 			<dependency>
 				<groupId>io.jenkins.tools.bom</groupId>
-				<artifactId>bom-2.361.x</artifactId>
-				<version>2081.v85885a_d2e5c5</version>
+				<artifactId>bom-2.387.x</artifactId>
+				<version>2543.vfb_1a_5fb_9496d</version>
 				<scope>import</scope>
 				<type>pom</type>
 			</dependency>

src/main/resources/org/jenkinsci/plugins/conditionalbuildstep/ConditionalBuilder/config.jelly

@@ -1,5 +1,5 @@
 <?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:cb="/lib/conditionalbuildstep">
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
 
 	<f:entry>
 		<f:dropdownDescriptorSelector title="${%condition}" field="runCondition" descriptors="${descriptor.runConditions}" />
@@ -8,14 +8,14 @@
 	<f:block>
 		<div style="padding-left: 2em">
 			<fieldset style="margin-bottom:1em">
-				<cb:blockWrapper>
+				<div>
 					<f:section title="${%stepssection}">
 						<f:nested>
 							<f:hetero-list name="conditionalbuilders" hasHeader="true" descriptors="${descriptor.getBuilderDescriptors(it)}" items="${instance.conditionalbuilders}"
 								addCaption="${%Add step to condition}" />
 						</f:nested>
 					</f:section>
-				</cb:blockWrapper>
+				</div>
 			</fieldset>
 		</div>
 	</f:block>