Skip to content

Commit 793eaec

Browse files
committed
removed anything that has been deprecated in 1.26
1 parent 1b1129b commit 793eaec

File tree

10 files changed

+9
-104
lines changed

10 files changed

+9
-104
lines changed

docs/Home.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ Have a look at the [Jenkins Job DSL Gradle example](https://github.com/sheehan/j
3737
* The enum argument of `localRepository` for the Maven job and context has changed, see [[Migration]]
3838
* Support for the older versions of the [Multijob Plugin](https://wiki.jenkins-ci.org/display/JENKINS/Multijob+Plugin) is deprecated, see [[Migration]]
3939
* The views closure of the nested view type has been changed, see [[Migration]]
40+
* Removed anything that has been deprecated in 1.26, see [[Migration#migrating-to-126]]
4041
* 1.30 (March 08 2015)
4142
* Added support for [Custom Tools Plugin](https://wiki.jenkins-ci.org/display/JENKINS/Custom+Tools+Plugin)
4243
* Added support for [Flaky Test Handler Plugin](https://wiki.jenkins-ci.org/display/JENKINS/Flaky+Test+Handler+Plugin)

docs/Migration.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,8 +188,6 @@ job {
188188
}
189189
```
190190

191-
## Migrating to 1.29
192-
193191
### Build Timeout
194192

195193
The `javaposse.jobdsl.dsl.helpers.wrapper.WrapperContext.Timeout` enum has been [[deprecated|Deprecation-Policy]]

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

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -184,24 +184,6 @@ class PublisherContext implements Context {
184184
}
185185
}
186186

187-
void archiveJunit(String glob, boolean retainLongStdout, boolean allowClaimingOfFailedTests = false,
188-
boolean publishTestAttachments = false) {
189-
jobManagement.logDeprecationWarning()
190-
archiveJunit(glob) {
191-
if (retainLongStdout) {
192-
delegate.retainLongStdout()
193-
}
194-
testDataPublishers {
195-
if (allowClaimingOfFailedTests) {
196-
delegate.allowClaimingOfFailedTests()
197-
}
198-
if (publishTestAttachments) {
199-
delegate.publishTestAttachments()
200-
}
201-
}
202-
}
203-
}
204-
205187
/**
206188
* <xunit>
207189
* <types>

job-dsl-core/src/main/groovy/javaposse/jobdsl/dsl/helpers/triggers/GerritContext.groovy

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,12 @@ package javaposse.jobdsl.dsl.helpers.triggers
33
import javaposse.jobdsl.dsl.Context
44
import javaposse.jobdsl.dsl.ContextHelper
55
import javaposse.jobdsl.dsl.DslContext
6-
import javaposse.jobdsl.dsl.JobManagement
76

87
class GerritContext implements Context {
9-
GerritEventContext eventContext
8+
GerritEventContext eventContext = new GerritEventContext()
109
Closure configureClosure
1110
List projects = []
1211

13-
GerritContext(JobManagement jobManagement) {
14-
this.eventContext = new GerritEventContext(jobManagement)
15-
}
16-
1712
Integer startedCodeReview = null
1813
Integer startedVerified = null
1914

job-dsl-core/src/main/groovy/javaposse/jobdsl/dsl/helpers/triggers/GerritEventContext.groovy

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,10 @@
11
package javaposse.jobdsl.dsl.helpers.triggers
22

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

65
class GerritEventContext implements Context {
7-
private final JobManagement jobManagement
86
final List<String> eventShortNames = []
97

10-
GerritEventContext(JobManagement jobManagement) {
11-
this.jobManagement = jobManagement
12-
}
13-
148
void changeAbandoned() {
159
eventShortNames << 'ChangeAbandoned'
1610
}
@@ -38,9 +32,4 @@ class GerritEventContext implements Context {
3832
void refUpdated() {
3933
eventShortNames << 'RefUpdated'
4034
}
41-
42-
void propertyMissing(String shortName) {
43-
jobManagement.logDeprecationWarning()
44-
eventShortNames << shortName
45-
}
4635
}

job-dsl-core/src/main/groovy/javaposse/jobdsl/dsl/helpers/triggers/TriggerContext.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ class TriggerContext implements Context {
197197
*/
198198
void gerrit(@DslContext(GerritContext) Closure contextClosure = null) {
199199
// See what they set up in the contextClosure before generating xml
200-
GerritContext gerritContext = new GerritContext(jobManagement)
200+
GerritContext gerritContext = new GerritContext()
201201
ContextHelper.executeInContext(contextClosure, gerritContext)
202202

203203
NodeBuilder nodeBuilder = new NodeBuilder()

job-dsl-core/src/main/groovy/javaposse/jobdsl/dsl/helpers/wrapper/WrapperContext.groovy

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -302,13 +302,6 @@ class WrapperContext implements Context {
302302
}
303303
}
304304

305-
void xvnc(boolean takeScreenshotAtEndOfBuild) {
306-
jobManagement.logDeprecationWarning()
307-
xvnc {
308-
takeScreenshot(takeScreenshotAtEndOfBuild)
309-
}
310-
}
311-
312305
/**
313306
* <org.jenkinsci.plugins.xvfb.XvfbBuildWrapper>
314307
* <installationName>xvfb</installationName>

job-dsl-core/src/test/groovy/javaposse/jobdsl/dsl/helpers/publisher/PublisherContextSpec.groovy

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -179,22 +179,6 @@ class PublisherContextSpec extends Specification {
179179
archiveNode.allowEmptyArchive.isEmpty()
180180
}
181181

182-
def 'call deprecated junit archive with all args'() {
183-
when:
184-
context.archiveJunit('include/*', true, true, true)
185-
186-
then:
187-
with(context.publisherNodes[0]) {
188-
name() == 'hudson.tasks.junit.JUnitResultArchiver'
189-
children().size() == 3
190-
testResults[0].value() == 'include/*'
191-
keepLongStdio[0].value() == true
192-
testDataPublishers[0].children().size() == 2
193-
testDataPublishers[0].'hudson.plugins.claim.ClaimTestDataPublisher'[0] != null
194-
testDataPublishers[0].'hudson.plugins.junitattachments.AttachmentPublisher'[0] != null
195-
}
196-
}
197-
198182
def 'call junit archive with all args'() {
199183
when:
200184
context.archiveJunit('include/*') {

job-dsl-core/src/test/groovy/javaposse/jobdsl/dsl/helpers/triggers/TriggerContextSpec.groovy

Lines changed: 6 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -389,8 +389,8 @@ class TriggerContextSpec extends Specification {
389389
when:
390390
context.gerrit {
391391
events {
392-
ChangeMerged
393-
DraftPublished
392+
changeMerged()
393+
draftPublished()
394394
}
395395
project('reg_exp:myProject', ['ant:feature-branch', 'plain:origin/refs/mybranch']) // full access
396396
project('test-project', '**') // simplified
@@ -452,34 +452,12 @@ class TriggerContextSpec extends Specification {
452452
]
453453
}
454454

455-
def 'call gerrit trigger with deprecated events'(String event) {
456-
when:
457-
context.gerrit {
458-
events {
459-
delegate."${event}"
460-
}
461-
}
462-
463-
then:
464-
with(context.triggerNodes[0].triggerOnEvents[0]) {
465-
children().size() == 1
466-
children()[0].name() ==
467-
"com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.events.Plugin${event}Event"
468-
}
469-
470-
where:
471-
event << [
472-
'ChangeAbandoned', 'ChangeMerged', 'ChangeRestored', 'CommentAdded', 'DraftPublished',
473-
'PatchsetCreated', 'RefUpdated'
474-
]
475-
}
476-
477455
def 'call gerrit trigger and verify build status value settings'() {
478456
when:
479457
context.gerrit {
480458
events {
481-
PatchsetCreated
482-
DraftPublished
459+
patchsetCreated()
460+
draftPublished()
483461
}
484462

485463
project('test-project', '**')
@@ -500,8 +478,8 @@ class TriggerContextSpec extends Specification {
500478
when:
501479
context.gerrit {
502480
events {
503-
PatchsetCreated
504-
DraftPublished
481+
patchsetCreated()
482+
draftPublished()
505483
}
506484

507485
project('test-project', '**')

job-dsl-core/src/test/groovy/javaposse/jobdsl/dsl/helpers/wrapper/WrapperContextSpec.groovy

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -367,21 +367,6 @@ class WrapperContextSpec extends Specification {
367367
wrapper.useXauthority[0].value() == true
368368
}
369369

370-
def 'xvnc with takeScreenshot arg' () {
371-
setup:
372-
mockJobManagement.getPluginVersion('xvnc') >> new VersionNumber('1.16')
373-
374-
when:
375-
context.xvnc(true)
376-
377-
then:
378-
context.wrapperNodes[0].name() == 'hudson.plugins.xvnc.Xvnc'
379-
def wrapper = context.wrapperNodes[0]
380-
wrapper.children().size() == 2
381-
wrapper.takeScreenshot[0].value() == true
382-
wrapper.useXauthority[0].value() == true
383-
}
384-
385370
def 'xvnc with closure' () {
386371
setup:
387372
mockJobManagement.getPluginVersion('xvnc') >> new VersionNumber('1.16')

0 commit comments

Comments
 (0)