Merge remote-tracking branch 'basil/concurrentBuild'

Author: daspilker

docs/Home.md

@@ -35,6 +35,12 @@ Browse the Jenkins issue tracker to see any [open issues](https://issues.jenkins
 * 1.76 (unreleased)
   * added documentation for pitfalls when using multiple Job DSL build steps in a single job
     ([JENKINS-44142](https://issues.jenkins-ci.org/browse/JENKINS-44142))
+  * Fixed [[Dynamic DSL]] problem
+    ([JENKINS-57817](https://issues.jenkins-ci.org/browse/JENKINS-57817))
+  * Deprecated `concurrentBuild` method in `pipelineJob` context, see [Migration](Migration#migrating-to-176)
+    ([JENKINS-53775](https://issues.jenkins-ci.org/browse/JENKINS-53775))
+  * Support for older versions of the [Pipeline Job Plugin](https://plugins.jenkins.io/workflow-job) is deprecated, see
+    [Migration](Migration#migrating-to-169)
 * 1.75 (August 12 2019)
   * Added documentation about mandatory identifier in multi-branch Pipeline job branch sources, the identifier will no
     longer be generated and must be set to a constant and unique value, see [Migration](Migration#migrating-to-175)
@@ -43,8 +49,6 @@ Browse the Jenkins issue tracker to see any [open issues](https://issues.jenkins
     ([JENKINS-54877](https://issues.jenkins-ci.org/browse/JENKINS-54877))
   * Fixed problem with API viewer
     ([JENKINS-51202](https://issues.jenkins-ci.org/browse/JENKINS-51202))
-  * Fixed [[Dynamic DSL]] problem
-    ([JENKINS-57817](https://issues.jenkins-ci.org/browse/JENKINS-57817))
   * Fixed problems when using multiple Job DSL steps in a single seed job
     ([JENKINS-29784](https://issues.jenkins-ci.org/browse/JENKINS-29784),
     [JENKINS-44142](https://issues.jenkins-ci.org/browse/JENKINS-44142))

docs/Migration.md

@@ -1,3 +1,37 @@
+## Migrating to 1.76
+
+### Pipeline: Job Plugin
+
+Support for versions older than 2.4 of the [Pipeline Job Plugin](https://plugins.jenkins.io/workflow-job) is
+[[deprecated|Deprecation-Policy]] and will be removed.
+
+The `concurrentBuild` option for Pipeline jobs causes problems
+([JENKINS-53775](https://issues.jenkins-ci.org/browse/JENKINS-53775)). It is [[deprecated|Deprecation-Policy]] and will
+be removed. It should be replaced by the `disableConcurrentBuilds` job property.
+
+DSL prior to 1.76
+```groovy
+pipelineJob('example-1') {
+    concurrentBuild(false)
+}
+
+pipelineJob('example-2') {
+    concurrentBuild()
+}
+```
+
+DSL since 1.76
+```groovy
+pipelineJob('example-1') {
+    properties {
+        disableConcurrentBuilds()
+    }
+}
+
+pipelineJob('example-2') {
+}
+```
+
 ## Migrating to 1.75
 
 The `id` option in the Git and GitHub branch source contexts is now mandatory

job-dsl-core/src/main/groovy/javaposse/jobdsl/dsl/Job.groovy

@@ -224,18 +224,6 @@ abstract class Job extends Item {
         }
     }
 
-    /**
-     * Allows Jenkins to schedule and execute multiple builds concurrently.
-     *
-     * @since 1.21
-     */
-    void concurrentBuild(boolean allowConcurrentBuild = true) {
-        configure { Node project ->
-            Node node = methodMissing('concurrentBuild', allowConcurrentBuild)
-            project / node
-        }
-    }
-
     /**
      * Compresses the log file after build completion.
      *

job-dsl-core/src/main/groovy/javaposse/jobdsl/dsl/JobParent.groovy

@@ -83,6 +83,7 @@ abstract class JobParent extends Script implements DslFactory {
      */
     @Override
     WorkflowJob pipelineJob(String name, @DslContext(WorkflowJob) Closure closure = null) {
+        jm.logPluginDeprecationWarning('workflow-job', '2.4')
         processItem(name, WorkflowJob, closure)
     }
 

job-dsl-core/src/main/groovy/javaposse/jobdsl/dsl/Project.groovy

@@ -142,6 +142,18 @@ abstract class Project extends Job {
         }
     }
 
+    /**
+     * Allows Jenkins to schedule and execute multiple builds concurrently.
+     *
+     * @since 1.21
+     */
+    void concurrentBuild(boolean allowConcurrentBuild = true) {
+        configure { Node project ->
+            Node node = methodMissing('concurrentBuild', allowConcurrentBuild)
+            project / node
+        }
+    }
+
     /**
      * Adds batch tasks that are not regularly executed to projects, such as releases, integration, archiving.
      * Can be called multiple times to add more batch tasks.

job-dsl-core/src/main/groovy/javaposse/jobdsl/dsl/jobs/WorkflowJob.groovy

@@ -26,4 +26,12 @@ class WorkflowJob extends Job {
             project << context.definitionNode
         }
     }
+
+    @Deprecated
+    void concurrentBuild(boolean allowConcurrentBuild = true) {
+        configure { Node project ->
+            Node node = methodMissing('concurrentBuild', allowConcurrentBuild)
+            project / node
+        }
+    }
 }

job-dsl-core/src/test/groovy/javaposse/jobdsl/dsl/JobParentSpec.groovy

@@ -409,6 +409,7 @@ class JobParentSpec extends Specification {
         job.name == 'test'
         parent.referencedJobs.contains(job)
         1 * jobManagement.requirePlugin('workflow-job', true)
+        1 * jobManagement.logPluginDeprecationWarning('workflow-job', '2.4')
     }
 
     def 'multibranchPipelineJob'() {