Skip to content

Commit c09fa19

Browse files
daspilkerdaspilker
committed
Merge branch 'deprecations'
2 parents 8fce50b + add0b1d commit c09fa19

7 files changed

Lines changed: 50 additions & 247 deletions

File tree

‎docs/Home.md‎

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

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

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,14 @@ import javaposse.jobdsl.dsl.ContextHelper
55
import javaposse.jobdsl.dsl.DslContext
66
import javaposse.jobdsl.dsl.Item
77
import javaposse.jobdsl.dsl.JobManagement
8-
import javaposse.jobdsl.dsl.RequiresPlugin
9-
import javaposse.jobdsl.dsl.helpers.step.RunConditionContext
10-
import javaposse.jobdsl.dsl.helpers.step.StepContext
118

129
class FlexiblePublisherContext extends AbstractContext {
1310
protected final Item item
14-
Node condition
15-
List<Node> actions = []
1611
List<ConditionalActionsContext> conditionalActions = []
1712

1813
FlexiblePublisherContext(JobManagement jobManagement, Item item) {
1914
super(jobManagement)
2015
this.item = item
21-
22-
RunConditionContext context = new RunConditionContext(jobManagement, item)
23-
context.alwaysRun()
24-
condition = context.condition
2516
}
2617

2718
/**
@@ -34,35 +25,4 @@ class FlexiblePublisherContext extends AbstractContext {
3425
ContextHelper.executeInContext(closure, context)
3526
conditionalActions << context
3627
}
37-
38-
/**
39-
* Specifies the condition to evaluate before executing publishers or build steps.
40-
*/
41-
@Deprecated
42-
void condition(@DslContext(RunConditionContext) Closure closure) {
43-
RunConditionContext context = new RunConditionContext(jobManagement, item)
44-
ContextHelper.executeInContext(closure, context)
45-
condition = context.condition
46-
}
47-
48-
/**
49-
* Adds one or more build steps which will be executed conditionally.
50-
*/
51-
@RequiresPlugin(id = 'any-buildstep')
52-
@Deprecated
53-
void step(@DslContext(StepContext) Closure closure) {
54-
StepContext stepContext = new StepContext(jobManagement, item)
55-
ContextHelper.executeInContext(closure, stepContext)
56-
actions.addAll(stepContext.stepNodes)
57-
}
58-
59-
/**
60-
* Adds one or more post-build actions which will be executed conditionally.
61-
*/
62-
@Deprecated
63-
void publisher(@DslContext(PublisherContext) Closure closure) {
64-
PublisherContext publisherContext = new PublisherContext(jobManagement, item)
65-
ContextHelper.executeInContext(closure, publisherContext)
66-
actions.addAll(publisherContext.publisherNodes)
67-
}
6828
}

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import javaposse.jobdsl.dsl.DslContext
66
import javaposse.jobdsl.dsl.Item
77
import javaposse.jobdsl.dsl.JobManagement
88
import javaposse.jobdsl.dsl.helpers.step.StepContext
9-
import javaposse.jobdsl.dsl.RequiresPlugin
109

