Modernize plugin (#65)

jenkinsci · Jun 28, 2023 · de81901 · de81901
1 parent 4b1b528
commit de81901
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 15 deletions.
diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
@@ -2,6 +2,6 @@
   <extension>
     <groupId>io.jenkins.tools.incrementals</groupId>
     <artifactId>git-changelist-maven-extension</artifactId>
-    <version>1.4</version>
+    <version>1.6</version>
   </extension>
 </extensions>
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1,9 +1,7 @@
 #!/usr/bin/env groovy
 
 /* `buildPlugin` step provided by: https://github.com/jenkins-infra/pipeline-library */
-buildPlugin(configurations: [
-    [platform: 'linux', jdk: '8'],
-    [platform: 'linux', jdk: '11', jenkins: '2.361.3'],
-    [platform: 'linux', jdk: '17', jenkins: '2.375'],
-    [platform: 'windows', jdk: '11'],
+buildPlugin(useContainerAgent: true, configurations: [
+  [platform: 'linux', jdk: 17],
+  [platform: 'windows', jdk: 11],
 ])
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.jenkins-ci.plugins</groupId>
 		<artifactId>plugin</artifactId>
-		<version>4.51</version>
+		<version>4.63</version>
 	</parent>
 
 	<artifactId>conditional-buildstep</artifactId>
@@ -30,9 +30,7 @@
 		<spotbugs.effort>Max</spotbugs.effort>
 		<spotbugs.threshold>Low</spotbugs.threshold>
 		<spotbugs.excludeFilterFile>${project.basedir}/src/spotbugs/spotbugs-excludes.xml</spotbugs.excludeFilterFile>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<maven.javadoc.skip>true</maven.javadoc.skip>
-		<jenkins.version>2.346.3</jenkins.version>
+		<jenkins.version>2.361.4</jenkins.version>
 	</properties>
 	<licenses>
 		<license>
@@ -97,8 +95,8 @@
 		<dependencies>
 			<dependency>
 				<groupId>io.jenkins.tools.bom</groupId>
-				<artifactId>bom-2.346.x</artifactId>
-				<version>1750.v0071fa_4c4a_e3</version>
+				<artifactId>bom-2.361.x</artifactId>
+				<version>2081.v85885a_d2e5c5</version>
 				<scope>import</scope>
 				<type>pom</type>
 			</dependency>

diff --git a/src/main/java/org/jenkinsci/plugins/conditionalbuildstep/ConditionalBuildStepHelper.java b/src/main/java/org/jenkinsci/plugins/conditionalbuildstep/ConditionalBuildStepHelper.java
@@ -27,7 +27,7 @@ private ConditionalBuildStepHelper() {
      * Gets the list of all buildsteps wrapped within any {@link ConditionalBuilder} or {@link SingleConditionalBuilder} from within the given project. Keeps the API backward compatible (Internally
      * calls {@link #getConditionalBuildersFromMavenProject(AbstractProject)})
      * 
-     * @see https://issues.jenkins-ci.org/browse/JENKINS-20543
+     * @see <a href="https://issues.jenkins-ci.org/browse/JENKINS-20543">JENKINS-20543</a>
      * @param p
      *            the project to get all wrapped builders for
      * @param type
@@ -41,7 +41,7 @@ public static <T extends BuildStep> List<T> getContainedBuilders(Project<?, ?> p
     /**
      * Gets the list of all buildsteps wrapped within any {@link ConditionalBuilder} or {@link SingleConditionalBuilder} from within the given project.
      * 
-     * @param p
+     * @param ap
      *            the project to get all wrapped builders for
      * @param type
      *            the type of builders to search for

diff --git a/src/main/java/org/jenkinsci/plugins/conditionalbuildstep/ConditionalBuilder.java b/src/main/java/org/jenkinsci/plugins/conditionalbuildstep/ConditionalBuilder.java
@@ -73,7 +73,7 @@ public class ConditionalBuilder extends Builder implements DependencyDeclarer {
 
     /**
      * @deprecated  No longer needed as part of the Constructor
-     *  Use {@link #ConditionalBuilder(RunCondition, BuildStepRunner, List<Builder>)}
+     *  Use {@link #ConditionalBuilder(RunCondition, BuildStepRunner, List)}
     */
     @Deprecated
     public ConditionalBuilder(RunCondition runCondition, final BuildStepRunner runner) {