diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 87b738cbd..5c2d1cf01 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index fbb7f9852..9d3f9715d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Jan 07 23:10:24 CET 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionSha256Sum=abc10bcedb58806e8654210f96031db541bcd2d6fc3161e81cb0572d6a15e821 +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-all.zip diff --git a/gradlew b/gradlew index af6708ff2..83f2acfdc 100755 --- a/gradlew +++ b/gradlew @@ -1,5 +1,21 @@ #!/usr/bin/env sh +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + ############################################################################## ## ## Gradle start up script for UN*X @@ -28,7 +44,7 @@ APP_NAME="Gradle" APP_BASE_NAME=`basename "$0"` # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m"' +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" @@ -109,8 +125,8 @@ if $darwin; then GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" fi -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` JAVACMD=`cygpath --unix "$JAVACMD"` diff --git a/gradlew.bat b/gradlew.bat index 0f8d5937c..24467a141 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,3 +1,19 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + @if "%DEBUG%" == "" @echo off @rem ########################################################################## @rem @@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome diff --git a/job-dsl-plugin/build.gradle b/job-dsl-plugin/build.gradle index f5058e700..7cf78e856 100644 --- a/job-dsl-plugin/build.gradle +++ b/job-dsl-plugin/build.gradle @@ -11,7 +11,7 @@ buildscript { } plugins { - id 'org.jenkins-ci.jpi' version '0.28.1' + id 'org.jenkins-ci.jpi' version '0.38.0' } description = 'Jenkins plugin to leverage job-dsl-core to programmatic create jobs from inside Jenkins.' @@ -67,6 +67,7 @@ test { showStandardStreams = true } */ + systemProperty 'jenkins.test.noSpaceInTmpDirs', 'true' } war { diff --git a/job-dsl-plugin/src/test/groovy/javaposse/jobdsl/plugin/JenkinsJobManagementSpec.groovy b/job-dsl-plugin/src/test/groovy/javaposse/jobdsl/plugin/JenkinsJobManagementSpec.groovy index 0df5a4c0d..9bed35cef 100644 --- a/job-dsl-plugin/src/test/groovy/javaposse/jobdsl/plugin/JenkinsJobManagementSpec.groovy +++ b/job-dsl-plugin/src/test/groovy/javaposse/jobdsl/plugin/JenkinsJobManagementSpec.groovy @@ -33,6 +33,7 @@ import org.custommonkey.xmlunit.XMLUnit import org.junit.Rule import org.jvnet.hudson.test.JenkinsRule import org.jvnet.hudson.test.WithoutJenkins +import spock.lang.IgnoreIf import spock.lang.Specification import static hudson.model.Result.UNSTABLE @@ -882,6 +883,7 @@ class JenkinsJobManagementSpec extends Specification { } @SuppressWarnings('BusyWait') + @IgnoreIf({ os.isWindows() }) def 'queue job'() { setup: FreeStyleProject project = jenkinsRule.createProject(FreeStyleProject, 'project') @@ -894,7 +896,6 @@ class JenkinsJobManagementSpec extends Specification { when: jobManagement.queueJob(project.name) - jenkinsRule.instance.queue.items.each { it.future.get() } while (project.builds.lastBuild == null) { Thread.sleep(100) } @@ -908,6 +909,7 @@ class JenkinsJobManagementSpec extends Specification { } @SuppressWarnings('BusyWait') + @IgnoreIf({ os.isWindows() }) def 'queue job without build'() { setup: FreeStyleProject project = jenkinsRule.createProject(FreeStyleProject, 'project') @@ -915,7 +917,6 @@ class JenkinsJobManagementSpec extends Specification { when: testJobManagement.queueJob(project.name) - jenkinsRule.instance.queue.items.each { it.future.get() } while (project.builds.lastBuild == null) { Thread.sleep(100) }