1110
class PostBuildScriptsContext extends AbstractContext {
1211
final StepContext stepContext
@@ -38,7 +37,6 @@ class PostBuildScriptsContext extends AbstractContext {
3837
*
3938
* @since 1.42
4039
*/
41-
@RequiresPlugin(id = 'postbuildscript', minimumVersion = '0.17')
4240
void onlyIfBuildFails(boolean onlyIfBuildFails = true) {
4341
this.onlyIfBuildFails = onlyIfBuildFails
4442
}
@@ -48,7 +46,6 @@ class PostBuildScriptsContext extends AbstractContext {
4846
*
4947
* @since 1.42
5048
*/
51-
@RequiresPlugin(id = 'postbuildscript', minimumVersion = '0.17')
5249
void markBuildUnstable(boolean markBuildUnstable = true) {
5350
this.markBuildUnstable = markBuildUnstable
5451
}

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

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1107,13 +1107,6 @@ class PublisherContext extends AbstractExtensibleContext {
11071107

11081108
publisherNodes << new NodeBuilder().'org.jenkins__ci.plugins.flexible__publish.FlexiblePublisher' {
11091109
delegate.publishers {
1110-
if (context.actions) {
1111-
Node publisher = 'org.jenkins__ci.plugins.flexible__publish.ConditionalPublisher' {
1112-
publisherList(context.actions)
1113-
runner(class: 'org.jenkins_ci.plugins.run_condition.BuildStepRunner$Fail')
1114-
}
1115-
publisher.append(toNamedNode('condition', context.condition))
1116-
}
11171110
context.conditionalActions.each { ConditionalActionsContext conditionalActionsContext ->
11181111
Node publisher = 'org.jenkins__ci.plugins.flexible__publish.ConditionalPublisher' {
11191112
publisherList(conditionalActionsContext.actions)
@@ -1282,11 +1275,9 @@ class PublisherContext extends AbstractExtensibleContext {
12821275
*
12831276
* @since 1.17
12841277
*/
1285-
@RequiresPlugin(id = 'tasks')
1278+
@RequiresPlugin(id = 'tasks', minimumVersion = '4.41')
12861279
void tasks(String pattern, excludePattern = '', high = '', normal = '', low = '', ignoreCase = false,
12871280
@DslContext(TaskScannerContext) Closure closure = null) {
1288-
jobManagement.logPluginDeprecationWarning('tasks', '4.41')
1289-
12901281
TaskScannerContext context = new TaskScannerContext(jobManagement)
12911282
ContextHelper.executeInContext(closure, context)
12921283

@@ -1297,9 +1288,7 @@ class PublisherContext extends AbstractExtensibleContext {
12971288
delegate.low(low)
12981289
delegate.ignoreCase(ignoreCase)
12991290
delegate.excludePattern(excludePattern)
1300-
if (jobManagement.isMinimumPluginVersionInstalled('tasks', '4.41')) {
1301-
asRegexp(context.regularExpression)
1302-
}
1291+
asRegexp(context.regularExpression)
13031292
}
13041293
}
13051294

@@ -1409,20 +1398,16 @@ class PublisherContext extends AbstractExtensibleContext {
14091398
*
14101399
* @since 1.31
14111400
*/
1412-
@RequiresPlugin(id = 'postbuildscript')
1401+
@RequiresPlugin(id = 'postbuildscript', minimumVersion = '0.17')
14131402
void postBuildScripts(@DslContext(PostBuildScriptsContext) Closure closure) {
1414-
jobManagement.logPluginDeprecationWarning('postbuildscript', '0.17')
1415-
14161403
PostBuildScriptsContext context = new PostBuildScriptsContext(jobManagement, item)
14171404
ContextHelper.executeInContext(closure, context)
14181405

14191406
publisherNodes << new NodeBuilder().'org.jenkinsci.plugins.postbuildscript.PostBuildScript' {
14201407
buildSteps(context.stepContext.stepNodes)
14211408
scriptOnlyIfSuccess(context.onlyIfBuildSucceeds)
1422-
if (jobManagement.isMinimumPluginVersionInstalled('postbuildscript', '0.17')) {
1423-
scriptOnlyIfFailure(context.onlyIfBuildFails)
1424-
markBuildUnstable(context.markBuildUnstable)
1425-
}
1409+
scriptOnlyIfFailure(context.onlyIfBuildFails)
1410+
markBuildUnstable(context.markBuildUnstable)
14261411
}
14271412
}
14281413

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package javaposse.jobdsl.dsl.helpers.publisher
22

33
import javaposse.jobdsl.dsl.JobManagement
4-
import javaposse.jobdsl.dsl.RequiresPlugin
54

65
class TaskScannerContext extends StaticAnalysisContext {
76
protected final JobManagement jobManagement
@@ -17,7 +16,6 @@ class TaskScannerContext extends StaticAnalysisContext {
1716
*
1817
* @since 1.42
1918
*/
20-
@RequiresPlugin(id = 'tasks', minimumVersion = '4.41')
2119
void regularExpression(boolean regularExpression = true) {
2220
this.regularExpression = regularExpression
2321
}

0 commit comments

Comments
 (0)