Merge branch 'deprecations'

Author: daspilker

docs/Home.md

@@ -32,6 +32,7 @@ Browse the Jenkins issue tracker to see any [open issues](https://issues.jenkins
  * Updated [Structs Plugin](https://github.com/jenkinsci/structs-plugin) dependency to version 1.2
  * Improved support for [[Automatically Generated DSL]]: print deprecation warnings and show deprecated methods in API
    viewer
+ * Removed anything that has been deprecated in 1.42, see [Migration](Migration#migrating-to-142)
 * 1.48 (June 24 2016)
  * Added option to ignore missing DSL script files or empty wildcards
    ([JENKINS-34060](https://issues.jenkins-ci.org/browse/JENKINS-34060))

job-dsl-core/src/main/groovy/javaposse/jobdsl/dsl/helpers/publisher/FlexiblePublisherContext.groovy

@@ -5,23 +5,14 @@ import javaposse.jobdsl.dsl.ContextHelper
 import javaposse.jobdsl.dsl.DslContext
 import javaposse.jobdsl.dsl.Item
 import javaposse.jobdsl.dsl.JobManagement
-import javaposse.jobdsl.dsl.RequiresPlugin
-import javaposse.jobdsl.dsl.helpers.step.RunConditionContext
-import javaposse.jobdsl.dsl.helpers.step.StepContext
 
 class FlexiblePublisherContext extends AbstractContext {
     protected final Item item
-    Node condition
-    List<Node> actions = []
     List<ConditionalActionsContext> conditionalActions = []
 
     FlexiblePublisherContext(JobManagement jobManagement, Item item) {
         super(jobManagement)
         this.item = item
-
-        RunConditionContext context = new RunConditionContext(jobManagement, item)
-        context.alwaysRun()
-        condition = context.condition
     }
 
     /**
@@ -34,35 +25,4 @@ class FlexiblePublisherContext extends AbstractContext {
         ContextHelper.executeInContext(closure, context)
         conditionalActions << context
     }
-
-    /**
-     * Specifies the condition to evaluate before executing publishers or build steps.
-     */
-    @Deprecated
-    void condition(@DslContext(RunConditionContext) Closure closure) {
-        RunConditionContext context = new RunConditionContext(jobManagement, item)
-        ContextHelper.executeInContext(closure, context)
-        condition = context.condition
-    }
-
-    /**
-     * Adds one or more build steps which will be executed conditionally.
-     */
-    @RequiresPlugin(id = 'any-buildstep')
-    @Deprecated
-    void step(@DslContext(StepContext) Closure closure) {
-        StepContext stepContext = new StepContext(jobManagement, item)
-        ContextHelper.executeInContext(closure, stepContext)
-        actions.addAll(stepContext.stepNodes)
-    }
-
-    /**
-     * Adds one or more post-build actions which will be executed conditionally.
-     */
-    @Deprecated
-    void publisher(@DslContext(PublisherContext) Closure closure) {
-        PublisherContext publisherContext = new PublisherContext(jobManagement, item)
-        ContextHelper.executeInContext(closure, publisherContext)
-        actions.addAll(publisherContext.publisherNodes)
-    }
 }

job-dsl-core/src/main/groovy/javaposse/jobdsl/dsl/helpers/publisher/PostBuildScriptsContext.groovy

@@ -6,7 +6,6 @@ import javaposse.jobdsl.dsl.DslContext
 import javaposse.jobdsl.dsl.Item
 import javaposse.jobdsl.dsl.JobManagement
 import javaposse.jobdsl.dsl.helpers.step.StepContext
-import javaposse.jobdsl.dsl.RequiresPlugin
 
 class PostBuildScriptsContext extends AbstractContext {
     final StepContext stepContext
@@ -38,7 +37,6 @@ class PostBuildScriptsContext extends AbstractContext {
      *
      * @since 1.42
      */
-    @RequiresPlugin(id = 'postbuildscript', minimumVersion = '0.17')
     void onlyIfBuildFails(boolean onlyIfBuildFails = true) {
         this.onlyIfBuildFails = onlyIfBuildFails
     }
@@ -48,7 +46,6 @@ class PostBuildScriptsContext extends AbstractContext {
      *
      * @since 1.42
      */
-    @RequiresPlugin(id = 'postbuildscript', minimumVersion = '0.17')
     void markBuildUnstable(boolean markBuildUnstable = true) {
         this.markBuildUnstable = markBuildUnstable
     }

job-dsl-core/src/main/groovy/javaposse/jobdsl/dsl/helpers/publisher/PublisherContext.groovy

@@ -1107,13 +1107,6 @@ class PublisherContext extends AbstractExtensibleContext {
 
         publisherNodes << new NodeBuilder().'org.jenkins__ci.plugins.flexible__publish.FlexiblePublisher' {
             delegate.publishers {
-                if (context.actions) {
-                    Node publisher = 'org.jenkins__ci.plugins.flexible__publish.ConditionalPublisher' {
-                        publisherList(context.actions)
-                        runner(class: 'org.jenkins_ci.plugins.run_condition.BuildStepRunner$Fail')
-                    }
-                    publisher.append(toNamedNode('condition', context.condition))
-                }
                 context.conditionalActions.each { ConditionalActionsContext conditionalActionsContext ->
                     Node publisher = 'org.jenkins__ci.plugins.flexible__publish.ConditionalPublisher' {
                         publisherList(conditionalActionsContext.actions)
@@ -1282,11 +1275,9 @@ class PublisherContext extends AbstractExtensibleContext {
      *
      * @since 1.17
      */
-    @RequiresPlugin(id = 'tasks')
+    @RequiresPlugin(id = 'tasks', minimumVersion = '4.41')
     void tasks(String pattern, excludePattern = '', high = '', normal = '', low = '', ignoreCase = false,
                @DslContext(TaskScannerContext) Closure closure = null) {
-        jobManagement.logPluginDeprecationWarning('tasks', '4.41')
-
         TaskScannerContext context = new TaskScannerContext(jobManagement)
         ContextHelper.executeInContext(closure, context)
 
@@ -1297,9 +1288,7 @@ class PublisherContext extends AbstractExtensibleContext {
             delegate.low(low)
             delegate.ignoreCase(ignoreCase)
             delegate.excludePattern(excludePattern)
-            if (jobManagement.isMinimumPluginVersionInstalled('tasks', '4.41')) {
-                asRegexp(context.regularExpression)
-            }
+            asRegexp(context.regularExpression)
         }
     }
 
@@ -1409,20 +1398,16 @@ class PublisherContext extends AbstractExtensibleContext {
      *
      * @since 1.31
      */
-    @RequiresPlugin(id = 'postbuildscript')
+    @RequiresPlugin(id = 'postbuildscript', minimumVersion = '0.17')
     void postBuildScripts(@DslContext(PostBuildScriptsContext) Closure closure) {
-        jobManagement.logPluginDeprecationWarning('postbuildscript', '0.17')
-
         PostBuildScriptsContext context = new PostBuildScriptsContext(jobManagement, item)
         ContextHelper.executeInContext(closure, context)
 
         publisherNodes << new NodeBuilder().'org.jenkinsci.plugins.postbuildscript.PostBuildScript' {
             buildSteps(context.stepContext.stepNodes)
             scriptOnlyIfSuccess(context.onlyIfBuildSucceeds)
-            if (jobManagement.isMinimumPluginVersionInstalled('postbuildscript', '0.17')) {
-                scriptOnlyIfFailure(context.onlyIfBuildFails)
-                markBuildUnstable(context.markBuildUnstable)
-            }
+            scriptOnlyIfFailure(context.onlyIfBuildFails)
+            markBuildUnstable(context.markBuildUnstable)
         }
     }
 

job-dsl-core/src/main/groovy/javaposse/jobdsl/dsl/helpers/publisher/TaskScannerContext.groovy

@@ -1,7 +1,6 @@
 package javaposse.jobdsl.dsl.helpers.publisher
 
 import javaposse.jobdsl.dsl.JobManagement
-import javaposse.jobdsl.dsl.RequiresPlugin
 
 class TaskScannerContext extends StaticAnalysisContext {
     protected final JobManagement jobManagement
@@ -17,7 +16,6 @@ class TaskScannerContext extends StaticAnalysisContext {
      *
      * @since 1.42
      */
-    @RequiresPlugin(id = 'tasks', minimumVersion = '4.41')
     void regularExpression(boolean regularExpression = true) {
         this.regularExpression = regularExpression
     }