Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #94 from daspilker/JENKINS-46899
[JENKINS-46899] fixed support for core versions >= 2.64
  • Loading branch information
daspilker committed Nov 2, 2017
2 parents 0720d28 + a273fb3 commit 6a7cded
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 2 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
@@ -1,5 +1,8 @@
## 0.24.0 (unreleased)

* fixed support for core versions >= 2.64
([JENKINS-46899](https://issues.jenkins-ci.org/browse/JENKINS-46899))

## 0.23.1 (2017-10-10)

* updated to Gradle 3.5.1
Expand Down
Expand Up @@ -167,11 +167,16 @@ class JpiExtension {
[group: 'javax.servlet', name: servletApiArtifact, version: servletApiVersion],
)

jenkinsWar(group: 'org.jenkins-ci.main', name: 'jenkins-war', version: v, ext: 'war')
jenkinsWar(group: 'org.jenkins-ci.main', name: 'jenkins-war', version: v)

if (new VersionNumber(this.coreVersion) < new VersionNumber('2.64')) {
jenkinsTest("org.jenkins-ci.main:jenkins-war:${v}:war-for-test")
} else {
project.configurations.jenkinsTest.extendsFrom(project.configurations.jenkinsWar)
}

jenkinsTest("org.jenkins-ci.main:jenkins-test-harness:${testHarnessVersion}")
jenkinsTest("org.jenkins-ci.main:ui-samples-plugin:${uiSamplesVersion}",
"org.jenkins-ci.main:jenkins-war:${v}:war-for-test",
'junit:junit-dep:4.10')
}
}
Expand Down
Expand Up @@ -273,6 +273,26 @@ class JpiExtensionSpec extends Specification {
'junit:junit-dep:4.10' in dependencies
}

def 'jenkinsTest dependencies for 2.64 or later'() {
setup:
Project project = ProjectBuilder.builder().build()

when:
project.with {
apply plugin: 'jpi'
jenkinsPlugin {
coreVersion = '2.64'
}
}

then:
def dependencies = collectDependencies(project, 'jenkinsTest')
'org.jenkins-ci.main:jenkins-test-harness:2.0' in dependencies
'org.jenkins-ci.main:ui-samples-plugin:2.0' in dependencies
'junit:junit-dep:4.10' in dependencies
project.configurations.jenkinsWar in project.configurations.jenkinsTest.extendsFrom
}

private static collectDependencies(Project project, String configuration) {
project.configurations.getByName(configuration).dependencies.collect {
"${it.group}:${it.name}:${it.version}".toString()
Expand Down

0 comments on commit 6a7cded

Please sign in to comment.