[FIXED JENKINS-33325] Deprecate workflowJob and multibranchWorkflowJob

jenkinsci · May 20, 2016 · e6b4e63 · e6b4e63
1 parent 14b5a0d
commit e6b4e63
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/job-dsl-core/src/main/groovy/javaposse/jobdsl/dsl/DslFactory.groovy b/job-dsl-core/src/main/groovy/javaposse/jobdsl/dsl/DslFactory.groovy
@@ -130,16 +130,20 @@ interface DslFactory extends ViewFactory {
      * Create or updates a workflow job.
      *
      * @since 1.30
+     * @deprecated as of 1.47. Use #pipelineJob(java.lang.String, groovy.lang.Closure) instead.
      * @see #workflowJob(java.lang.String, groovy.lang.Closure)
      */
+    @Deprecated
     @RequiresPlugin(id = 'workflow-aggregator')
     WorkflowJob workflowJob(String name)
 
     /**
      * Create or updates a workflow job.
      *
      * @since 1.31
+     * @deprecated as of 1.47. Use #pipelineJob(java.lang.String, groovy.lang.Closure) instead.
      */
+    @Deprecated
     @RequiresPlugin(id = 'workflow-aggregator')
     WorkflowJob workflowJob(String name, @DslContext(WorkflowJob) Closure closure)
 
@@ -166,16 +170,20 @@ interface DslFactory extends ViewFactory {
      * Create or updates a multibranch workflow job.
      *
      * @since 1.42
+     * @deprecated as of 1.47. Use #multibranchPipelineJob(java.lang.String, groovy.lang.Closure) instead.
      * @see #multibranchWorkflowJob(java.lang.String, groovy.lang.Closure)
      */
+    @Deprecated
     @RequiresPlugin(id = 'workflow-multibranch', minimumVersion = '1.12')
     MultibranchWorkflowJob multibranchWorkflowJob(String name)
 
     /**
      * Creates or updates a multibranch workflow job.
      *
      * @since 1.42
+     * @deprecated as of 1.47. Use #multibranchPipelineJob(java.lang.String, groovy.lang.Closure) instead.
      */
+    @Deprecated
     @RequiresPlugin(id = 'workflow-multibranch', minimumVersion = '1.12')
     MultibranchWorkflowJob multibranchWorkflowJob(String name, @DslContext(MultibranchWorkflowJob) Closure closure)
 

diff --git a/job-dsl-core/src/main/groovy/javaposse/jobdsl/dsl/JobParent.groovy b/job-dsl-core/src/main/groovy/javaposse/jobdsl/dsl/JobParent.groovy
@@ -88,7 +88,9 @@ abstract class JobParent extends Script implements DslFactory {
 
     /**
      * @since 1.30
+     * @deprecated as of 1.47. Use #pipelineJob(java.lang.String, groovy.lang.Closure) instead.
      */
+    @Deprecated
     @Override
     WorkflowJob workflowJob(String name, @DslContext(WorkflowJob) Closure closure = null) {
         processItem(name, WorkflowJob, closure)
@@ -104,6 +106,7 @@ abstract class JobParent extends Script implements DslFactory {
 
     /**
      * @since 1.42
+     * @deprecated as of 1.47. Use #multibranchPipelineJob(java.lang.String, groovy.lang.Closure) instead.
      */
     @Override
     MultibranchWorkflowJob multibranchWorkflowJob(String name,