Skip to content

Commit

Permalink
Upgrading versions and various cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
ghale committed Feb 21, 2016
1 parent b36f4d2 commit 6708e3a
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 15 deletions.
14 changes: 8 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ buildscript {

dependencies {
classpath 'org.gradle.api.plugins:gradle-nexus-plugin:0.7'
classpath "com.gradle.publish:plugin-publish-plugin:0.9.0"
classpath "com.gradle.publish:plugin-publish-plugin:0.9.3"
}
}

Expand Down Expand Up @@ -44,13 +44,11 @@ dependencies {
compile(
gradleApi(),
localGroovy(),
'xmlunit:xmlunit:1.3',
'org.apache.ivy:ivy:2.2.0'
'xmlunit:xmlunit:1.3'
)

compile('org.codehaus.groovy.modules.http-builder:http-builder:0.6') {
compile('org.codehaus.groovy.modules.http-builder:http-builder:0.7.2') {
exclude(module: 'groovy')
exclude(module: 'xercesImpl')
}

compile('org.jenkins-ci.plugins:job-dsl-core:1.42') {
Expand All @@ -59,7 +57,11 @@ dependencies {

compile 'com.google.guava:guava:19.0'

testCompile('com.netflix.nebula:nebula-test:1.12.5') {
testCompile('com.netflix.nebula:nebula-test:3.1.0') {
exclude(module: 'groovy-all')
}

testCompile('org.spockframework:spock-core:1.0-groovy-2.4') {
exclude(module: 'groovy-all')
}

Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
version=1.3.1
version=1.3.2
group=com.terrafolio
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-1.12-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.11-bin.zip
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
package com.terrafolio.gradle.plugins.jenkins.integTest

import nebula.test.IntegrationSpec
import nebula.test.functional.ExecutionResult

abstract class AbstractJenkinsIntegrationTest extends IntegrationSpec {
def serverName = "test"
def needsCleanup = true

def setup() {
fork = true
buildFile << """
buildscript {
dependencies {
Expand All @@ -28,6 +30,16 @@ abstract class AbstractJenkinsIntegrationTest extends IntegrationSpec {
"""
}

@Override
protected ExecutionResult runTasks(String... tasks) {
ExecutionResult result = super.runTasks(tasks)
println "<========= Standard Output =========>"
println result.standardOutput
println "<========= Standard Error =========>"
println result.standardError
return result
}

def cleanup() {
if (needsCleanup) {
runTasks("deleteJenkinsItems")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,27 +1,25 @@
package com.terrafolio.gradle.plugins.jenkins.test

import com.energizedwork.spock.extensions.TempDirectory
import spock.lang.Ignore
import org.junit.Rule
import org.junit.rules.TemporaryFolder
import spock.lang.Specification

/**
* Created on 6/27/14.
*/
class TempDirSpec extends Specification {
@TempDirectory(clean=false) File tempdir
@Rule TemporaryFolder tempDir = new TemporaryFolder()

@Ignore
def File file(String path, String contents=null) {
File file = new File(tempdir, path)
File file = tempDir.newFile(path)
if (contents) {
file << contents
}
return file
}

@Ignore
def File dir(String path) {
File file = new File(tempdir, path)
File file = tempDir.newFolder(path)
file.mkdirs()
return file
}
Expand Down

0 comments on commit 6708e3a

Please sign in to comment.